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

@@ -43,7 +43,7 @@ import { EmptyComponent } from './view/EmptyComponent';
 import { detailedSkeleton } from './skeleton/detailSkeleton';
 import { detailedSkeleton } from './skeleton/detailSkeleton';
 import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
 import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
-
+import { ParamType, TrackConstants, TrackingButton, TrackingContent } from 'wdTracking/Index';
 const TAG = 'DynamicDetailComponent'
 const TAG = 'DynamicDetailComponent'
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 
 
@@ -81,6 +81,7 @@ export struct DynamicDetailComponent {
   @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：不可以
 
 
+  pageParam: ParamType = {}
   async aboutToAppear() {
   async aboutToAppear() {
     await this.getContentDetailData()
     await this.getContentDetailData()
     // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
     // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
@@ -540,7 +541,6 @@ export struct DynamicDetailComponent {
                   //点赞操作
                   //点赞操作
                   this.toggleLikeStatus()
                   this.toggleLikeStatus()
                   //内容点赞/取消点赞埋点
                   //内容点赞/取消点赞埋点
-
                 })
                 })
                 .visibility(this.likesStyle == 4 || !this.openLikes ? Visibility.None : Visibility.Visible)
                 .visibility(this.likesStyle == 4 || !this.openLikes ? Visibility.None : Visibility.Visible)
 
 
@@ -614,6 +614,12 @@ export struct DynamicDetailComponent {
     this.makeJumpInfo()
     this.makeJumpInfo()
     this.interactDataV2()
     this.interactDataV2()
     this.viewBlogInsightIntentShare()
     this.viewBlogInsightIntentShare()
+
+    this.pageParam = {
+      'contentType': `${this.contentDetailData.newsType}`,
+      'contentId': `${this.contentDetailData.newsId}`,
+      'contentName': `${this.contentDetailData.newsTitle || ''}`,
+    }
   }
   }
 
 
   private async interactDataV2() {
   private async interactDataV2() {
@@ -743,8 +749,10 @@ export struct DynamicDetailComponent {
       console.log('关注号主==', JSON.stringify(res.data))
       console.log('关注号主==', JSON.stringify(res.data))
       if (this.followStatus == '1') {
       if (this.followStatus == '1') {
         this.followStatus = '0'
         this.followStatus = '0'
+        TrackingContent.follow(true,this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhId,this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhName,TrackConstants.PageName.DynamicDetail,TrackConstants.PageName.DynamicDetail,this.pageParam)
       } else {
       } else {
         this.followStatus = '1'
         this.followStatus = '1'
+        TrackingContent.follow(false,this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhId,this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhName,TrackConstants.PageName.DynamicDetail,TrackConstants.PageName.DynamicDetail,this.pageParam)
       }
       }
     })
     })
   }
   }
@@ -772,6 +780,14 @@ export struct DynamicDetailComponent {
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) - 1
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) - 1
       }
       }
       console.log('点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactDataDTO?.likeNum)
       console.log('点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactDataDTO?.likeNum)
+
+      //内容点赞、取消点赞Tracking 1点赞  0取消点赞
+      TrackingContent.like(this.newsStatusOfUser?.likeStatus === '1', TrackConstants.PageName.DynamicDetail, TrackConstants.PageName.DynamicDetail,
+        {
+          'contentType': `${this.contentDetailData.newsType}`,
+          'contentId': `${this.contentDetailData.newsId}`,
+          'contentName': `${this.contentDetailData.newsTitle || ''}`,
+        })
     })
     })
   }
   }
 
 

@@ -36,6 +36,30 @@ export struct CardSourceInfo {
     return flag;
     return flag;
   }
   }
 
 
+  /**
+   * 全域数字显示规则
+   * 1、当数量为千位以內时，显示数字，不保留小数点，比如 4585
+   * 2、当数量为万位~1亿时，显示xx 万，保留小数点后一位，比如1517.9w、2.9w
+   * 3、当数量为1亿~千亿时，显示XX 亿，保留小数点后一位，比如1517.9亿、2.9亿
+   * 4、不进行四舍五入
+   * 5、0 和空 不显示
+   */
+  handlerNum(number: string) {
+    const num = number??'0';
+    if (Number.parseInt(num) <= 9999) {
+      return Number.parseInt(num).toString()
+    } else if (Number.parseInt(num) > 9999 && Number.parseInt(num) <= 99999999) {
+      const num1: string = num.slice(0, -4); // 万
+      const num2: string = num.slice(-4, -3); // 千
+      return num2 === '0' ? num1 +'万' : num1 + '.' + num2 + '万'
+    } else if (Number.parseInt(num) > 99999999) {
+      const num1: string = num.slice(0, -8); // 亿
+      const num2: string = num.slice(-8, -7);
+      return num2 === '0' ? num1 +'亿' : num1 + '.' + num2 + '亿'
+    }
+    return num
+  }
+
   isTwoDaysAgo(date: string) {
   isTwoDaysAgo(date: string) {
     const twoDaysAgo = new Date();
     const twoDaysAgo = new Date();
     twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);
     twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);
@@ -109,7 +133,7 @@ export struct CardSourceInfo {
           .margin({right: 4})
           .margin({right: 4})
       }
       }
       if (this.getContentDtoBean()?.interactData?.commentNum) {
       if (this.getContentDtoBean()?.interactData?.commentNum) {
-        Text(`${this.getContentDtoBean()?.interactData?.commentNum}评`)
+        Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`)
           .fontSize($r("app.float.font_size_11"))
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0)
           .flexShrink(0)

@@ -30,9 +30,8 @@ export struct MoreComponent {
 
 
         Divider()
         Divider()
           .width('100%')
           .width('100%')
-          .height(10)
           .color($r('app.color.color_F5F5F5'))
           .color($r('app.color.color_F5F5F5'))
-          .strokeWidth('1lpx')
+          .strokeWidth(5)
 
 
         Row() {
         Row() {
           Text('点击展开更多相似')
           Text('点击展开更多相似')
@@ -53,9 +52,8 @@ export struct MoreComponent {
 
 
         Divider()
         Divider()
           .width('100%')
           .width('100%')
-          .height(10)
           .color($r('app.color.color_F5F5F5'))
           .color($r('app.color.color_F5F5F5'))
-          .strokeWidth('1lpx')
+          .strokeWidth(5)
 
 
       }
       }
     }
     }

@@ -212,8 +212,6 @@ export namespace TrackConstants {
     Interest = "preferenceSelectionPage",
     Interest = "preferenceSelectionPage",
     //意见反馈
     //意见反馈
     FeedbackPage = 'feedbackPage',
     FeedbackPage = 'feedbackPage',
-    //动态详情
-    DynamicDetailPage = 'dynamicDetailPage',
     //早晚报
     //早晚报
     NewsPaperPage = 'newsPaperPage',
     NewsPaperPage = 'newsPaperPage',
   }
   }

@@ -37,7 +37,7 @@ struct DynamicDetailPage {
   }
   }
   onPageHide() {
   onPageHide() {
     //页面浏览
     //页面浏览
-    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.DynamicDetailPage,TrackConstants.PageName.DynamicDetailPage,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.DynamicDetail,TrackConstants.PageName.DynamicDetail,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
 
 
   }
   }
 }
 }