Merge remote-tracking branch 'origin/main'

@@ -295,7 +295,7 @@ export struct MorningEveningPaperComponent {
   topPaperTitle(){
   topPaperTitle(){
     Column(){
     Column(){
       PaperTitleComponent().margin({top:this.topSafeHeight})
       PaperTitleComponent().margin({top:this.topSafeHeight})
-    }.height(44+this.topSafeHeight).backgroundColor(this.scrollOffset > 100?this.mixedBgColor:'')
+    }.height(44+this.topSafeHeight).backgroundColor(this.isHasTopView?(this.scrollOffset > 100?this.mixedBgColor:''):this.mixedBgColor)
   }
   }
 
 
   @Builder
   @Builder

@@ -75,7 +75,7 @@ export struct topicInfoView {
           left: { anchor: "__container__", align: HorizontalAlign.Start },
           left: { anchor: "__container__", align: HorizontalAlign.Start },
           bottom: this.frontLinkObject.linkUrl.length > 0?{ anchor: "row_detail", align: VerticalAlign.Top }:{ anchor: "__container__", align: VerticalAlign.Bottom }
           bottom: this.frontLinkObject.linkUrl.length > 0?{ anchor: "row_detail", align: VerticalAlign.Top }:{ anchor: "__container__", align: VerticalAlign.Bottom }
         })
         })
-        .margin({ left: 16, right: 16 })
+        .margin({ left: 16, right: 16, bottom: this.frontLinkObject.linkUrl.length > 0?0:16})
         .id('txt_summary')
         .id('txt_summary')
 
 
       Text(this.frontLinkObject?.title ?? "")
       Text(this.frontLinkObject?.title ?? "")

@@ -16,6 +16,7 @@
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdComponent": "file:../../features/wdComponent",
     "wdComponent": "file:../../features/wdComponent",
-    "wdShare": "file:../../features/wdShare"
+    "wdShare": "file:../../features/wdShare",
+    "wdTracking": "file:../../features/wdTracking"
   }
   }
 }
 }

@@ -8,6 +8,8 @@ import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentD
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
 import { EmptyComponent } from 'wdComponent/Index';
 import { EmptyComponent } from 'wdComponent/Index';
+import { DateTimeUtils } from 'wdKit/Index';
+import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 const TAG = 'DetailVideoListPage'
 const TAG = 'DetailVideoListPage'
@@ -33,6 +35,8 @@ export struct DetailVideoListPage {
   @State currentIndex: number = 0
   @State currentIndex: number = 0
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State interactDataList: InteractDataDTO[] = []
   @State interactDataList: InteractDataDTO[] = []
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
     // 注册监听网络连接
     // 注册监听网络连接
@@ -70,12 +74,18 @@ export struct DetailVideoListPage {
     this.switchVideoStatus = true
     this.switchVideoStatus = true
     this.openFullScreen()
     this.openFullScreen()
 
 
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
   }
   }
 
 
   onPageHide(): void {
   onPageHide(): void {
     console.log(TAG, 'onPageHide')
     console.log(TAG, 'onPageHide')
     this.switchVideoStatus = false
     this.switchVideoStatus = false
     this.closeFullScreen()
     this.closeFullScreen()
+
+    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)
   }
   }
 
 
   /**
   /**

@@ -14,6 +14,8 @@ import { PictureLoading } from './PictureLoading';
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
 import { EmptyComponent, WDViewDefaultType } from 'wdComponent/Index';
 import { EmptyComponent, WDViewDefaultType } from 'wdComponent/Index';
+import { DateTimeUtils } from 'wdKit/Index';
+import {TrackConstants,TrackingPageBrowse } from 'wdTracking/Index';
 
 
 interface loadMoreData {
 interface loadMoreData {
   pageNum: number;
   pageNum: number;
@@ -59,6 +61,8 @@ export struct VideoChannelDetail {
   @State totalCount: number = 0
   @State totalCount: number = 0
   @State isMouted: boolean = false
   @State isMouted: boolean = false
   @State isRequestError: boolean = false
   @State isRequestError: boolean = false
+  pageShowTime:number = 0;
+  pageHideTime:number = 0;
 
 
   autoRefreshChange() {
   autoRefreshChange() {
     if (this.topNavIndex === 0) {
     if (this.topNavIndex === 0) {
@@ -78,12 +82,21 @@ export struct VideoChannelDetail {
       this.switchVideoStatus = true
       this.switchVideoStatus = true
       this.openFullScreen()
       this.openFullScreen()
     }
     }
+
+    this.pageShowTime = DateTimeUtils.getTimeStamp()
+    console.log(TAG, '一级视频显示')
   }
   }
 
 
   pageHideChange() {
   pageHideChange() {
     this.barBackgroundColor = Color.Transparent
     this.barBackgroundColor = Color.Transparent
     this.switchVideoStatus = false
     this.switchVideoStatus = false
     this.closeFullScreen()
     this.closeFullScreen()
+
+    console.log(TAG, '一级视频隐藏')
+    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)
   }
   }
 
 
   /**
   /**
@@ -255,7 +268,6 @@ export struct VideoChannelDetail {
       })
       })
     }
     }
   }
   }
-
   build() {
   build() {
     Column() {
     Column() {
       if (this.isRequestError) {
       if (this.isRequestError) {

@@ -14,6 +14,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { DisplayDirection, SpConstants } from 'wdConstant/Index'
 import { DisplayDirection, SpConstants } from 'wdConstant/Index'
 import { WDShare } from "wdShare"
 import { WDShare } from "wdShare"
 import { publishCommentModel } from 'wdComponent/Index';
 import { publishCommentModel } from 'wdComponent/Index';
+import { ParamType, TrackConstants, TrackingButton, TrackingContent } from 'wdTracking/Index';
 
 
 interface ILikeStyleResp {
 interface ILikeStyleResp {
   url: Resource;
   url: Resource;
@@ -37,16 +38,44 @@ export struct PlayerRightView {
   @Consume showCommentList: boolean
   @Consume showCommentList: boolean
   @Consume displayDirection: DisplayDirection
   @Consume displayDirection: DisplayDirection
   @Consume publishCommentModel: publishCommentModel
   @Consume publishCommentModel: publishCommentModel
-  @State likesStyle: number | string = 1 // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+  // @State likesStyle: number | string = 1 // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State openLikes: boolean = false // 是否可以点赞  1：可以 0：不可以
   @State openLikes: boolean = false // 是否可以点赞  1：可以 0：不可以
+  @State likesStyle: number | string = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+  pageParam: ParamType = {}
+  PageName: string = ''
+  followUserId: string = ''
+  followUserName: string = ''
+
   aboutToAppear() {
   aboutToAppear() {
     // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
     // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
     this.likesStyle = this.contentDetailData.likesStyle
     this.likesStyle = this.contentDetailData.likesStyle
     this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
     this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
     // console.log(TAG, 'this.likesStyle', this.likesStyle)
     // console.log(TAG, 'this.likesStyle', this.likesStyle)
     // console.log(TAG, 'this.openLikes', this.openLikes)
     // console.log(TAG, 'this.openLikes', this.openLikes)
+    this.contentTrackingDict()
+  }
+  contentTrackingDict(){
+    this.pageParam = {
+      'contentType': `${this.contentDetailData.newsType}`,
+      'contentId': `${this.contentDetailData.newsId}`,
+      'contentName': `${this.contentDetailData.newsTitle || ''}`,
+    }
+    if(this.contentDetailData.newsType == 1) {
+      this.PageName = TrackConstants.PageName.VideoDetail // 点播
+    } else if(this.contentDetailData.newsType == 2) {
+      this.PageName = TrackConstants.PageName.Live_Detail // 直播
+    } else if(this.contentDetailData.newsType == 5) {
+      this.PageName = TrackConstants.PageName.Summary_Detail // 专题详情页
+    } else if(this.contentDetailData.newsType == 8) {
+      this.PageName = TrackConstants.PageName.Article_Detail // 图文详情页
+    } else if(this.contentDetailData.newsType == 9) {
+      this.PageName = TrackConstants.PageName.Atlas_Detail // 图集详情页
+    } else if(this.contentDetailData.newsType == 14 || this.contentDetailData.newsType == 15) {
+      this.PageName = TrackConstants.PageName.DynamicDetail // 动态图文/动态视频
+    }
+    this.followUserId = this.contentDetailData?.rmhInfo?.rmhId || ''
+    this.followUserName = this.contentDetailData?.rmhInfo?.rmhName || ''
   }
   }
-
   /**
   /**
    * 点赞、取消点赞
    * 点赞、取消点赞
    */
    */
@@ -76,8 +105,12 @@ export struct PlayerRightView {
         this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
         this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
         if (this.newsStatusOfUser.likeStatus == '1') {
         if (this.newsStatusOfUser.likeStatus == '1') {
           this.interactData.likeNum = Number(this.interactData.likeNum || 0) + 1
           this.interactData.likeNum = Number(this.interactData.likeNum || 0) + 1
+          TrackingContent.like(true,this.PageName,this.PageName,this.pageParam)
+          console.log(TAG, '点赞')
         } 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)
+          TrackingContent.like(false,this.PageName,this.PageName,this.pageParam)
+          console.log(TAG, '取消点赞')
         }
         }
         console.log(TAG, '点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactData?.likeNum)
         console.log(TAG, '点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactData?.likeNum)
         // this.queryContentInteractCount()
         // this.queryContentInteractCount()
@@ -112,8 +145,12 @@ export struct PlayerRightView {
         // this.queryContentInteractCount()
         // this.queryContentInteractCount()
         if (this.newsStatusOfUser.collectStatus === 1) {
         if (this.newsStatusOfUser.collectStatus === 1) {
           this.interactData.collectNum = Number(this.interactData.collectNum || 0) + 1
           this.interactData.collectNum = Number(this.interactData.collectNum || 0) + 1
+          TrackingContent.collect(true,this.PageName,this.PageName,this.pageParam)
+          console.log(TAG, '收藏')
         } else {
         } else {
           this.interactData.collectNum = Math.max(0, Number(this.interactData.collectNum || 0) - 1)
           this.interactData.collectNum = Math.max(0, Number(this.interactData.collectNum || 0) - 1)
+          TrackingContent.collect(false,this.PageName,this.PageName,this.pageParam)
+          console.log(TAG, '取消收藏')
         }
         }
         console.log(TAG, '收藏、取消收藏==', this.newsStatusOfUser?.collectStatus, this.interactData?.collectNum)
         console.log(TAG, '收藏、取消收藏==', this.newsStatusOfUser?.collectStatus, this.interactData?.collectNum)
       }
       }
@@ -175,6 +212,8 @@ export struct PlayerRightView {
             ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
             ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
           }
           }
         })
         })
+        console.log(TAG, '关注号主')
+        TrackingContent.follow(true,this.followUserId,this.followUserName,TrackConstants.PageName.Atlas_Detail,TrackConstants.PageName.Atlas_Detail,this.pageParam)
       }
       }
     })
     })
   }
   }