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

@@ -751,7 +751,7 @@ export struct DynamicDetailComponent {
       return
       return
     }
     }
     const params: postExecuteLikeParams = {
     const params: postExecuteLikeParams = {
-      status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
+      status: this.newsStatusOfUser?.likeStatus === '1' ? 0 : 1,
       contentId: this.contentDetailData?.newsId + '',
       contentId: this.contentDetailData?.newsId + '',
       contentType: this.contentDetailData?.newsType + '',
       contentType: this.contentDetailData?.newsType + '',
     }
     }

@@ -10,6 +10,7 @@ import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
 import { newsSkeleton } from './skeleton/newsSkeleton';
 import { newsSkeleton } from './skeleton/newsSkeleton';
 import { Logger, ToastUtils, NetworkUtil } from 'wdKit/Index';
 import { Logger, ToastUtils, NetworkUtil } from 'wdKit/Index';
+import { promptAction } from '@kit.ArkUI';
 
 
 @Component
 @Component
 export struct ENewspaperPageComponent {
 export struct ENewspaperPageComponent {
@@ -270,6 +271,10 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_page_num')
         .id('e_newspaper_page_num')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
+          if(!NetworkUtil.isNetConnected()){
+            ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+            return
+          }
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
             this.pageDialogShow = !this.pageDialogShow
             this.pageDialogShow = !this.pageDialogShow
             if (this.pageDialogShow) {
             if (this.pageDialogShow) {
@@ -305,6 +310,10 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_read')
         .id('e_newspaper_read')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
+          if(!NetworkUtil.isNetConnected()){
+            ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+            return
+          }
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
             this.isOpenListDialog = true
             this.isOpenListDialog = true
           }else {
           }else {

@@ -24,6 +24,10 @@ export struct ImageDownloadComponent {
 
 
   build() {
   build() {
     Column() {
     Column() {
+      // Image($r('app.media.save_detail_img'))
+      //   .width(24)
+      //   .height(24)
+      //   .margin({bottom:6})
       SaveButton({ icon: SaveIconStyle.LINES })
       SaveButton({ icon: SaveIconStyle.LINES })
         .iconSize(24)
         .iconSize(24)
         .iconColor(Color.White)
         .iconColor(Color.White)
@@ -33,7 +37,8 @@ export struct ImageDownloadComponent {
             await this.saveImage(this.imageBuffer);
             await this.saveImage(this.imageBuffer);
             promptAction.showToast({
             promptAction.showToast({
               message: $r('app.string.image_request_success'),
               message: $r('app.string.image_request_success'),
-              duration: 2000
+              duration: 2000,
+              alignment:Alignment.Center
             })
             })
           }
           }
         })
         })

@@ -239,15 +239,9 @@ export struct MorningEveningPaperComponent {
     // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
   }
 
 
-  onPageShow(){
-    TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
-  }
-
   onPageHide() {
   onPageHide() {
     this.status = PlayerConstants.STATUS_PAUSE;
     this.status = PlayerConstants.STATUS_PAUSE;
     this.playerController?.pause();
     this.playerController?.pause();
-
-    TrackingPageBrowseUtils.TrackingPageBrowseExposureEnd('','',TrackParamConvert.pageInfoBean_ParamType(this.pageInfoBean))
   }
   }
 
 
   build() {
   build() {
@@ -259,11 +253,12 @@ export struct MorningEveningPaperComponent {
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
             topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
           }
           }
 
 
-          if (this.audioPlayUrl.length > 0){
-            ListItem() {
-              this.AudioBarView(this.simpleAudioDialog)
-            }
-          }
+          //暂时不展示音频播报
+          // if (this.audioPlayUrl.length > 0){
+          //   ListItem() {
+          //     this.AudioBarView(this.simpleAudioDialog)
+          //   }
+          // }
         }
         }
 
 
         ListItem() {
         ListItem() {

@@ -18,11 +18,10 @@ const TAG = 'QualityCommentsComponent';
 @Preview
 @Preview
 @Component
 @Component
 export struct QualityCommentsComponent {
 export struct QualityCommentsComponent {
-
   //刷新
   //刷新
-  @State viewType:number = ViewType.LOADING;
+  @State viewType: number = ViewType.LOADING;
   @State hasMore: boolean = true;
   @State hasMore: boolean = true;
-  @State  currentPage: number = 1;
+  @State currentPage: number = 1;
   private scroller: Scroller = new Scroller();
   private scroller: Scroller = new Scroller();
   @State tileOpacity: number = 0;
   @State tileOpacity: number = 0;
   firstPositionY: number = 0;
   firstPositionY: number = 0;
@@ -32,11 +31,9 @@ export struct QualityCommentsComponent {
   currentWindowColor: string = '#FF4202'
   currentWindowColor: string = '#FF4202'
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State dialogController: CustomDialogController | null = null;
   @State dialogController: CustomDialogController | null = null;
-
   /*必传*/
   /*必传*/
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
 
 
-
   aboutToDisappear(): void {
   aboutToDisappear(): void {
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
     this.dialogController = null // 将dialogController置空
     this.dialogController = null // 将dialogController置空
@@ -55,7 +52,7 @@ export struct QualityCommentsComponent {
     this.showAlert()
     this.showAlert()
   }
   }
 
 
-  showAlert(){
+  showAlert() {
     this.dialogController = new CustomDialogController({
     this.dialogController = new CustomDialogController({
       builder: CommentCustomDialog({
       builder: CommentCustomDialog({
         confirm: (value: Record<string, string>) => {
         confirm: (value: Record<string, string>) => {
@@ -74,9 +71,11 @@ export struct QualityCommentsComponent {
     })
     })
   }
   }
 
 
-  getData(resolve?: (value: string | PromiseLike<string>) => void){
+  getData(resolve?: (value: string | PromiseLike<string>) => void) {
     commentViewModel.fetchQualityCommentList(this.currentPage + '').then((commentListModel) => {
     commentViewModel.fetchQualityCommentList(this.currentPage + '').then((commentListModel) => {
-      if(resolve) resolve('刷新成功')
+      if (resolve) {
+        resolve('刷新成功')
+      }
 
 
       if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
       if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
         if (this.currentPage === 1) {
         if (this.currentPage === 1) {
@@ -143,6 +142,7 @@ export struct QualityCommentsComponent {
     .height(this.topSafeHeight + vp2px(44) + 'px')
     .height(this.topSafeHeight + vp2px(44) + 'px')
     .width('100%')
     .width('100%')
     .backgroundColor($r('app.color.color_transparent'))
     .backgroundColor($r('app.color.color_transparent'))
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
   }
   }
 
 
   /*导航栏*/
   /*导航栏*/
@@ -187,62 +187,66 @@ export struct QualityCommentsComponent {
     .height(this.topSafeHeight + vp2px(44) + 'px')
     .height(this.topSafeHeight + vp2px(44) + 'px')
     .width('100%')
     .width('100%')
     .backgroundColor($r('app.color.white'))
     .backgroundColor($r('app.color.white'))
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
   }
   }
 
 
   build() {
   build() {
-    Column() {
-
-
-      Stack({ alignContent: Alignment.Top }) {
-
-        Scroll() {
-          Column() {
-            Stack() {
-              this.titleHeader()
-
-              if(this.viewType == ViewType.ERROR){
-                ErrorComponent()
-              }else if(this.viewType == ViewType.EMPTY){
-                EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoComment})
-              }else {
+    Stack({ alignContent: Alignment.Top }) {
+      Scroll() {
+        Column() {
+          Stack() {
+            this.titleHeader()
+
+            if (this.viewType == ViewType.ERROR) {
+              ErrorComponent()
+            } else if (this.viewType == ViewType.EMPTY) {
+              EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoComment })
+            } else {
               this.listLayout()
               this.listLayout()
-              }
+            }
 
 
-            }.alignContent(Alignment.Top)
-          }.backgroundColor(this.currentWindowColor).width('100%')
+          }.alignContent(Alignment.Top)
         }
         }
-        .friction(0.6)
-        .scrollBar(BarState.Off)
-        .edgeEffect(EdgeEffect.None)
-        .width('100%')
-        .height('100%')
-
-        this.TabbarTransparent()
-        this.TabbarNormal()
-
+        .backgroundColor(this.currentWindowColor).width('100%')
       }
       }
+      .friction(0.6)
+      .scrollBar(BarState.Off)
+      .edgeEffect(EdgeEffect.None)
+      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
 
 
+      this.TabbarTransparent()
+      this.TabbarNormal()
     }
     }
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
 
 
   }
   }
 
 
   @Builder
   @Builder
-  listLayout(){
-    List({ space: 12, scroller:this.scroller }) {
+  listLayout() {
+    List({ space: 12, scroller: this.scroller }) {
       // ListItemGroup({ header: this.titleHeader() })
       // ListItemGroup({ header: this.titleHeader() })
       LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
       LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
         ListItem() {
         ListItem() {
-          QualityCommentItem({ item: item, index: index , dialogController:this.dialogController, publishCommentModel:this.publishCommentModel}).margin({ left: 12, right: 12 })
+          QualityCommentItem({
+            item: item,
+            index: index,
+            dialogController: this.dialogController,
+            publishCommentModel: this.publishCommentModel
+          }).margin({ left: 12, right: 12 })
         }
         }
       })
       })
       // 加载更多
       // 加载更多
       ListItem() {
       ListItem() {
-        if (this.hasMore === false) NoMoreLayout()
+        if (this.hasMore === false) {
+          NoMoreLayout()
+        }
       }
       }
+
       // ListItem() {
       // ListItem() {
       //
       //
       // }.height(`${this.bottomSafeHeight}` + 'px')
       // }.height(`${this.bottomSafeHeight}` + 'px')
-    }.onReachEnd(()=>{
+    }
+    .onReachEnd(() => {
       this.currentPage++
       this.currentPage++
       this.getData()
       this.getData()
     })
     })
@@ -255,14 +259,9 @@ export struct QualityCommentsComponent {
       scrollBackward: NestedScrollMode.SELF_FIRST
       scrollBackward: NestedScrollMode.SELF_FIRST
     })
     })
   }
   }
-
-
-
 }
 }
 
 
 
 
-
-
 @Component
 @Component
 struct QualityCommentItem {
 struct QualityCommentItem {
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
@@ -279,7 +278,8 @@ struct QualityCommentItem {
 
 
           Image(this.item.fromUserHeader)
           Image(this.item.fromUserHeader)
 
 
-            .alt($r(commentViewModel.adjustUserType(this.item.fromUserType) ? 'app.media.WDAccountOwnerHedaerDefaultIcon' : 'app.media.WDAccountDefaultIcon'))
+            .alt($r(commentViewModel.adjustUserType(this.item.fromUserType) ?
+              'app.media.WDAccountOwnerHedaerDefaultIcon' : 'app.media.WDAccountDefaultIcon'))
             .width(50)
             .width(50)
             .height(50)
             .height(50)
             .borderRadius(25)
             .borderRadius(25)
@@ -296,7 +296,7 @@ struct QualityCommentItem {
               }
               }
             )
             )
             .onClick(() => {
             .onClick(() => {
-               this.jumpToAccountOwner()
+              this.jumpToAccountOwner()
             })
             })
           Text(this.item.fromUserName)
           Text(this.item.fromUserName)
             .fontSize(14)
             .fontSize(14)
@@ -376,7 +376,7 @@ struct QualityCommentItem {
             Row() {
             Row() {
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
             }.height('100%')
             }.height('100%')
-            .onClick(()=>{
+            .onClick(() => {
               this.replyComment()
               this.replyComment()
             })
             })
 
 

@@ -3,6 +3,9 @@ import { CommonConstants, ConfigConstants, ScreenType } from 'wdConstant';
 import { Logger, ToastUtils, DateTimeUtils } from 'wdKit';
 import { Logger, ToastUtils, DateTimeUtils } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
 import { ProcessUtils, WDRouterRule } from 'wdRouter';
 import { ProcessUtils, WDRouterRule } from 'wdRouter';
+import { TrackConstants,
+  TrackingButton,
+  TrackingContent, TrackingPageBrowse, TrackParamConvert } from 'wdTracking/Index';
 
 
 const TAG: string = 'CardView';
 const TAG: string = 'CardView';
 
 
@@ -528,6 +531,11 @@ export struct PaperSingleColumn999CardView {
     .borderRadius(4)
     .borderRadius(4)
     .onClick(() => {
     .onClick(() => {
       ProcessUtils.processPage(this.item)
       ProcessUtils.processPage(this.item)
+      TrackingContent.common(TrackConstants.EventType.Click,TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews,TrackParamConvert.program(this.item))
+    }).onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
+      if (isVisible) {
+        TrackingContent.common(TrackConstants.EventType.Show,TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews,TrackParamConvert.program(this.item))
+      }
     })
     })
   }
   }
 
 

@@ -73,13 +73,14 @@ struct EditUserInfoPage {
               .width('30')
               .width('30')
               .height('30')
               .height('30')
           }
           }
-        }.margin({top:20,bottom:-10})
-
-        Button('点击更换头像')
-          .fontColor(Color.Gray)
-          .fontSize(15)
-          .backgroundColor(Color.White)
-          .margin(20)
+        }.margin({top:20,bottom:40})
+
+        ///目前不支持头像上传，暂时屏蔽
+        // Button('点击更换头像')
+        //   .fontColor(Color.Gray)
+        //   .fontSize(15)
+        //   .backgroundColor(Color.White)
+        //   .margin(20)
 
 
         List({}){
         List({}){
           ForEach(this.listData,(item:EditListInfo,index:number) =>{
           ForEach(this.listData,(item:EditListInfo,index:number) =>{

@@ -14,7 +14,7 @@ import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
 import { MyCustomDialog } from '../reusable/MyCustomDialog'
 import { MyCustomDialog } from '../reusable/MyCustomDialog'
 import { NetworkUtil } from 'wdKit/Index';
 import { NetworkUtil } from 'wdKit/Index';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
-import { TrackConstants } from 'wdTracking/Index';
+import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -36,6 +36,9 @@ struct MyCollectionListPage {
     builder: MyCustomDialog({
     builder: MyCustomDialog({
       confirm: () => {
       confirm: () => {
         this.deleteDatas()
         this.deleteDatas()
+        if (this.isAllSelect) {
+          TrackingButton.click('morning_evening_news_click',TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect)
+        }
       },
       },
       titleShow:false,
       titleShow:false,
       tipValue: this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏'
       tipValue: this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏'
@@ -146,7 +149,14 @@ struct MyCollectionListPage {
       Column() {
       Column() {
         BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO})
         BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO})
       }
       }
-    }
+    }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
+      if (isVisible) {
+        TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect, TrackParamConvert.program(compDTO))
+      }
+    })
+    // .onClick(()=>{
+    //   TrackingContent.common(TrackConstants.EventType.Click, TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect, TrackParamConvert.program(compDTO))
+    // })
   }
   }
 
 
 
 

@@ -8,6 +8,7 @@ import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
 import { channelSkeleton } from '../skeleton/channelSkeleton';
 import { channelSkeleton } from '../skeleton/channelSkeleton';
+import { TrackConstants, TrackingButton } from 'wdTracking/Index';
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
 
 
@@ -83,16 +84,16 @@ export struct TopNavigationComponentNew {
                 PeopleShipMainComponent({
                 PeopleShipMainComponent({
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   navIndex: index,
                   navIndex: index,
-                  pageId: navItem.pageId + '',
-                  channelId: navItem.channelId + '',
+                  pageId: navItem?.pageId + '',
+                  channelId: navItem?.channelId + '',
                 })
                 })
               } else
               } else
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                   PageComponent({
                   PageComponent({
                     currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                     currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                     navIndex: index,
                     navIndex: index,
-                    pageId: navItem.pageId + '',
-                    channelId: navItem.channelId + '',
+                    pageId: navItem?.pageId + '',
+                    channelId: navItem?.channelId + '',
                     autoRefresh: this.autoRefresh2Page
                     autoRefresh: this.autoRefresh2Page
                   })
                   })
                 } else {
                 } else {
@@ -171,6 +172,7 @@ export struct TopNavigationComponentNew {
         .onClick(() => {
         .onClick(() => {
           if (NetworkUtil.isNetConnected()) {
           if (NetworkUtil.isNetConnected()) {
             ProcessUtils.gotoMorningEveningPaper()
             ProcessUtils.gotoMorningEveningPaper()
+            TrackingButton.click('morning_evening_news_click',TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews)
           } else {
           } else {
             ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
             ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
           }
           }

@@ -5,6 +5,11 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { ContentDetailDTO } from 'wdBean/Index';
 import { ContentDetailDTO } from 'wdBean/Index';
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
+import {
+  ContentDetailRequest,
+  postExecuteLikeParams,
+  batchLikeAndCollectParams,
+} from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 
 
 const TAG = 'LikeComponent';
 const TAG = 'LikeComponent';
 
 
@@ -40,8 +45,9 @@ export struct LikeComponent {
   }
   }
 
 
   onDataUpdated() {
   onDataUpdated() {
+    console.log(TAG, '点赞点击')
     if (this.data) {
     if (this.data) {
-      if (this.data['channelId'] !== 'undefined') {
+      if (this.data['contentType'] !== 'undefined') {
         //获取点赞状态
         //获取点赞状态
         this.getLikeStatus()
         this.getLikeStatus()
         //获取点赞数
         //获取点赞数
@@ -300,13 +306,26 @@ export struct LikeComponent {
 
 
   executeLike(status: string) {
   executeLike(status: string) {
     console.log(TAG, '点赞接口调用', status)
     console.log(TAG, '点赞接口调用', status)
-    this.data['status'] = status
-    this.data['contentId'] = this.contentDetailData?.newsId + ''
-    this.data['contentType'] = this.contentDetailData?.newsType + ''
 
 
-    this.viewModel.executeLike2(this.data).then(() => {
+    const params: postExecuteLikeParams = {
+      status: Number(status),
+      contentId: this.data['contentId'],
+      contentType: this.data['contentType']
+    }
+    if(this.data['relType']) {
+      params.relType = this.data['relType']
+    }
+    if(this.data['contentRelId']) {
+      params.contentRelId = this.data['contentRelId']
+    }
+    if(this.data['channelId']) {
+      params.channelId = this.data['channelId']
+    }
+
+    console.log(TAG, "点赞 params", JSON.stringify(params))
+    ContentDetailRequest.postExecuteLike(params).then((data) => {
 
 
-      console.log(TAG, '点赞接口调用成功')
+      console.log(TAG, '点赞接口调用成功', JSON.stringify(data))
 
 
       // 直播点赞一直增加
       // 直播点赞一直增加
       if (this.contentDetailData.liveInfo) {
       if (this.contentDetailData.liveInfo) {
@@ -333,11 +352,25 @@ export struct LikeComponent {
   }
   }
 
 
   getLikeStatus() {
   getLikeStatus() {
-    this.viewModel.getLikeStatus(this.data).then((data) => {
-      if (data && data['data'].length && data['data'][0]['likeStatus']) {
-        this.likeStatus = data['data'][0]['likeStatus']
-      } else {
-        this.likeStatus = false
+    // console.log(TAG, "this.data", JSON.stringify(this.data))
+    const params: batchLikeAndCollectParams = {
+      contentList: [
+        {
+          contentId: this.data['contentId'],
+          contentType: this.data['contentType'],
+          contentRelId: this.data['contentRelId'] || ''  + '',
+        }
+      ]
+    }
+    console.log(TAG, "查询点赞状态params", JSON.stringify(params))
+    ContentDetailRequest.postBatchLikeAndCollectStatus(params).then(res => {
+      console.log(TAG, '查询点赞、收藏状态==', JSON.stringify(res.data))
+      if (res.data) {
+        if(res.data[0].likeStatus) {
+          this.likeStatus = res.data[0].likeStatus ? true : false
+        } else {
+          this.likeStatus = false
+        }
       }
       }
     }).catch(() => {
     }).catch(() => {
       this.likeStatus = false
       this.likeStatus = false

@@ -36,6 +36,7 @@ const TAG = 'OperRowListView';
  * 注意：外层需注册 @Provide contentDetailData:contentDetailData = {} as contentDetailData
  * 注意：外层需注册 @Provide contentDetailData:contentDetailData = {} as contentDetailData
  * 传值示例：
  * 传值示例：
  OperRowListView({
  OperRowListView({
+
  contentDetailData: this.contentDetailData[0],
  contentDetailData: this.contentDetailData[0],
  operationButtonList: ['comment', 'like', 'collect', 'listen', 'share']
  operationButtonList: ['comment', 'like', 'collect', 'listen', 'share']
  })
  })
@@ -123,11 +124,25 @@ export struct OperRowListView {
     await this.queryContentInteractCount()
     await this.queryContentInteractCount()
     // 点赞需要数据
     // 点赞需要数据
     this.likeBean['contentId'] = this.contentDetailData.newsId + ''
     this.likeBean['contentId'] = this.contentDetailData.newsId + ''
-    this.likeBean['userName'] = this.contentDetailData.userInfo?.userName + ''
+    if(this.contentDetailData.userInfo?.userName) {
+      this.likeBean['userName'] = this.contentDetailData.userInfo?.userName + ''
+    }
     this.likeBean['contentType'] = this.contentDetailData.newsType + ''
     this.likeBean['contentType'] = this.contentDetailData.newsType + ''
-    this.likeBean['title'] = this.contentDetailData.newsTitle + ''
-    this.likeBean['userHeaderUrl'] = this.contentDetailData.userInfo?.headPhotoUrl + ''
-    this.likeBean['channelId'] = this.contentDetailData.reLInfo?.channelId + ''
+    if(this.contentDetailData.newsTitle) {
+      this.likeBean['title'] = this.contentDetailData.newsTitle + ''
+    }
+    if(this.contentDetailData.userInfo?.headPhotoUrl) {
+      this.likeBean['userHeaderUrl'] = this.contentDetailData.userInfo?.headPhotoUrl  + ''
+    }
+    if(this.contentDetailData.reLInfo?.channelId) {
+      this.likeBean['channelId'] = this.contentDetailData.reLInfo?.channelId  + ''
+    }
+    if(this.contentDetailData?.reLInfo?.relType) {
+      this.likeBean['relType'] = this.contentDetailData?.reLInfo?.relType   + ''
+    }
+    if(this.contentDetailData?.reLInfo?.relId) {
+      this.likeBean['contentRelId'] = this.contentDetailData?.reLInfo?.relId   + ''
+    }
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     // 评论需要数据
     // 评论需要数据
@@ -202,7 +217,7 @@ export struct OperRowListView {
       .padding({
       .padding({
         top: 10,
         top: 10,
         // bottom: 10
         // bottom: 10
-        bottom: px2vp(this.bottomSafeHeight)
+        bottom: `${this.bottomSafeHeight}px`
         // bottom: 50
         // bottom: 50
       })
       })
     }
     }
@@ -387,6 +402,7 @@ export struct OperRowListView {
           }
           }
         ]
         ]
       }
       }
+      console.info(TAG, '查询用户对作品收藏1', JSON.stringify(params))
       // console.info(TAG, '查询用户对作品收藏11', JSON.stringify(params))
       // console.info(TAG, '查询用户对作品收藏11', JSON.stringify(params))
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
       console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data))
       console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data))

@@ -34,7 +34,7 @@
     },
     },
     {
     {
       "name": "image_request_success",
       "name": "image_request_success",
-      "value": "图片下载到图库成功"
+      "value": "已保存到相册"
     },
     },
     {
     {
       "name": "image_request_fail",
       "name": "image_request_fail",

@@ -119,7 +119,7 @@ export interface postBatchAttentionStatusResult {
 
 
 
 
 export interface postExecuteLikeParams {
 export interface postExecuteLikeParams {
-  status: string;
+  status: number;
   contentId: string;
   contentId: string;
   contentType: string;
   contentType: string;
   relType?: string;
   relType?: string;

@@ -112,7 +112,7 @@ export struct DetailPlayShortVideoPage {
           {
           {
             contentId: this.contentDetailData?.newsId + '',
             contentId: this.contentDetailData?.newsId + '',
             contentType: this.contentDetailData?.newsType + '',
             contentType: this.contentDetailData?.newsType + '',
-            contentRelId: this.contentDetailData?.reLInfo?.relId + '',
+            contentRelId: this.contentDetailData?.reLInfo?.relId || '' + '',
           }
           }
         ]
         ]
       }
       }

@@ -74,7 +74,7 @@ export struct OperationListView {
       return
       return
     }
     }
     const params: postExecuteLikeParams = {
     const params: postExecuteLikeParams = {
-      status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
+      status: this.newsStatusOfUser?.likeStatus === '1' ? 0 : 1,
       contentId: this.contentDetailData?.newsId + '',
       contentId: this.contentDetailData?.newsId + '',
       contentType: this.contentDetailData?.newsType + '',
       contentType: this.contentDetailData?.newsType + '',
     }
     }

@@ -56,15 +56,22 @@ export struct PlayerRightView {
       return
       return
     }
     }
     const params: postExecuteLikeParams = {
     const params: postExecuteLikeParams = {
-      status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
+      status: this.newsStatusOfUser?.likeStatus === '1' ? 0 : 1,
       contentId: this.contentDetailData?.newsId + '',
       contentId: this.contentDetailData?.newsId + '',
       contentType: this.contentDetailData?.newsType + '',
       contentType: this.contentDetailData?.newsType + '',
+      userName: this.contentDetailData?.userInfo?.userName || '' + '',
+      contentRelId: this.contentDetailData?.reLInfo?.relId || ''  + '',
+      title: this.contentDetailData?.newsTitle || ''  + '',
+      channelId: this.contentDetailData?.reLInfo?.channelId  + '',
+      relType: this.contentDetailData?.reLInfo?.relType || ''  + '',
+      userHeaderUrl: this.contentDetailData?.userInfo?.headPhotoUrl || ''  + '',
     }
     }
+    console.log(TAG, '点赞params', JSON.stringify(params))
     ContentDetailRequest.postExecuteLike(params).then(res => {
     ContentDetailRequest.postExecuteLike(params).then(res => {
-
+      console.log(TAG, '点赞this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
       if (this.newsStatusOfUser) {
       if (this.newsStatusOfUser) {
-        this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
-        if (this.newsStatusOfUser.likeStatus === '1') {
+        this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
+        if (this.newsStatusOfUser.likeStatus == '1') {
           this.interactData.likeNum = Number(this.interactData.likeNum || 0) + 1
           this.interactData.likeNum = Number(this.interactData.likeNum || 0) + 1
         } else {
         } else {
           this.interactData.likeNum = Math.max(0, Number(this.interactData.likeNum || 0) - 1)
           this.interactData.likeNum = Math.max(0, Number(this.interactData.likeNum || 0) - 1)
@@ -237,17 +244,17 @@ export struct PlayerRightView {
   transLikeStyle(): ILikeStyleResp {
   transLikeStyle(): ILikeStyleResp {
     if (this.likesStyle === 1) {
     if (this.likesStyle === 1) {
       return {
       return {
-        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`),
+        url: this.newsStatusOfUser.likeStatus == '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`),
         name: '赞'
         name: '赞'
       }
       }
     } else if (this.likesStyle === 2) {
     } else if (this.likesStyle === 2) {
       return {
       return {
-        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
+        url: this.newsStatusOfUser.likeStatus == '1' ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
         name: '祈祷'
         name: '祈祷'
       }
       }
     } else if (this.likesStyle === 3) {
     } else if (this.likesStyle === 3) {
       return {
       return {
-        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) :
+        url: this.newsStatusOfUser.likeStatus == '1' ? $r(`app.media.ic_candle_check`) :
         $r(`app.media.ic_candle_uncheck`),
         $r(`app.media.ic_candle_uncheck`),
         name: '默哀'
         name: '默哀'
       }
       }

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

@@ -11,6 +11,7 @@ import { notificationManager } from '@kit.NotificationKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { PushContentBean, PushContentParser } from './PushContentParser';
 import { PushContentBean, PushContentParser } from './PushContentParser';
+import { ParamType, Tracking } from 'wdTracking/Index';
 
 
 const TAG = "GetuiPush"
 const TAG = "GetuiPush"
 
 
@@ -220,6 +221,15 @@ export class GetuiPush {
     this.lastPushContent = undefined
     this.lastPushContent = undefined
   }
   }
 
 
+  private trackingClick(content: PushContentBean) {
+    let param: ParamType = {
+      "pushResourceId": "",
+      "pushTitle": content.notifyTitle || "",
+      "pushContent": content.notifyContent || "",
+    }
+    Tracking.event("push_click", param)
+  }
+
   private dealWithCmdMessage(result: GTCmdMessage) {
   private dealWithCmdMessage(result: GTCmdMessage) {
     let action: Number = result.action;
     let action: Number = result.action;
     if (action === PushConst.BIND_ALIAS_RESULT) {
     if (action === PushConst.BIND_ALIAS_RESULT) {

@@ -9,6 +9,8 @@ export interface PushContentBean {
   want?: Want       // want参数 (用来在消费时，回执)
   want?: Want       // want参数 (用来在消费时，回执)
   online: boolean   // 解析want，是否为在线消息（在线走的是个推通道，离线走的是华为厂商通道)
   online: boolean   // 解析want，是否为在线消息（在线走的是个推通道，离线走的是华为厂商通道)
   pushLink?: string // 解析want，对应pushLink参数
   pushLink?: string // 解析want，对应pushLink参数
+  notifyTitle?: string
+  notifyContent?: string
 }
 }
 
 
 /*
 /*
@@ -66,7 +68,9 @@ export class PushContentParser {
         if (want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK]) {
         if (want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK]) {
           let pushLink = want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK] as string
           let pushLink = want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK] as string
           return {
           return {
-            isPush: true, online: true, pushLink: pushLink, want: want
+            isPush: true, online: true, pushLink: pushLink, want: want,
+            notifyTitle: gtData["title"] as string,
+            notifyContent: gtData["content"] as string,
           }
           }
         }
         }
       }
       }
@@ -105,7 +109,9 @@ export class PushContentParser {
       if (want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK]) {
       if (want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK]) {
         let pushLink = want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK] as string
         let pushLink = want.parameters[PushContentParser.PUSH_PARAM_PUSH_LINK] as string
         return {
         return {
-          isPush: true, online: false, pushLink: pushLink, want: want
+          isPush: true, online: false, pushLink: pushLink, want: want,
+          notifyTitle: want.parameters["title"] as string,
+          notifyContent: want.parameters["content"] as string,
         }
         }
       }
       }
     }
     }

@@ -6,6 +6,7 @@ import { BusinessError } from '@kit.BasicServicesKit'
 import { Logger, ToastUtils, CustomToast, EmitterUtils, EmitterEventId } from 'wdKit/Index'
 import { Logger, ToastUtils, CustomToast, EmitterUtils, EmitterEventId } from 'wdKit/Index'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginViewModel } from './LoginViewModel'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
+import { TrackConstants, TrackingButton, TrackingPageBrowse } from 'wdTracking/Index'
 
 
 const TAG = "OneKeyLoginPage"
 const TAG = "OneKeyLoginPage"
 
 
@@ -28,10 +29,35 @@ struct OneKeyLoginPage {
     maskColor:"#00000000"
     maskColor:"#00000000"
   })
   })
 
 
+  // 埋点计算页面浏览时长
+  private pageStartDate: number = 0
+  private pageName = TrackConstants.PageName.OneClick_Login
+
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.anonymousPhone = HuaweiAuth.sharedInstance().anonymousPhone||""
     this.anonymousPhone = HuaweiAuth.sharedInstance().anonymousPhone||""
   }
   }
 
 
+  onPageShow(): void {
+    this.pageStartDate = Date.now()
+  }
+
+  onPageHide(): void {
+    const duration = (Date.now() - this.pageStartDate!)
+    TrackingPageBrowse.trackCommonPageExposureEnd(this.pageName, this.pageName, duration)
+  }
+
+  // pageTransition() {
+  //   // 为目标页面时，进入：从右边侧滑入，退出：是右侧划出；跳转别的页面：左侧划出，返回：左侧划入。
+  //   PageTransitionEnter({ type: RouteType.Push, duration: 300 })
+  //     .slide(SlideEffect.Right)
+  //   PageTransitionEnter({ type: RouteType.Pop, duration: 300 })
+  //     .slide(SlideEffect.Left)
+  //   PageTransitionExit({ type: RouteType.Push, duration: 300 })
+  //     .slide(SlideEffect.Left)
+  //   PageTransitionExit({ type: RouteType.Pop, duration: 300 })
+  //     .slide(SlideEffect.Right)
+  // }
+
   build() {
   build() {
     Column() {
     Column() {
       this.CloseRow()
       this.CloseRow()
@@ -39,14 +65,21 @@ struct OneKeyLoginPage {
       Image($r("app.media.login_logo"))
       Image($r("app.media.login_logo"))
         .width(120)
         .width(120)
         .height(66)
         .height(66)
-        .margin({ top: 78, bottom: 74})
+        .margin({ top: 34, bottom: 64})
         .align(Alignment.Center)
         .align(Alignment.Center)
 
 
       Text(this.anonymousPhone)
       Text(this.anonymousPhone)
         .fontSize(30)
         .fontSize(30)
         .fontWeight(600)
         .fontWeight(600)
         .fontColor("#222222")
         .fontColor("#222222")
-        .margin({bottom: 10})
+        .margin({bottom: 12})
+        .align(Alignment.Center)
+
+      Text("华为账号绑定号码")
+        .fontSize(12)
+        .fontWeight(400)
+        .fontColor("#999999")
+        .margin({bottom: 40})
         .align(Alignment.Center)
         .align(Alignment.Center)
 
 
       this.ProtocolRow()
       this.ProtocolRow()
@@ -68,21 +101,26 @@ struct OneKeyLoginPage {
             if (!this.agreeProtocol) {
             if (!this.agreeProtocol) {
               return
               return
             }
             }
+
+            TrackingButton.click("oneClickLoginPageLoginButton", this.pageName, this.pageName)
             this.requestLogin()
             this.requestLogin()
           })
           })
       }
       }
       .padding({ left: 25, right: 25 })
       .padding({ left: 25, right: 25 })
-      .margin({top: 15})
+      .margin({top: 20})
 
 
       Button("账号密码登录")
       Button("账号密码登录")
         .type(ButtonType.Normal)
         .type(ButtonType.Normal)
         .align(Alignment.Center)
         .align(Alignment.Center)
         .foregroundColor("#666666")
         .foregroundColor("#666666")
         .backgroundColor(Color.White)
         .backgroundColor(Color.White)
+        .height(26)
+        .margin({top: 20})
         .onClick((event) => {
         .onClick((event) => {
           router.replaceUrl({url: WDRouterPage.loginPage.url()})
           router.replaceUrl({url: WDRouterPage.loginPage.url()})
         })
         })
     }
     }
+    .backgroundColor("#FFFFFF")
   }
   }
 
 
   @Builder ProtocolRow() {
   @Builder ProtocolRow() {
@@ -126,8 +164,9 @@ struct OneKeyLoginPage {
         .width(24)
         .width(24)
         .height(24)
         .height(24)
         .onClick(() => router.back())
         .onClick(() => router.back())
-    }.margin({ top: 15, right: 15 })
+    }.margin({ top: 10, right: 16 })
     .width("100%")
     .width("100%")
+    .height(44)
   }
   }
 
 
   async requestLogin() {
   async requestLogin() {

 import { MorningEveningPaperComponent } from 'wdComponent';
 import { MorningEveningPaperComponent } from 'wdComponent';
-import { Logger, WindowModel } from 'wdKit';
+import { DateTimeUtils, Logger, WindowModel } from 'wdKit';
+import { TrackConstants, TrackingPageBrowse} from 'wdTracking/Index';
 
 
 const TAG = 'MorningEveningPaperPage';
 const TAG = 'MorningEveningPaperPage';
 
 
@@ -7,6 +8,8 @@ const TAG = 'MorningEveningPaperPage';
 @Component
 @Component
 struct MorningEveningPaperPage {
 struct MorningEveningPaperPage {
   @State isPageShow: boolean = false
   @State isPageShow: boolean = false
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
   build() {
   build() {
     Column() {
     Column() {
       MorningEveningPaperComponent()
       MorningEveningPaperComponent()
@@ -43,6 +46,7 @@ struct MorningEveningPaperPage {
       WindowModel.shared.setWindowLayoutFullScreen(true)
       WindowModel.shared.setWindowLayoutFullScreen(true)
       WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
       WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     }
     }
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
   }
   }
 
 
   onPageHide() {
   onPageHide() {
@@ -50,6 +54,12 @@ struct MorningEveningPaperPage {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     this.isPageShow = true
     this.isPageShow = true
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
+
+    //早晚报埋点
+    this.pageHideTime = DateTimeUtils.getTimeStamp()
+    let duration = 0
+    duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews,duration)
   }
   }
 
 
   onBackPress() {
   onBackPress() {

 import { DeviceUtil, DisplayUtils, UpgradeTipContent } from 'wdKit/Index'
 import { DeviceUtil, DisplayUtils, UpgradeTipContent } from 'wdKit/Index'
+import { TrackConstants, TrackingButton } from 'wdTracking/Index'
 
 
 @Preview
 @Preview
 @CustomDialog
 @CustomDialog
@@ -35,6 +36,8 @@ export struct UpgradeTipDialog {
           .margin({top: 24})
           .margin({top: 24})
           .onClick(() => {
           .onClick(() => {
             this.controller.close()
             this.controller.close()
+
+            TrackingButton.click("notUpdatedTemporarily", TrackConstants.PageName.Update, TrackConstants.PageName.Update)
             if (this.cancel) {
             if (this.cancel) {
               this.cancel()
               this.cancel()
             }
             }
@@ -88,6 +91,8 @@ export struct UpgradeTipDialog {
       })
       })
       .onClick(() => {
       .onClick(() => {
         this.controller.close()
         this.controller.close()
+
+        TrackingButton.click("immediateUpdating", TrackConstants.PageName.Update, TrackConstants.PageName.Update)
         if (this.confirm) {
         if (this.confirm) {
           this.confirm()
           this.confirm()
         }
         }

@@ -25,7 +25,9 @@ import { EmptyComponent,
   viewBlogItemInsightIntentShare} from 'wdComponent/Index';
   viewBlogItemInsightIntentShare} from 'wdComponent/Index';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
-
+/**
+ * 多图（图集详情页）UI
+ */
 @Component
 @Component
 export struct MultiPictureDetailPageComponent {
 export struct MultiPictureDetailPageComponent {
   private relId: string = ''
   private relId: string = ''