Merge remote-tracking branch 'origin/main'

@@ -8,11 +8,20 @@ export class NumberFormatterUtils {
    */
    */
   static formatNumberWithWan(inputNumber: number | String): string  {
   static formatNumberWithWan(inputNumber: number | String): string  {
     const num = typeof inputNumber === 'number' ? inputNumber : Number(inputNumber);
     const num = typeof inputNumber === 'number' ? inputNumber : Number(inputNumber);
-    if (Number.isNaN(num) || num < 10000) {
+    if (Number.isNaN(num)) {
+      return '';
+    } else if (num < 10000) {
       return num.toString();
       return num.toString();
-    } else {
+    } else if (num < 100000000) {
+      // 处理 1万到1亿之间的数字，使用万作为单位，小数点后为0则不显示
       const wanUnit = num / 10000;
       const wanUnit = num / 10000;
-      return `${wanUnit.toFixed(1)}万`;
+      const formattedWan = wanUnit.toFixed(1);
+      return formattedWan.endsWith('.0') ? `${Math.floor(wanUnit)}万` : `${formattedWan}万`;
+    } else {
+      // 数字达到1亿及以上时，转换为亿并处理小数点后为0的情况
+      const yiUnit = num / 100000000;
+      const formattedYi = yiUnit.toFixed(1);
+      return formattedYi.endsWith('.0') ? `${formattedYi.slice(0, -2)}亿` : `${formattedYi}亿`;
     }
     }
   }
   }
 }
 }

@@ -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 || ''}`,
+        })
     })
     })
   }
   }
 
 

@@ -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))
 
 
   }
   }
 }
 }