Merge remote-tracking branch 'origin/main'

@@ -171,6 +171,24 @@ export class LazyDataSource<T> extends BasicDataSource<T> {
     }
     }
   }
   }
 
 
+  // 删除index指定索引位置的元素
+  public deleteItems(startIndex: number, count?: number): void {
+    if (startIndex < 0) {
+      return
+    }
+    this.dataArray.splice(startIndex, count || (this.dataArray.length - startIndex));
+    let to = 0
+    if (count == undefined) {
+      to = this.dataArray.length - 1
+    } else {
+      to = count + startIndex
+      if (to >= this.dataArray.length) {
+        to = this.dataArray.length - 1;
+      }
+    }
+    this.notifyDataMove(startIndex, to);
+  }
+
   // 删除最后1个元素
   // 删除最后1个元素
   public pop(): void {
   public pop(): void {
     this.deleteItem()
     this.deleteItem()

@@ -42,23 +42,23 @@ export class HttpParams {
     switch (HostManager.getHost()) {
     switch (HostManager.getHost()) {
       case HostEnum.HOST_UAT:
       case HostEnum.HOST_UAT:
         headers['X-Ca-Stage'] = 'PRE'
         headers['X-Ca-Stage'] = 'PRE'
-        headers['Authorization'] = 'APPCODE 83092caa603a421aa0222308b3f6b27a'
-        headers['appCode'] = '83092caa603a421aa0222308b3f6b27a'
+        headers['Authorization'] = 'APPCODE 5e1b07c336ac48ae90794fc4d69beaf9'
+        headers['appCode'] = '5e1b07c336ac48ae90794fc4d69beaf9'
         break
         break
       case HostEnum.HOST_SIT:
       case HostEnum.HOST_SIT:
         headers['X-Ca-Stage'] = 'TEST'
         headers['X-Ca-Stage'] = 'TEST'
-        headers['Authorization'] = 'APPCODE 0af1f9085e484c97b2a44704bae72c07'
-        headers['appCode'] = '0af1f9085e484c97b2a44704bae72c07'
+        headers['Authorization'] = 'APPCODE b7d32f50747d456d8c84ae51f3baaf56'
+        headers['appCode'] = 'b7d32f50747d456d8c84ae51f3baaf56'
         break
         break
       case HostEnum.HOST_PRODUCT:
       case HostEnum.HOST_PRODUCT:
         headers['X-Ca-Stage'] = 'RELEASE'
         headers['X-Ca-Stage'] = 'RELEASE'
-        headers['Authorization'] = 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6'
-        headers['appCode'] = '3d4181bceeb94d9780e10dbb6c67bbf6'
+        headers['Authorization'] = 'APPCODE c148017260324c3ba7e612757e8146c1'
+        headers['appCode'] = 'c148017260324c3ba7e612757e8146c1'
         break
         break
       case HostEnum.HOST_DEV:
       case HostEnum.HOST_DEV:
         headers['X-Ca-Stage'] = 'TEST'
         headers['X-Ca-Stage'] = 'TEST'
-        headers['Authorization'] = 'APPCODE ff33172859e14f9a8299e3bd769e79f9'
-        headers['appCode'] = 'ff33172859e14f9a8299e3bd769e79f9'
+        headers['Authorization'] = 'APPCODE 9272b6a5ad0549a0ab399d0011109793'
+        headers['appCode'] = '9272b6a5ad0549a0ab399d0011109793'
         break
         break
       default:
       default:
         break
         break
@@ -82,26 +82,7 @@ export class HttpParams {
   }
   }
 
 
   private static getVersion() {
   private static getVersion() {
-    // TODO
+    // TODO build时间，待对接build生成属性
     return '202401242103';
     return '202401242103';
   }
   }
-
-  private static getVersionCode() {
-    // TODO
-    return '10000';
-  }
-
-  public  static getVersionName() {
-    // TODO 读取配置
-    return '1.0.0';
-  }
-
-  //获取机型
-  static getPhoneModel() {
-    return 'getPhoneModel'
-  }
-  //获取当前手机系统版本号
-  static getSystemVersion() {
-    return 'getSystemVersion'
-  }
 }
 }

@@ -20,6 +20,7 @@
     "wdJsBridge": "file:../../commons/wdJsBridge",
     "wdJsBridge": "file:../../commons/wdJsBridge",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdHwAbility": "file:../../features/wdHwAbility",
     "wdHwAbility": "file:../../features/wdHwAbility",
-    "wdShare": "file:../../features/wdShare"
+    "wdShare": "file:../../features/wdShare",
+    "wdTracking": "file:../../features/wdTracking"
   }
   }
 }
 }

@@ -321,6 +321,7 @@ export struct ENewspaperPageComponent {
       if (this.isOpenListDialog) {
       if (this.isOpenListDialog) {
         ENewspaperListDialog({
         ENewspaperListDialog({
           newspaperListBean: this.newspaperListBean,
           newspaperListBean: this.newspaperListBean,
+          scrollIndex: this.swiperIndex,
           closeDialog: () => {
           closeDialog: () => {
             this.isOpenListDialog = false
             this.isOpenListDialog = false
           }
           }

 import {  FeedbackTypeBean, PhotoListBean } from 'wdBean/Index';
 import {  FeedbackTypeBean, PhotoListBean } from 'wdBean/Index';
-import { FastClickUtil, Logger, NetworkUtil, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index';
+import { AppUtils,
+  DeviceUtil,
+  FastClickUtil, Logger, NetworkUtil, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { CustomTitleUI } from './reusable/CustomTitleUI'
 import { CustomTitleUI } from './reusable/CustomTitleUI'
 import { picker } from '@kit.CoreFileKit';
 import { picker } from '@kit.CoreFileKit';
@@ -8,7 +10,6 @@ import { router } from '@kit.ArkUI';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { HashMap } from '@kit.ArkTS';
 import { HashMap } from '@kit.ArkTS';
-import { HttpParams } from 'wdNetwork/src/main/ets/http/HttpCommonParams';
 
 
 const TAG = 'FeedBackActivity'
 const TAG = 'FeedBackActivity'
 
 
@@ -355,8 +356,8 @@ export struct FeedBackActivity {
         map.set("userName", UserDataLocal.getUserName());
         map.set("userName", UserDataLocal.getUserName());
       }
       }
       //设备
       //设备
-      map.set("appVersion", "V" + HttpParams.getVersionName());
-      map.set("appDevice", "harmony" + HttpParams.getSystemVersion() + " " + HttpParams.getPhoneModel());
+      map.set("appVersion", "V" + AppUtils.getAppVersionName());
+      map.set("appDevice", "harmony" + DeviceUtil.getDisplayVersion() + " " + DeviceUtil.getProductModel());
       // //投诉图片
       // //投诉图片
       // if (imageUrl.size() > 0) {
       // if (imageUrl.size() > 0) {
       //   String[] str = imageUrl.toArray(new String[imageUrl.size()]);
       //   String[] str = imageUrl.toArray(new String[imageUrl.size()]);

@@ -244,10 +244,12 @@ export struct MorningEveningPaperComponent {
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
           }
           }
 
 
+          if (this.audioPlayUrl.length > 0){
             ListItem() {
             ListItem() {
               this.AudioBarView(this.simpleAudioDialog)
               this.AudioBarView(this.simpleAudioDialog)
             }
             }
           }
           }
+        }
 
 
         ListItem() {
         ListItem() {
           SingleColumn999Component({
           SingleColumn999Component({

@@ -39,7 +39,7 @@ export struct topicInfoView {
           .borderRadius(2)
           .borderRadius(2)
           .padding({ left: 6, top: 4, bottom: 4 })
           .padding({ left: 6, top: 4, bottom: 4 })
 
 
-        Image($r('app.media.more'))// .height($r('app.float.top_arrow_size'))
+        Image($r('app.media.more_w'))// .height($r('app.float.top_arrow_size'))
           .width(12)
           .width(12)
           .height(12)
           .height(12)
           .margin({ left: 4, right: 7 })
           .margin({ left: 4, right: 7 })

@@ -90,9 +90,6 @@ export struct SpacialTopicPageComponent {
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         // }
         // }
-        if (this.contentDetailData[0]?.openComment) {
-          this.operationButtonList = ['collect', 'share']
-        }
         this.trySendData2H5()
         this.trySendData2H5()
       }
       }
     }
     }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
+import { PageHelper } from '../../viewmodel/PageHelper';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -61,6 +62,7 @@ export struct CardAdvBottom {
       }
       }
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        PageHelper.updateFirstPageEndIndex(this.pageModel, true, currentIndex)
       }
       }
     }
     }
   }
   }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
+import {PageHelper} from '../../viewmodel/PageHelper';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -73,6 +74,7 @@ export struct CardAdvTop {
       }
       }
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        PageHelper.updateFirstPageEndIndex(this.pageModel, true, currentIndex)
       }
       }
     }
     }
   }
   }

@@ -99,6 +99,7 @@ export struct CommentTabComponent {
                 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
                 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
               })
               })
               .id("Image")
               .id("Image")
+              .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
           }
           }
           Text(this.placeHolder)
           Text(this.placeHolder)
             .fontSize(12)
             .fontSize(12)
@@ -110,11 +111,13 @@ export struct CommentTabComponent {
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
             })
             })
             .id("Text")
             .id("Text")
+            .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
         }
         }
       }
       }
     }
     }
     .height(30)
     .height(30)
     .onClick(() => {
     .onClick(() => {
+      if(this.contentDetail.appstyle === 9) return
       this.onCommentFocus && this.onCommentFocus()
       this.onCommentFocus && this.onCommentFocus()
 
 
       this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.rootCommentId = '-1';
@@ -134,6 +137,7 @@ export struct CommentIconComponent {
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   /*展示类型*/
   /*展示类型*/
   @State type: number = 1
   @State type: number = 1
+  @Prop contentDetail: ContentDetailDTO
   styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   // aboutToAppear(): void {
   // aboutToAppear(): void {
   //   setTimeout(() => {
   //   setTimeout(() => {
@@ -206,7 +210,10 @@ export struct CommentIconComponent {
 
 
         }
         }
       }
       }
-    }.width(24).height(24)
+    }
+    .width(24)
+    .height(24)
+    .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
 
 
     // .backgroundColor(Color.Blue)
     // .backgroundColor(Color.Blue)
   }
   }

@@ -2,6 +2,7 @@ import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel
 import { WDRouterRule, WDRouterPage, ProcessUtils } from 'wdRouter'
 import { WDRouterRule, WDRouterPage, ProcessUtils } from 'wdRouter'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { ToastUtils } from 'wdKit/Index';
 import { ToastUtils } from 'wdKit/Index';
+import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 
 
 @Component
 @Component
 export default struct MinePageMoreFunctionUI {
 export default struct MinePageMoreFunctionUI {
@@ -70,13 +71,16 @@ export default struct MinePageMoreFunctionUI {
           .onClick(() => {
           .onClick(() => {
             console.log(index + "")
             console.log(index + "")
             if (item.msg == "设置") { //设置
             if (item.msg == "设置") { //设置
+              trackButtonClick("myPageUserSetting")
               let params: Params = {
               let params: Params = {
                 pageID: 'mainSetting'
                 pageID: 'mainSetting'
               }
               }
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
             }else if (item.msg == "关于") { // 关于
             }else if (item.msg == "关于") { // 关于
+              trackButtonClick("myPageUserAbout")
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
             }else if (item.msg == "意见反馈") { // 关于
             }else if (item.msg == "意见反馈") { // 关于
+              trackButtonClick("myPageUserFeedBack")
               ProcessUtils.gotoFeedBackActivity()
               ProcessUtils.gotoFeedBackActivity()
             }
             }
           })
           })
@@ -91,3 +95,7 @@ export default struct MinePageMoreFunctionUI {
     .margin({ left: '23lpx', right: '23lpx', top: "19lpx" })
     .margin({ left: '23lpx', right: '23lpx', top: "19lpx" })
   }
   }
 }
 }
+
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.My, TrackConstants.PageName.My)
+}

 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
+import { TrackConstants } from 'wdTracking/src/main/ets/common/TrackConstants'
+import { TrackingButton } from 'wdTracking/src/main/ets/tracking/TrackingButton'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
 import { PagePersonFunction } from './PagePersonFunction'
 import { PagePersonFunction } from './PagePersonFunction'
@@ -25,6 +27,7 @@ export default struct MinePagePersonFunctionUI {
               }else {
               }else {
                 let params: Record<string, string> = {'comment': "1"};
                 let params: Record<string, string> = {'comment': "1"};
                 WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage,params)
                 WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage,params)
+                trackButtonClick("myPageUserComment")
               }
               }
               break;
               break;
             }
             }
@@ -33,6 +36,7 @@ export default struct MinePagePersonFunctionUI {
                 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
                 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
                 return
                 return
               }
               }
+              trackButtonClick("myPageUserSubscribe")
               WDRouterRule.jumpWithPage(WDRouterPage.appointmentListPage)
               WDRouterRule.jumpWithPage(WDRouterPage.appointmentListPage)
               break;
               break;
             }
             }
@@ -42,6 +46,7 @@ export default struct MinePagePersonFunctionUI {
                 return
                 return
               }
               }
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage)
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage)
+              trackButtonClick("myPageUserFollow")
               break;
               break;
             }
             }
             case "收藏":{
             case "收藏":{
@@ -50,6 +55,7 @@ export default struct MinePagePersonFunctionUI {
                 return
                 return
               }
               }
               WDRouterRule.jumpWithPage(WDRouterPage.myCollectionListPagePage)
               WDRouterRule.jumpWithPage(WDRouterPage.myCollectionListPagePage)
+              trackButtonClick("myPageUserCollection")
               break;
               break;
             }
             }
             case "历史":{
             case "历史":{
@@ -66,6 +72,7 @@ export default struct MinePagePersonFunctionUI {
                 return
                 return
               }
               }
               this.messageClick()
               this.messageClick()
+              trackButtonClick("myPageUserNotice")
               WDRouterRule.jumpWithPage(WDRouterPage.mineMessagePage)
               WDRouterRule.jumpWithPage(WDRouterPage.mineMessagePage)
               break;
               break;
             }
             }
@@ -89,3 +96,7 @@ export default struct MinePagePersonFunctionUI {
   }
   }
 }
 }
 
 
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.My, TrackConstants.PageName.My)
+}
+

 import { StringUtils, UserDataLocal } from 'wdKit'
 import { StringUtils, UserDataLocal } from 'wdKit'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
+import { TrackingButton, TrackConstants } from 'wdTracking/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 const TAG = "MinePageUserSimpleInfoUI"
 const TAG = "MinePageUserSimpleInfoUI"
 
 
@@ -45,6 +46,7 @@ export default struct MinePageUserSimpleInfoUI {
       .alignContent(Alignment.Center)
       .alignContent(Alignment.Center)
       .onClick(()=>{
       .onClick(()=>{
         this.jumpLogin()
         this.jumpLogin()
+        trackButtonClick("myPageUserHead")
       })
       })
 
 
       if(this.isLogin){
       if(this.isLogin){
@@ -68,6 +70,7 @@ export default struct MinePageUserSimpleInfoUI {
           }.width('100%')
           }.width('100%')
           .onClick(()=>{
           .onClick(()=>{
             this.jumpLogin()
             this.jumpLogin()
+            trackButtonClick("myPageUserName")
           })
           })
 
 
           Stack(){
           Stack(){
@@ -101,6 +104,7 @@ export default struct MinePageUserSimpleInfoUI {
           Blank()
           Blank()
         }.onClick(()=>{
         }.onClick(()=>{
           this.jumpLogin()
           this.jumpLogin()
+          trackButtonClick("myPageUserLogin")
         })
         })
         .margin({top:'11lpx',left:'23lpx'})
         .margin({top:'11lpx',left:'23lpx'})
         .width('352lpx')
         .width('352lpx')
@@ -198,3 +202,7 @@ export default struct MinePageUserSimpleInfoUI {
     }
     }
   }
   }
 }
 }
+
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.My, TrackConstants.PageName.My)
+}

 import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
 import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
-import { WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
+import { Remark, WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { MessageItem } from '../../../viewmodel/MessageItem'
 import { MessageItem } from '../../../viewmodel/MessageItem'
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
 import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
@@ -66,6 +66,24 @@ export struct MessageListUI {
             if (value.activeInfo.title) {
             if (value.activeInfo.title) {
               item.desc = value.activeInfo.title.replace("null","")
               item.desc = value.activeInfo.title.replace("null","")
             }
             }
+            let remark = JSON.parse(value.activeInfo.remark) as Remark
+            switch (value.activeInfo.contentType){
+              case "204":
+                item.desc = remark.userName + "关注了你"
+                break;
+              case "206":
+                item.desc = remark.userName +"赞了你的作品"
+                break;
+              case "207":
+                item.desc = remark.userName + "赞了你的评论"
+                break;
+              case "208":
+                item.desc = remark.userName + "评论了你的作品"
+                break;
+              case "209":
+                item.desc = remark.userName + "回复了你的评论"
+                break;
+            }
             if (value.activeInfo.time) {
             if (value.activeInfo.time) {
               item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "")
               item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "")
             }
             }

+import { DateTimeUtils } from 'wdKit/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { AppointmentListUI } from '../mine/appointment/AppointmentListUI'
 import { AppointmentListUI } from '../mine/appointment/AppointmentListUI'
 
 
 const TAG = "AppointmentListPage"
 const TAG = "AppointmentListPage"
@@ -5,6 +7,19 @@ const TAG = "AppointmentListPage"
 @Entry
 @Entry
 @Component
 @Component
 struct AppointmentListPage {
 struct AppointmentListPage {
+  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.My_Saved_Live,TrackConstants.PageName.My_Saved_Live,duration)
+  }
 
 
   build() {
   build() {
     Column(){
     Column(){

@@ -73,7 +73,7 @@ export struct BottomNavigationComponent {
         TabContent() {
         TabContent() {
           if (CompUtils.isMine(navItem)) {
           if (CompUtils.isMine(navItem)) {
             // 我的页面组件数据列表
             // 我的页面组件数据列表
-            MinePageComponent()
+            MinePageComponent({isMinePage: this.currentNavIndex === this.bottomNavList.length-1})
           } else if (navItem.name === '视频') {
           } else if (navItem.name === '视频') {
             // 视频频道，包含视频和直播
             // 视频频道，包含视频和直播
             VideoChannelPage({
             VideoChannelPage({

@@ -424,7 +424,7 @@ export struct PaperSingleColumn999CardView {
       Text(this.item?.newsTitle)
       Text(this.item?.newsTitle)
         .fontColor('#222222')
         .fontColor('#222222')
         .fontSize(16)
         .fontSize(16)
-        .fontWeight(FontWeight.Bold)
+        .fontWeight(FontWeight.Medium)
         .alignSelf(ItemAlign.Start)
         .alignSelf(ItemAlign.Start)
         .maxLines(3)
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
@@ -478,6 +478,7 @@ export struct PaperSingleColumn999CardView {
       if (this.item) {
       if (this.item) {
         Row() {
         Row() {
           Row() {
           Row() {
+            if (this.item?.source.length > 0) {
               Text(this.item?.source)
               Text(this.item?.source)
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .fontColor('#B0B0B0')
@@ -486,9 +487,12 @@ export struct PaperSingleColumn999CardView {
                 .width(16)
                 .width(16)
                 .height(16)
                 .height(16)
                 .margin({ top: 10, bottom: 10 })
                 .margin({ top: 10, bottom: 10 })
+            }
+
             Text(this.getPublishTime())
             Text(this.getPublishTime())
               .fontSize(12)
               .fontSize(12)
               .fontColor('#B0B0B0')
               .fontColor('#B0B0B0')
+              .margin({ left: this.item?.source.length > 0?0:16 })
             if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
             if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
               Text(this.interactData.commentNum + "评")
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontSize(12)

 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { FollowFirstTabsComponent } from '../mine/follow/FollowFirstTabsComponent'
 import { FollowFirstTabsComponent } from '../mine/follow/FollowFirstTabsComponent'
 import router from '@ohos.router';
 import router from '@ohos.router';
+import { DateTimeUtils } from 'wdKit/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct FollowListPage {
 struct FollowListPage {
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @State curIndex: string = '0';
   @State curIndex: string = '0';
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   onPageShow() {
   onPageShow() {
     this.curIndex = this.params?.['index'];
     this.curIndex = this.params?.['index'];
+    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.My_Follow,TrackConstants.PageName.My_Follow,duration)
   }
   }
 
 
   build() {
   build() {

@@ -5,10 +5,12 @@ import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageUserSimpleInfoUI from '../mine/MinePageUserSimpleInfoUI'
 import MinePageUserSimpleInfoUI from '../mine/MinePageUserSimpleInfoUI'
 import MinePagePersonFunctionUI from '../mine/MinePagePersonFunctionUI'
 import MinePagePersonFunctionUI from '../mine/MinePagePersonFunctionUI'
 import MinePageMoreFunctionUI from '../mine/MinePageMoreFunctionUI'
 import MinePageMoreFunctionUI from '../mine/MinePageMoreFunctionUI'
-import { SPHelper, StringUtils } from 'wdKit'
+import { DateTimeUtils, SPHelper, StringUtils } from 'wdKit'
 import { SpConstants } from 'wdConstant'
 import { SpConstants } from 'wdConstant'
 import dataPreferences from '@ohos.data.preferences';
 import dataPreferences from '@ohos.data.preferences';
 import { MergeRecordDialog } from '../../dialog/MergeRecordDialog'
 import { MergeRecordDialog } from '../../dialog/MergeRecordDialog'
+import { TrackingPageBrowse } from 'wdTracking/src/main/ets/tracking/TrackingPageBrowse'
+import { TrackConstants } from 'wdTracking/src/main/ets/common/TrackConstants'
 
 
 const TAG = 'MinePageComponent';
 const TAG = 'MinePageComponent';
 
 
@@ -52,12 +54,35 @@ export struct MinePageComponent {
     autoCancel: false
     autoCancel: false
   })
   })
   @Consume @Watch('pageShowForUpdateData') pageShow :number
   @Consume @Watch('pageShowForUpdateData') pageShow :number
+  @Consume @Watch('pageHideForUpdateData') pageHide :number
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
+  pageFirstCreateTime:number = 0;
+  @Prop isMinePage:boolean = false;
 
 
+  //第一次还没创建时候 pageShow 接收不到监听
   pageShowForUpdateData(): void {
   pageShowForUpdateData(): void {
+    if(this.isMinePage){
       this.getMessageData()
       this.getMessageData()
+      this.pageShowTime = DateTimeUtils.getTimeStamp()
+    }
+  }
+  pageHideForUpdateData(): void {
+    if(this.isMinePage){
+      this.pageHideTime = DateTimeUtils.getTimeStamp()
+      let duration = 0
+      if(this.pageShowTime != 0){
+        duration = (this.pageHideTime - this.pageShowTime)/1000
+      }else{
+        duration = (this.pageHideTime - this.pageFirstCreateTime)/1000
+      }
+      TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.My,TrackConstants.PageName.My,Math.floor(duration))
+    }
   }
   }
 
 
   aboutToAppear(){
   aboutToAppear(){
+    this.pageFirstCreateTime = DateTimeUtils.getTimeStamp()
+
     this.getUserLogin()
     this.getUserLogin()
     this.getFunctionData()
     this.getFunctionData()
     this.addLoginStatusObserver()
     this.addLoginStatusObserver()

-import { PermissionUtil } from 'wdKit'
+import { DateTimeUtils, PermissionUtil } from 'wdKit'
 import { PrivacySettingModel } from '../../model/PrivacySettingModel'
 import { PrivacySettingModel } from '../../model/PrivacySettingModel'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 const TAG = 'PrivacySettingPage';
 const TAG = 'PrivacySettingPage';
 const DiyString = '开启个性化推荐'
 const DiyString = '开启个性化推荐'
@@ -15,9 +16,19 @@ export struct PrivacySettingPage {
   tips: string = '设置前可查阅'
   tips: string = '设置前可查阅'
   privacyTips: string = '《隐私政策》'
   privacyTips: string = '《隐私政策》'
   tipsEnd = '中相应权限使用规则'
   tipsEnd = '中相应权限使用规则'
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   onPageShow(): void {
   onPageShow(): void {
     this.getPermissionStatus();
     this.getPermissionStatus();
+    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.Privacy_Setting,TrackConstants.PageName.Privacy_Setting,duration)
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {

+import { DateTimeUtils } from 'wdKit/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { AboutPageUI } from '../setting/AboutPageUI';
 import { AboutPageUI } from '../setting/AboutPageUI';
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct SettingAboutPage {
 struct SettingAboutPage {
+  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.About,TrackConstants.PageName.About,duration)
+  }
+
+
   build() {
   build() {
     Column(){
     Column(){
       AboutPageUI()
       AboutPageUI()

@@ -4,6 +4,7 @@ import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { Action, Params } from 'wdBean';
 import { Action, Params } from 'wdBean';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -13,10 +14,39 @@ struct SettingPage {
   @State params:Params =  router.getParams() as Params;
   @State params:Params =  router.getParams() as Params;
   @State enterActivityTime:number = 0;
   @State enterActivityTime:number = 0;
 
 
-  onPageShow() {
+  pageShowSettingTime:number = 0;
+  pageHideSettingTime:number = 0;
+  pageShowAccountTime:number = 0;
+  pageHideAccountTime:number = 0;
 
 
+  onPageShow() {
     this.pageType = this.params.pageID;
     this.pageType = this.params.pageID;
     this.enterActivityTime = DateTimeUtils.getTimeStamp()
     this.enterActivityTime = DateTimeUtils.getTimeStamp()
+    if (this.pageType == 'mainSetting'){
+      this.pageShowSettingTime = DateTimeUtils.getTimeStamp()
+    }else{
+      this.pageShowAccountTime = DateTimeUtils.getTimeStamp()
+    }
+  }
+
+  onPageHide(): void {
+    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)
+    }
   }
   }
 
 
   build() {
   build() {

@@ -24,11 +24,7 @@ export struct AboutPageUI {
   })
   })
 
 
   build() {
   build() {
-    // Navigation() {
-      //滑动区域
       this.aboutUi()
       this.aboutUi()
-    // }.titleMode(NavigationTitleMode.Mini)
-    // .title('关于')
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
@@ -55,18 +51,6 @@ export struct AboutPageUI {
               this.dialogController.open()
               this.dialogController.open()
             })
             })
         )
         )
-      // Row(){
-      //
-      // }.backgroundColor(Color.Yellow)
-      // .width('100%')
-      // .height('97lpx')
-
-      // Row(){
-      //
-      // }.backgroundColor(Color.Yellow)
-      // .width('100%')
-      // .height('97lpx')
-
 
 
       List() {
       List() {
         ForEach(this.listData, (item: string, index: number) => {
         ForEach(this.listData, (item: string, index: number) => {

@@ -85,69 +85,6 @@ export struct MineSettingComponent {
     }
     }
   }
   }
 
 
-  // // 页面布局
-  // @Builder settingList() {
-  //   Column() {
-  //     List() {
-  //       // 循环渲染ListItemGroup，contactsGroups为多个分组联系人contacts和标题title的数据集合
-  //       ForEach(this.listData, (item: Array<string>, index: number) => {
-  //         ListItemGroup({ header: index === 0 ? this.itemHead("") : this.itemHead("1") }) {
-  //           // 循环渲染ListItem
-  //           ForEach(item, (subItem: string, subIndex: number) => {
-  //             ListItem() {
-  //               if (subIndex == 6) {
-  //                 this.getArrowCell(subItem, subIndex, index)
-  //               } else if (subIndex == 1 || subIndex == 3 || subIndex == 4 || subIndex == 5) {
-  //                 if (subIndex == 1 && index == 1) {
-  //                   this.getArrowCell(subItem, subIndex, index)
-  //                 } else {
-  //                   this.getSwitchCell(subItem, subIndex)
-  //                 }
-  //
-  //               } else {
-  //                 this.getArrowCell(subItem, subIndex, index)
-  //               }
-  //
-  //             }.padding({ left: '27lpx' })
-  //             .onClick(() => {
-  //
-  //               // // 在Home页面中
-  //               // let paramsInfo: object = {
-  //               //   pageId: 123,
-  //               //   pageType:'AccountAndSecurityLayout'
-  //               // };
-  //               console.log(subIndex + "")
-  //               if (subIndex == 0 && index == 0) {
-  //
-  //                 let params: Params = {
-  //                   pageID: 'AccountAndSecurityLayout'
-  //                 }
-  //                 WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
-  //               }else if (subIndex == 2 && index == 0) {
-  //                 WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
-  //               }else if (subIndex == 0 && index == 1) {
-  //                 this.dialogController.open()
-  //               }
-  //
-  //             })
-  //             .height('117lpx')
-  //           })
-  //         }
-  //         .divider({
-  //           strokeWidth: 1,
-  //           startMargin: 15,
-  //           endMargin: 10,
-  //           color: '#f0f0f0'
-  //         })
-  //       })
-  //     }.onScrollFrameBegin((offset, state) => {
-  //       return { offsetRemain: 0 }
-  //     })
-  //   }
-  //   .backgroundColor(Color.White)
-  //   .borderRadius(8)
-  // }
-
   // 页面布局
   // 页面布局
   @Builder settingList() {
   @Builder settingList() {
     Column() {
     Column() {
@@ -247,12 +184,6 @@ export struct MineSettingComponent {
       Row() {
       Row() {
         // 左侧logo和标题
         // 左侧logo和标题
         Row() {
         Row() {
-          // 判断有没有图片
-          // if (this.privacySwitch) {
-          //   Image('https://pic.rmb.bdstatic.com/e182cf67c341d1128d2a6cc05886bf62.jpeg@s_0,h_2000')
-          //     .height('38lpx')
-          //     .margin({ right: '5lpx' })
-          // }
           Text(`${item.title}`)
           Text(`${item.title}`)
             .margin({ top: '8lpx' })
             .margin({ top: '8lpx' })
             .height('38lpx')
             .height('38lpx')

@@ -233,7 +233,11 @@ export struct OperRowListView {
     if (this.showCommentIcon) {
     if (this.showCommentIcon) {
       Column() {
       Column() {
         if (this.publishCommentModel?.targetId) {
         if (this.publishCommentModel?.targetId) {
-          CommentIconComponent({ publishCommentModel: this.publishCommentModel, styleType: this.styleType })
+          CommentIconComponent({
+            publishCommentModel: this.publishCommentModel,
+            styleType: this.styleType,
+            contentDetail: this.contentDetailData
+          })
             .onClick(() => {
             .onClick(() => {
               this.onCommentIconClick()
               this.onCommentIconClick()
 
 

@@ -109,4 +109,5 @@ export class Remark{
   coverImageUrl:string = ""
   coverImageUrl:string = ""
   relationId:string = ""
   relationId:string = ""
   status:string = ""
   status:string = ""
+  userName:string = ""
 }
 }

 import router from '@ohos.router'
 import router from '@ohos.router'
-import { NetworkUtil, StringUtils } from 'wdKit';
+import { DateTimeUtils, NetworkUtil, StringUtils } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { editModelParams } from '../model/EditInfoModel';
 import { editModelParams } from '../model/EditInfoModel';
 import { HomePageBottomCommentComponent } from '../components/mine/home/HomePageBottomCommentComponent';
 import { HomePageBottomCommentComponent } from '../components/mine/home/HomePageBottomCommentComponent';
@@ -7,6 +7,7 @@ import { HomePageBottomFollowComponent } from '../components/mine/home/HomePageB
 import MinePageDatasModel from '../model/MinePageDatasModel';
 import MinePageDatasModel from '../model/MinePageDatasModel';
 import { EmptyComponent } from '../components/view/EmptyComponent';
 import { EmptyComponent } from '../components/view/EmptyComponent';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 const  TAG = "MineHomePage"
 const  TAG = "MineHomePage"
 
 
@@ -37,8 +38,11 @@ struct MineHomePage {
   @State isCommentEnter:string = "";
   @State isCommentEnter:string = "";
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   onPageShow(): void {
   onPageShow(): void {
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.getUserInfo()
     this.getUserInfo()
 
 
     let intervalID = setInterval(() => {
     let intervalID = setInterval(() => {
@@ -50,6 +54,13 @@ struct MineHomePage {
     }, 200);
     }, 200);
   }
   }
 
 
+  onPageHide(): void {
+    this.pageHideTime = DateTimeUtils.getTimeStamp()
+    let duration = 0
+    duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Main_Personal,TrackConstants.PageName.Main_Personal,duration)
+  }
+
   build() {
   build() {
     if(this.isConnectNetwork){
     if(this.isConnectNetwork){
       Stack({ alignContent: Alignment.Top }){
       Stack({ alignContent: Alignment.Top }){

 import router from '@ohos.router'
 import router from '@ohos.router'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
-import { NetworkUtil, StringUtils } from 'wdKit';
+import { DateTimeUtils, NetworkUtil, StringUtils } from 'wdKit';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { OtherHomePageBottomCommentComponent } from '../components/mine/home/OtherHomePageBottomCommentComponent';
 import { OtherHomePageBottomCommentComponent } from '../components/mine/home/OtherHomePageBottomCommentComponent';
 import { OtherHomePageBottomFollowComponent } from '../components/mine/home/OtherHomePageBottomFollowComponent';
 import { OtherHomePageBottomFollowComponent } from '../components/mine/home/OtherHomePageBottomFollowComponent';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
@@ -16,9 +17,20 @@ struct OtherNormalUserHomePage {
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @Watch('change') @State curUserId: string = '-1';
   @Watch('change') @State curUserId: string = '-1';
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
+
 
 
   onPageShow() {
   onPageShow() {
     this.curUserId = this.params?.['userId'];
     this.curUserId = this.params?.['userId'];
+    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.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration)
   }
   }
 
 
   change(){
   change(){

+import { DateTimeUtils } from 'wdKit/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { SearchComponent } from '../components/search/SearchComponent'
 import { SearchComponent } from '../components/search/SearchComponent'
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct SearchPage {
 struct SearchPage {
+  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.Search,TrackConstants.PageName.Search,duration)
+  }
+
   build() {
   build() {
     Column(){
     Column(){
       SearchComponent()
       SearchComponent()

@@ -41,11 +41,23 @@ class SystemInfo{
   time: string = ""
   time: string = ""
   title: string = ""
   title: string = ""
   userId: number = -1
   userId: number = -1
+  remark: string = ""
 }
 }
 
 
 class ActiveInfo{
 class ActiveInfo{
-  id:string = ""
+  classify: string = ""
+  contentId: string = ""
+  contentType: string = ""
+  id: number = -1
   message: string = ""
   message: string = ""
+  platform: string = ""
+  privateMailId: number = -1
+  privateMailIds: string = ""
+  privateMailNum: number = -1
+  read: boolean = false
+  source: string = ""
   time: string = ""
   time: string = ""
   title: string = ""
   title: string = ""
+  userId: number = -1
+  remark: string = ""
 }
 }

@@ -80,7 +80,7 @@ export class PageHelper {
         return;
         return;
       }
       }
       pageModel.pageInfo = pageInfo;
       pageModel.pageInfo = pageInfo;
-      pageModel.cachePageInfoMd5 = pageInfo.md5
+      pageModel.displayPageInfoMd5 = pageInfo.md5
       //解析页面挂角广告资源
       //解析页面挂角广告资源
       pageAdvModel.analysisAdvSource(pageInfo);
       pageAdvModel.analysisAdvSource(pageInfo);
       this.parseGroup(pageModel, true)
       this.parseGroup(pageModel, true)
@@ -129,7 +129,7 @@ export class PageHelper {
           return;
           return;
         }
         }
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
-        if (pageInfo.md5 == pageModel.cachePageInfoMd5) {
+        if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
           // 缓存一致，不解析
           // 缓存一致，不解析
           Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
           Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
         } else {
         } else {
@@ -138,6 +138,7 @@ export class PageHelper {
             // 保存缓存
             // 保存缓存
             CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
             CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
           }
           }
+          pageModel.displayPageInfoMd5 = pageInfo.md5
           //解析页面挂角广告资源
           //解析页面挂角广告资源
           pageAdvModel.analysisAdvSource(pageInfo);
           pageAdvModel.analysisAdvSource(pageInfo);
         }
         }
@@ -185,15 +186,25 @@ export class PageHelper {
       Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
       Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
       if (isCache) {
       if (isCache) {
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
-        pageModel.cacheGroupInfoMd5 = pageDto.md5
+        pageModel.displayGroupInfoMd5 = pageDto.md5
       } else {
       } else {
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
-        if (pageDto.md5 == pageModel.cacheGroupInfoMd5) {
+        if (pageDto.md5 == pageModel.displayGroupInfoMd5) {
           Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
           Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
+          // 下拉刷新场景，数据没变，拦截刷新UI，重置相关参数
+          if (pageModel.loadStrategy === 2) {
             // 缓存数据一致，不再刷新
             // 缓存数据一致，不再刷新
+            this.refreshUIEnd(pageModel, true)
+            // 第一页不刷新，分页数据清除
+            pageModel.hasMore = true
+            this.deleteMorePage(pageModel)
+            pageModel.pageTotalCompSize = pageModel.compList.size()
+          }
+          pageModel.currentPage++
           return
           return
         }
         }
-        Logger.debug(TAG, 'parseGroup cache load, save: ')
+        pageModel.displayGroupInfoMd5 = pageDto.md5
+        Logger.debug(TAG, 'parseGroup cache load, save: ' + pageDto.md5)
         // 保存缓存
         // 保存缓存
         CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
         CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
           pageDto.md5)
           pageDto.md5)
@@ -238,9 +249,11 @@ export class PageHelper {
 
 
     // 批查互动数据
     // 批查互动数据
     this.allCompBatchRequest(pageInfo.oneRequestPageGroupCompList.convertToArray(), pageModel)
     this.allCompBatchRequest(pageInfo.oneRequestPageGroupCompList.convertToArray(), pageModel)
-
-    //
+    // 记录第一页数量
+    this.saveFirstPageEndIndex(pageModel)
+    if (!isCache) {
       pageModel.currentPage++
       pageModel.currentPage++
+    }
     pageModel.viewType = ViewType.LOADED
     pageModel.viewType = ViewType.LOADED
     this.refreshUIEnd(pageModel, true)
     this.refreshUIEnd(pageModel, true)
 
 
@@ -754,6 +767,40 @@ export class PageHelper {
     }
     }
 
 
   }
   }
+
+  saveFirstPageEndIndex(pageModel: PageModel) {
+    pageModel.firstPageEndIndex = pageModel.compList.size() - 1
+  }
+
+  static updateFirstPageEndIndex(pageModel: PageModel, isDel: boolean, index: number) {
+    if (index > pageModel.firstPageEndIndex) {
+      return
+    }
+    // 这里默认删除、添加都是一条一条处理
+    let count = 1
+    let endIndex = pageModel.firstPageEndIndex
+    if (isDel) {
+      // 第一页里删除
+      let offset = Math.min(endIndex - index, count)
+      endIndex = endIndex - offset
+    } else {
+      // 第一页里添加
+      endIndex = endIndex + count
+    }
+    pageModel.firstPageEndIndex = endIndex
+  }
+
+  /**
+   * 删除分页数据，保留第一页的数据。（下拉刷新场景用到）
+   */
+  deleteMorePage(pageModel: PageModel) {
+    Logger.debug(TAG, 'deleteMorePage endindex: ' + pageModel.firstPageEndIndex)
+    if (pageModel.firstPageEndIndex < 0) {
+      return
+    }
+    // 从第二页开始删
+    pageModel.compList.deleteItems(pageModel.firstPageEndIndex + 1)
+  }
 }
 }
 
 
 
 

@@ -63,9 +63,11 @@ export default class PageModel {
   pageType: number = 0;
   pageType: number = 0;
 
 
   extra: string = ''
   extra: string = ''
-  // 缓存数据相关
-  cachePageInfoMd5: string = ''
-  cacheGroupInfoMd5: string = ''
+  // 页面加载，md5数据相关（初始缓存、下拉刷新用到）
+  displayPageInfoMd5: string = ''
+  displayGroupInfoMd5: string = ''
+  // 第一页，最后一个comp下标，用于区分分页加载（下拉刷新，清除分页数据）
+  firstPageEndIndex = -1
 
 
   /**
   /**
    * 简单复制业务数据
    * 简单复制业务数据

@@ -12,6 +12,7 @@
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
+    "wdTracking": "file:../../features/wdTracking"
   }
   }
 }
 }

@@ -10,6 +10,7 @@ import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/mai
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import { loginComponentManager, LoginWithHuaweiIDButton } from '@hms.core.account.LoginComponent'
 import { loginComponentManager, LoginWithHuaweiIDButton } from '@hms.core.account.LoginComponent'
 import { BusinessError } from '@ohos.base'
 import { BusinessError } from '@ohos.base'
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index'
 
 
 @Extend(Row)
 @Extend(Row)
 function otherStyle() {
 function otherStyle() {
@@ -55,6 +56,8 @@ struct LoginPage {
     customStyle: true,
     customStyle: true,
     maskColor:"#00000000"
     maskColor:"#00000000"
   })
   })
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   loginViewModel = new LoginViewModel()
   loginViewModel = new LoginViewModel()
   @State isProtocol:boolean=false
   @State isProtocol:boolean=false
@@ -70,7 +73,15 @@ struct LoginPage {
   }
   }
 
 
   onPageShow() {
   onPageShow() {
-    Logger.debug(TAG, "onPageShow:" + this.isCodeSend + "")
+    Logger.debug(TAG, "onPageShow:" + this.isCodeSend + " ")
+    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.Login_Page,TrackConstants.PageName.Login_Page,duration)
   }
   }
 
 
   build() {
   build() {

-import { CustomToast} from 'wdKit/Index';
+import { CustomToast, DateTimeUtils} from 'wdKit/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { LoginModel } from './LoginModel';
 import { LoginModel } from './LoginModel';
 import { ModifyPasswordRequestItem } from './ModifyPasswordRequestItem';
 import { ModifyPasswordRequestItem } from './ModifyPasswordRequestItem';
 import { router } from '@kit.ArkUI';
 import { router } from '@kit.ArkUI';
 import { encryptMessage } from '../../utils/cryptoUtil';
 import { encryptMessage } from '../../utils/cryptoUtil';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 /**
 /**
  * 修改密码页面
  * 修改密码页面
@@ -26,7 +27,19 @@ struct ModifyPasswordPage {
     customStyle: true,
     customStyle: true,
     maskColor:"#00000000"
     maskColor:"#00000000"
   })
   })
+  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_Passwd,TrackConstants.PageName.Change_Passwd,duration)
+  }
 
 
   build() {
   build() {
     Row() {
     Row() {

@@ -97,7 +97,7 @@ export namespace TrackConstants {
 
 
     /// 设置页
     /// 设置页
     Setting = "settingPage",
     Setting = "settingPage",
-    /// 账号管理
+    /// 账号管理//账户与安全
     Account_Management = "accountManagementPage",
     Account_Management = "accountManagementPage",
     /// 注销账户
     /// 注销账户
     Cancel_Account = "cancelAccountPage",
     Cancel_Account = "cancelAccountPage",