Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -26,14 +26,11 @@ export struct CardSourceInfo {
     let flag: boolean = false;
     if (curRouter === 'MainPage') {
       if (this.isTwoDaysAgo(publishTime)) {
-        console.log('curRouter 01')
         flag = false
       } else {
-        console.log('curRouter 02')
         flag = true;
       }
     } else {
-      console.log('curRouter 03')
       flag = true;
     }
     return flag;

@@ -80,9 +80,8 @@ export struct RmhTitle {
 
   async aboutToAppear(): Promise<void> {
     this.getBatchAttentionStatus()
-
-    let page = router.getState();
-    if (page.path.includes('/page/PeopleShipHomePage') || page.path.includes('/pages/MainPage')) {
+    const curRouter = router.getState().name;
+    if (curRouter === 'MainPage') {
       this.hideTime = true;
     }
 

-import ArrayList from '@ohos.util.ArrayList'
 import { MineSettingComponent } from '../setting/MineSettingComponent';
 import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout';
 import router from '@ohos.router';
-import { Action, Params } from 'wdBean';
+import { Params } from 'wdBean';
 import { DateTimeUtils } from 'wdKit/Index';
-import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 @Entry
 @Component
 struct SettingPage {
-  @State message: string = 'Hello World 02'
   @State pageType: string = 'mainSetting';
   @State params:Params =  router.getParams() as Params;
   @State enterActivityTime:number = 0;
+  @Provide pageShow: number = -1
+  @Provide pageHide: number = -1
 
   pageShowSettingTime:number = 0;
   pageHideSettingTime:number = 0;
-  pageShowAccountTime:number = 0;
-  pageHideAccountTime:number = 0;
+
 
   onPageShow() {
+    this.pageShow = Math.random()
+
     this.pageType = this.params.pageID;
     this.enterActivityTime = DateTimeUtils.getTimeStamp()
     if (this.pageType == 'mainSetting'){
       this.pageShowSettingTime = DateTimeUtils.getTimeStamp()
-    }else{
-      this.pageShowAccountTime = DateTimeUtils.getTimeStamp()
     }
   }
 
   onPageHide(): void {
+    this.pageHide = Math.random()
     if (this.pageType == 'mainSetting'){
       this.pageHideSettingTime = DateTimeUtils.getTimeStamp()
-    }else{
-      this.pageHideAccountTime = DateTimeUtils.getTimeStamp()
     }
 
     let duration = 0
     if(this.pageType == 'mainSetting'){
       duration = Math.floor((this.pageHideSettingTime - this.pageShowSettingTime)/1000)
-    }else{
-      duration = Math.floor((this.pageHideAccountTime - this.pageShowAccountTime)/1000)
     }
     if(this.pageType == 'mainSetting'){
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Setting,TrackConstants.PageName.Setting,duration)
-    }else{
-      TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Account_Management,TrackConstants.PageName.Account_Management,duration)
     }
   }
 

 import {  SpConstants } from 'wdConstant';
-import { Logger, SPHelper, ToastUtils,  EmitterEventId, EmitterUtils } from 'wdKit';
+import { Logger, SPHelper, ToastUtils,  EmitterEventId, EmitterUtils, DateTimeUtils } from 'wdKit';
 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import router from '@ohos.router';
@@ -11,7 +11,7 @@ import { LogoutViewModel } from '../../viewmodel/LogoutViewModel';
 import { CustomLogoutDialog } from './CustomLogoutDialog';
 import { emitter } from '@kit.BasicServicesKit';
 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog';
-import { TrackingButton, TrackConstants } from 'wdTracking/Index';
+import { TrackingButton, TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
 export { SettingPasswordParams } from "wdLogin"
 
 @Component
@@ -22,8 +22,37 @@ export struct AccountAndSecurityLayout {
   @State protocolState: boolean = false //协议勾选状态
   @State isAccountPage: boolean = true
   @State ifSetPassword: boolean = false //是否设置过密码
+  @Consume pageShow :number
+  @Consume @Watch('pageHideForUpdateData') pageHide :number
 
   @Watch("checkSetPassword") @Prop enterActivityTime:number = 0;
+  logoutLayoutShowTime:number = 0;
+  logoutLayoutHideTime:number = 0;
+  pageShowAccountTime:number = 0;
+  pageHideAccountTime:number = 0;
+
+  //注销账户 浏览埋点
+  logoutLayoutHide(){
+    this.logoutLayoutHideTime = DateTimeUtils.getTimeStamp()
+    let duration = 0
+    duration = Math.floor((this.logoutLayoutHideTime - this.logoutLayoutShowTime)/1000)
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account,duration)
+  }
+  //账户管理 浏览埋点
+  logoutLayoutHide2(){
+    this.pageHideAccountTime = DateTimeUtils.getTimeStamp()
+    let duration = 0
+    duration = Math.floor((this.pageHideAccountTime - this.pageShowAccountTime)/1000)
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Account_Management,TrackConstants.PageName.Account_Management,duration)
+  }
+
+  pageHideForUpdateData(){
+    if(!this.isAccountPage){
+      this.logoutLayoutHide()
+    }else{
+      this.logoutLayoutHide2()
+    }
+  }
 
   logoutViewModel = new LogoutViewModel()
   dialogController: CustomDialogController = new CustomDialogController({
@@ -57,6 +86,7 @@ export struct AccountAndSecurityLayout {
 
 
   aboutToAppear() {
+    this.pageShowAccountTime = DateTimeUtils.getTimeStamp()
     // 获取设置页面数据
     this.getAccountAndSecurityData()
     this.addEmitEvent()
@@ -189,7 +219,7 @@ export struct AccountAndSecurityLayout {
               }else if (index == 3) {
                 trackButtonClick("accountManagementPageAccountCancellation")
                 this.isAccountPage=false
-                // WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
+                this.logoutLayoutShowTime = DateTimeUtils.getTimeStamp()
               }
             })
 
@@ -253,6 +283,8 @@ export struct AccountAndSecurityLayout {
             })
             .onClick(() => {
               this.isAccountPage=true
+              this.pageShowAccountTime = DateTimeUtils.getTimeStamp()
+              this.logoutLayoutHide()
               this.protocolState=false
             })
             .id('backImage')
@@ -330,6 +362,7 @@ export struct AccountAndSecurityLayout {
           Text() {
             Span("我已阅读并同意").fontColor("#999999").fontSize(12)
             Span("《用户注销协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
+              TrackingButton.click("cancelAccountPageUserLogoffAgreement",TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account)
               let bean = { contentID: "3", pageID: "" } as Params
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
             })
@@ -351,6 +384,7 @@ export struct AccountAndSecurityLayout {
               if (!this.protocolState) {
                 return
               }
+              TrackingButton.click("cancelAccountPageconfirmCancelAccount",TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account)
               this.dialogController.open()
 
             })
@@ -454,6 +488,7 @@ export struct AccountAndSecurityLayout {
 
   //注销账号
   requestLogout() {
+    TrackingButton.click("cancelAccountPageCancelAccountSuccess",TrackConstants.PageName.Cancel_Account,TrackConstants.PageName.Cancel_Account)
     this.logoutViewModel.requestLogout().then(()=>{
       ToastUtils.shortToast("注销成功")
       router.back()

@@ -22,7 +22,7 @@ interface ILikeStyleResp {
 export struct LikeComponent {
   @Consume contentDetailData: ContentDetailDTO
   @Prop pageComponentType: number
-  @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+  @State likesStyle: number | string = 1 // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State likeStatus: boolean = false
   viewModel: LikeViewModel = new LikeViewModel()
   @Prop @Watch('onDataUpdated') data: Record<string, string>
@@ -41,6 +41,14 @@ export struct LikeComponent {
   // this.data['status'] = "1"  
 
   aboutToAppear() {
+    // 2：竖屏直播页 3：图集 4：横屏直播页
+    if(this.pageComponentType == 2 || this.pageComponentType == 4) {
+      // 点赞样式 love爱心型  thumb点赞手势 mourning 蜡烛(默哀) pray 祈福
+      this.likesStyle = this.contentDetailData?.liveInfo?.likesStyle
+    } else {
+      // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+      this.likesStyle = this.contentDetailData.likesStyle
+    }
     this.onDataUpdated()
   }
 
@@ -80,7 +88,7 @@ export struct LikeComponent {
    * 将点赞样式转换为icon
    */
   transLikeStyle(): ILikeStyleResp {
-    if (this.likesStyle === 1) {
+    if (this.likesStyle === 1 || this.likesStyle === 'love' || this.likesStyle === 'thumb') {
       return {
         url: this.likeStatus ? $r(`app.media.ic_like_check`) :
           this.styleType == 1 ?
@@ -88,12 +96,12 @@ export struct LikeComponent {
           $r(`app.media.ic_like_uncheck`),
         name: '赞'
       }
-    } else if (this.likesStyle === 2) {
+    } else if (this.likesStyle === 2 || this.likesStyle === 'pray') {
       return {
         url: this.likeStatus ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
         name: '祈祷'
       }
-    } else if (this.likesStyle === 3) {
+    } else if (this.likesStyle === 3 || this.likesStyle === 'mourning') {
       return {
         url: this.likeStatus ? $r(`app.media.ic_candle_check`) :
         $r(`app.media.ic_candle_uncheck`),
@@ -143,6 +151,7 @@ export struct LikeComponent {
     }
     .width(154)
     .height(40)
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' ? Visibility.None : Visibility.Visible)
   }
 
   @Builder
@@ -160,6 +169,7 @@ export struct LikeComponent {
     .onClick(() => {
       this.clickButtonEvent()
     })
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' ? Visibility.None : Visibility.Visible)
   }
 
   @Builder
@@ -173,7 +183,10 @@ export struct LikeComponent {
         .onClick(() => {
           this.clickButtonEvent()
         })
-    }.width(24).height(24)
+    }
+    .width(24)
+    .height(24)
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' ? Visibility.None : Visibility.Visible)
   }
 
   @Builder
@@ -248,6 +261,7 @@ export struct LikeComponent {
     }.width(24).height(24).onClick(() => {
       this.clickButtonEvent()
     })
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' ? Visibility.None : Visibility.Visible)
   }
 
   @Builder
@@ -284,6 +298,7 @@ export struct LikeComponent {
     }
     .width(36)
     .height(42)
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' ? Visibility.None : Visibility.Visible)
 
   }