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

@@ -68,6 +68,7 @@ export class WDRouterPage {
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static oneKeyLoginPage = new WDRouterPage("wdLogin", "ets/pages/login/OneKeyLoginPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
+  static changeBindPhonePage = new WDRouterPage("wdLogin", "ets/pages/login/ChangeBindPhonePage");
   static modifyPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ModifyPasswordPage");
   //我的  预约
   static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");

 import { FeedBackParams, FeedbackTypeBean, PhotoListBean } from 'wdBean/Index';
 import { AppUtils,
+  DateTimeUtils,
   DeviceUtil,
   FastClickUtil, Logger, NetworkUtil, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
@@ -9,7 +10,7 @@ import { BusinessError } from '@kit.BasicServicesKit';
 import { router } from '@kit.ArkUI';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter/Index';
-import { HashMap } from '@kit.ArkTS';
+import { TrackingPageBrowse } from 'wdTracking/Index';
 
 const TAG = 'FeedBackActivity'
 
@@ -20,6 +21,9 @@ const TAG = 'FeedBackActivity'
 @Entry
 @Component
 export struct FeedBackActivity {
+  pageShowTime:number = 0;
+  pageId:string = 'feedbackPage';
+  pageName:string=this.pageId;
   @State canSubmit: boolean = false;
   @State textNumLabel: string = '0/500';
   contact: string = "";
@@ -380,4 +384,12 @@ export struct FeedBackActivity {
     }
   }
 
+  onPageShow() {
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
+  }
+  onPageHide() {
+    //页面浏览
+    TrackingPageBrowse.trackCommonPageExposureEnd(this.pageId,this.pageName,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
+
+  }
 }
\ No newline at end of file

@@ -175,9 +175,7 @@ export struct AccountAndSecurityLayout {
             .onClick(() => {
               console.log(index + "")
               if (index == 0){
-                trackButtonClick("accountManagementPageChangePhoneNumber")
-                let pageType = {'pageType': 2} as Record<string, number>;
-                WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
+                WDRouterRule.jumpWithPage(WDRouterPage.changeBindPhonePage)
               }else if (index == 1) {
                 trackButtonClick("accountManagementPageAccountManagementPassword")
                 if (this.ifSetPassword) {

+import { SpConstants } from 'wdConstant/Index'
+import { CustomToast, Logger, NetworkUtil, ToastUtils, SPHelper, EmitterEventId,
+  DateTimeUtils } from 'wdKit/Index'
+import { LoginViewModel } from './LoginViewModel'
+import { router } from '@kit.ArkUI'
+import { emitter } from '@kit.BasicServicesKit'
+import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index'
+
+const TAG = 'ChangeBindPhonePage'
+/*更换手机号页面*/
+@Entry
+@Component
+struct ChangeBindPhonePage {
+  @State phoneContent: string = ''
+  @State codeContent: string = ''
+  @State isSubmit: boolean = false //是否可以提交  默认不可以
+  loginViewModel: LoginViewModel = new LoginViewModel()
+  @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
+  @State pageTitle:string = '更换手机号';
+  @State @Watch('startCount') codeStateSuccess:boolean=false
+  @State codeBtnState: boolean = false
+  @State timeCount: number = 60
+  isFirst:boolean=true//是否第一次获取验证码
+  lastTime: number = 0
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
+
+
+  onPageShow() {
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
+  }
+
+  onPageHide(): void {
+    this.pageHideTime = DateTimeUtils.getTimeStamp()
+    let duration = 0
+    duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum,duration)
+  }
+
+  onCodeSend() {
+    if (this.isCodeSend) {
+      TrackingButton.click("changePhoneNumberPageSendVerificationCode",TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum)
+      this.sendVerifyCode()
+    }
+  }
+
+  @State toastText:string = ""
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+      msg: this.toastText,
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    customStyle: true,
+    maskColor:"#00000000"
+  })
+
+
+
+  build() {
+    Column() {
+      Image($r('app.media.login_back_icon')).width(24).height(24).margin({ left: 15, top: 10 }).onClick(() => {
+        router.back()
+      })
+
+      Text(this.pageTitle).fontSize(22).fontColor('#333333').fontWeight(FontWeight.Bold).margin({ left: 25, top: 112 })
+
+      Column(){
+        TextInput({text: this.phoneContent, placeholder: "请输入手机号" })
+          .fontSize(16)
+          .height(48)
+          .placeholderColor("#CCCCCC")
+          .maxLength(11)
+          .margin({ top: 36 })
+          .backgroundColor("#F5F5F5")
+          .borderRadius(4)
+          .type(InputType.Number)
+          .onChange((content) => {
+            this.phoneContent = content
+            this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
+
+            if (content.length >= 11 ) {
+              this.codeBtnState = true
+            } else {
+              this.codeBtnState = false
+            }
+          })
+
+
+        Row() {
+          TextInput({ text: this.codeContent,placeholder: "验证码" })
+            .placeholderColor("#CCCCCC")
+            .layoutWeight(1)
+            .fontSize(16)
+            .height(48)
+            .type(InputType.Number)
+            .fontColor("#222222")
+            .backgroundColor("#00000000")
+            .borderRadius({ topLeft: 4, bottomLeft: 4 })
+            .onChange((value) => {
+              this.codeContent = value
+              this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
+            })
+
+          Text(this.codeStateSuccess ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新获取')
+            .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
+            .width(110)
+            .fontSize(14)
+            .fontWeight( FontWeight.Bold)
+            .height(48)
+            .textAlign(TextAlign.Center)
+            .enabled(this.codeStateSuccess?false:true)
+            .onClick(() => {
+              if (this.phoneContent.length < 11) {
+                return
+              }
+
+              let currentTime = DateTimeUtils.getTimeStamp()
+              if (currentTime - this.lastTime < 500) {
+                return
+              }
+              this.lastTime = currentTime;
+              this.isCodeSend = true
+
+            })
+
+
+        }.margin({ top: 12 })
+        .height(48)
+        .alignItems(VerticalAlign.Center)
+        .justifyContent(FlexAlign.Start)
+        .backgroundImage($r('app.media.code_login_bg'))
+        .backgroundImageSize({width:'100%',height:48})
+      }.width('100%')
+      .padding({ left: 25, right: 25 })
+
+
+      Row() {
+        Text("确认")
+          .layoutWeight(1)
+          .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
+          .borderRadius(4)
+          .fontSize(18)
+          .textAlign(TextAlign.Center)
+          .fontWeight(FontWeight.Medium)
+          .margin({ top: 26 })
+          .height(44)
+          .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
+          .enabled(this.isSubmit ? true : false)
+          .onClick(() => {
+            TrackingButton.click("changePhoneNumberPageConfirm",TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum)
+            this.changeBindPhone()
+          })
+      }.width('100%')
+      .padding({ left: 25, right: 25 })
+
+    }.width('100%').height('100%').alignItems(HorizontalAlign.Start)
+  }
+
+  //发送验证码
+  sendVerifyCode() {
+    if (this.isEmpty(this.phoneContent)) {
+      return
+    }
+
+    this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
+      this.showToastTip("已发送")
+      this.codeStateSuccess=true
+      this.isCodeSend=false
+      Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
+    }).catch((message: string)=>{
+      let netStatus = NetworkUtil.isNetConnected()
+      if (netStatus) {
+        this.showToastTip(message)
+      } else {
+        this.showToastTip("验证码获取失败，请重新尝试")
+      }
+      this.codeStateSuccess=false
+      this.isCodeSend=false
+    })
+  }
+
+  isEmpty(obj: undefined|null|string): boolean {
+    return (obj == undefined || obj == null || obj == '');
+  }
+
+  changeBindPhone(){
+    if (!this.isSubmit) {
+      return
+    }
+    if (this.isEmpty(this.phoneContent)) {
+      return
+    }
+    if (this.isEmpty(this.codeContent)) {
+      return
+    }
+    this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
+      ToastUtils.shortToast('绑定成功')
+      this.querySecurity()
+    }).catch((message: string) => {
+      if (message != '') {
+        ToastUtils.shortToast(message)
+      }
+    })
+  }
+
+  querySecurity(){
+    this.loginViewModel.querySecurity().then(()=>{
+      SPHelper.default.save(SpConstants.USER_PHONE,this.phoneContent)
+      this.sendEmitEvent()
+      router.back()
+    }).catch(()=>{
+
+    })
+  }
+
+  sendEmitEvent(){
+    // 定义一个eventId为1的事件，事件优先级为Low
+    let event: emitter.InnerEvent = {
+      eventId: EmitterEventId.PHONE_CHANGE_SUCCESS,
+      priority: emitter.EventPriority.LOW
+    };
+
+    let eventData: emitter.EventData = {
+      data: {
+        content: this.phoneContent,
+      }
+    };
+
+    // 发送eventId为1的事件，事件内容为eventData
+    emitter.emit(event, eventData);
+  }
+
+  showToastTip(msg:string){
+    this.toastText = msg
+    this.dialogToast.open()
+  }
+
+  startCount() {
+    this.isFirst = false
+    let time = setInterval(() => {
+      Logger.debug("倒计时：" + this.timeCount)
+      this.timeCount--
+      if (this.timeCount < 1) {
+        this.codeStateSuccess = false
+        this.timeCount = 60
+        clearInterval(time)
+      }
+    }, 1000)
+  }
+}
\ No newline at end of file

@@ -22,7 +22,7 @@ struct ForgetPasswordPage {
   @State isSubmit: boolean = false //是否可以提交  默认不可以
   loginViewModel: LoginViewModel = new LoginViewModel()
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
-  pageType:number = (router.getParams() as Record<string, number>)['pageType']; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
+  pageType:number = (router.getParams() as Record<string, number>)['pageType']; //0、登录->忘记密码 1、设置->重置密码  3、设置->更换手机号页面2(不知道是啥)
   phone:string = (router.getParams() as Record<string, number>)['phone'] + ""; //登录 密码登录 填写手机号 点击忘记密码 带过来手机号
   @State pageTitle:string = '找回密码';
   @State codeStateSuccess:boolean=false
@@ -51,7 +51,6 @@ struct ForgetPasswordPage {
         router.back()
       })
 
-
       Text(this.pageTitle).fontSize(22).fontColor('#333333').fontWeight(FontWeight.Bold).margin({ left: 25, top: 112 })
       LoginInputComponent({
         phoneContent: $phoneContent,
@@ -74,11 +73,7 @@ struct ForgetPasswordPage {
           .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
           .enabled(this.isSubmit ? true : false)
           .onClick(() => {
-            if(this.pageType==2){
-              this.changeBindPhone()
-            }else {
-              this.checkVerifyCode()
-            }
+            this.checkVerifyCode()
           })
       }.padding({ left: 25, right: 25 }).width('100%')
 
@@ -98,8 +93,6 @@ struct ForgetPasswordPage {
       }
     }else if (this.pageType == 1){
       this.pageTitle = '验证当前手机号'
-    }else if (this.pageType == 2){
-      this.pageTitle = '更换手机号'
     }
     if (this.isCodeSend) {
       this.sendVerifyCode()

@@ -10,7 +10,7 @@ export struct LoginInputComponent {
   @Link isCodeSend: boolean //验证码控件是否点击 默认没有 发送接口
   @Link isSubmit: boolean //是否可以提交
   isFirst:boolean=true//是否第一次获取验证码
-  pageType?:number; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
+  pageType?:number; //0、登录->忘记密码 1、设置->重置密码  3、设置->更换手机号页面2
   lastTime: number = 0
   @Link @Watch('startCount') codeStateSuccess: boolean  //验证码获取成功与否回调 成功显示倒计时
   @Watch('onCheckChange') @Prop protocolState: boolean = false //协议勾选状态

@@ -4,7 +4,7 @@ import { LoginModel } from './LoginModel';
 import { ModifyPasswordRequestItem } from './ModifyPasswordRequestItem';
 import { router } from '@kit.ArkUI';
 import { encryptMessage } from '../../utils/cryptoUtil';
-import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
+import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
 
 /**
  * 修改密码页面
@@ -153,6 +153,7 @@ struct ModifyPasswordPage {
             .borderRadius('4vp')
             .onClick(() => {
               if(this.btnStatus){
+                TrackingButton.click("changePasswordPageConfirm",TrackConstants.PageName.Change_Passwd,TrackConstants.PageName.Change_Passwd)
                 this.submit()
               }
             })

@@ -8,6 +8,7 @@
     "pages/login/SettingPasswordLayout",
     "pages/guide/GuidePages",
     "pages/login/OneKeyLoginPage",
-    "pages/login/ModifyPasswordPage"
+    "pages/login/ModifyPasswordPage",
+    "pages/login/ChangeBindPhonePage"
   ]
 }
\ No newline at end of file

 import { ENewspaperPageComponent } from 'wdComponent';
-import { Logger } from 'wdKit';
+import { DateTimeUtils, Logger } from 'wdKit';
 import common from '@ohos.app.ability.common';
 import window from '@ohos.window';
+import { TrackingPageBrowse } from 'wdTracking/Index';
 
 const TAG = 'ENewspaper';
 
 @Entry
 @Component
 struct ENewspaper {
+  pageShowTime:number = 0;
+  pageId:string = 'newsPaperPage';
+  pageName:string=this.pageId;
   // 获取UIAbility上下文
   context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
 
@@ -46,6 +50,7 @@ struct ENewspaper {
   }
 
   onPageShow() {
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.setSystemBar('#80000000','#80000000', '#FFFFFFFF')
     Logger.info(TAG, 'onPageShow');
   }
@@ -53,6 +58,8 @@ struct ENewspaper {
   onPageHide() {
     this.setSystemBar('#FFFFFFFF','#00000000', '#000000')
     Logger.info(TAG, 'onPageHide');
+    //页面浏览
+    TrackingPageBrowse.trackCommonPageExposureEnd(this.pageId,this.pageName,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
   }
 
   onBackPress() {

-import { Logger } from 'wdKit';
+import { DateTimeUtils, Logger } from 'wdKit';
 import { DynamicDetailComponent } from 'wdComponent';
 import router from '@ohos.router';
 import { Params, Action } from 'wdBean';
+import { TrackingPageBrowse } from 'wdTracking/Index';
+
 const TAG = 'DynamicDetailPage';
 @Entry
 @Component
 struct DynamicDetailPage {
-
+  pageShowTime:number = 0;
+  pageId:string = 'dynamicDetailPage';
+  pageName:string=this.pageId;
   @State relId: string = ''
   @State contentId: string = ''
   @State relType: string = ''
@@ -30,4 +34,12 @@ struct DynamicDetailPage {
     this.relType = params?.extra?.relType || '';
     this.contentId = params?.contentID || '';
   }
+  onPageShow() {
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
+  }
+  onPageHide() {
+    //页面浏览
+    TrackingPageBrowse.trackCommonPageExposureEnd(this.pageId,this.pageName,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
+
+  }
 }
\ No newline at end of file

@@ -131,7 +131,7 @@ export struct BottomNavigationComponent {
   @Builder
   tabBarBuilder(navItem: BottomNavDTO, index: number) {
     Stack({ alignContent: Alignment.Bottom }) {
-      Image(this.currentNavIndex === index ? navItem.iconC : navItem.icon)
+      Image(this.getBottomIcon(navItem, this.currentNavIndex === index))
         .height(CommonConstants.FULL_PARENT)
         .padding({
           bottom: 15,
@@ -140,6 +140,7 @@ export struct BottomNavigationComponent {
           top: 2
         })
         .aspectRatio(this.ASPECT_RATIO_1_1)
+        .alt(this.getBottomLocalIcon(navItem, this.currentNavIndex === index))
 
       Text(navItem.name)
         .margin({ bottom: $r('app.float.bottom_navigation_margin_bottom') })
@@ -160,6 +161,48 @@ export struct BottomNavigationComponent {
 
   }
 
+  private getBottomIcon(navItem: BottomNavDTO, isSelect: boolean): string | Resource {
+    if (!navItem) {
+      return ''
+    }
+    let icon: string = ''
+    if (this.isImmersive) {
+      // 获取沉浸式icon
+      icon = isSelect ? navItem.immersiveIconCUrl : navItem.immersiveIconUrl
+    } else {
+      // 获取常规icon
+      icon = isSelect ? navItem.iconC : navItem.icon
+    }
+    if (StringUtils.isEmpty(icon) || icon.includes('.pag')) {
+      // 兜底，获取预置的本地icon
+      return this.getBottomLocalIcon(navItem, isSelect)
+    }
+    return icon
+  }
+
+  private getBottomLocalIcon(navItem: BottomNavDTO, isSelect: boolean): Resource {
+    if (!navItem) {
+      return isSelect ? $r('app.media.icon_tab_res1') : $r('app.media.icon_tab_res1_no')
+    }
+    // type:1普通 2我的
+    if (navItem.type == '2') {
+      // 我的
+      return isSelect ? $r('app.media.icon_tab_res5') : $r('app.media.icon_tab_res5_no')
+    } else {
+      // 顶部样式：中文的(11-新闻;12-人民号;13-视频;14-服务)
+      if (navItem.topStyle == '11') {
+        return isSelect ? $r('app.media.icon_tab_res1') : $r('app.media.icon_tab_res1_no')
+      } else if (navItem.topStyle == '12') {
+        return isSelect ? $r('app.media.icon_tab_res2') : $r('app.media.icon_tab_res2_no')
+      } else if (navItem.topStyle == '13') {
+        return isSelect ? $r('app.media.icon_tab_res3') : $r('app.media.icon_tab_res3_no')
+      } else if (navItem.topStyle == '14') {
+        return isSelect ? $r('app.media.icon_tab_res4') : $r('app.media.icon_tab_res4_no')
+      }
+    }
+    return isSelect ? $r('app.media.icon_tab_res1') : $r('app.media.icon_tab_res1_no')
+  }
+
   // 底导切换函数
   async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
     Logger.info(TAG, `onBottomNavigationIndexChange this.currentNavIndex: ${this.currentNavIndex}`);

@@ -21,6 +21,7 @@ export struct VideoChannelPage {
   @Prop topNavList: TopNavDTO[]
   @Link _currentNavIndex?: number;
   @Consume barBackgroundColor: Color
+  @Consume isImmersive: boolean
   @Consume displayDirection: DisplayDirection
   @Consume @Watch('setBarBackgroundColor') currentBottomNavInfo: BottomNavDTO // 当前底导信息
   @State @Watch('setBarBackgroundColor') currentTopNavSelectedIndex: number = 0;
@@ -42,8 +43,10 @@ export struct VideoChannelPage {
     if (this.currentTopNavSelectedIndex === 0 && this.currentBottomNavInfo?.name === '视频') {
       console.error('setBarBackgroundColor', '黑色')
       this.barBackgroundColor = Color.Black
+      this.isImmersive = true
     } else {
       this.barBackgroundColor = Color.White
+      this.isImmersive = false
       console.error('setBarBackgroundColor', '白色')
     }
   }