Merge remote-tracking branch 'origin/main'

@@ -32,12 +32,6 @@ export struct CardParser {
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
 
 
-  aboutToAppear(): void {
-
-    console.log('CardParser-contentDTO', JSON.stringify(this.contentDTO))
-    console.log('CardParser-compDTO', JSON.stringify(this.compDTO))
-  }
-
   onPageShow() {
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
   }
   }

@@ -42,6 +42,9 @@ export struct CompParser {
   @State noneAudioItems: ContentDTO[] = [];
   @State noneAudioItems: ContentDTO[] = [];
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
+
+
+    console.log('CompParser-compDTO', JSON.stringify(this.compDTO))
     // 轮播图屏蔽音频类型稿件
     // 轮播图屏蔽音频类型稿件
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
       this.audioItems = this.compDTO.operDataList.filter(item => {
       this.audioItems = this.compDTO.operDataList.filter(item => {

@@ -5,7 +5,7 @@ import {
   ContentDetailRequest,
   ContentDetailRequest,
   postInteractAccentionOperateParams
   postInteractAccentionOperateParams
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
-import { RmhInfoDTO } from 'wdBean'
+import { RmhInfoDTO, CompDTO, ContentDTO } from 'wdBean'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { DateTimeUtils, SPHelper, Logger, ToastUtils } from 'wdKit';
 import { DateTimeUtils, SPHelper, Logger, ToastUtils } from 'wdKit';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
@@ -14,9 +14,14 @@ import router from '@ohos.router'
 import { postBatchAttentionStatusParams } from 'wdBean/Index';
 import { postBatchAttentionStatusParams } from 'wdBean/Index';
 import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel'
 import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 @Component
 @Component
 export struct RmhTitle {
 export struct RmhTitle {
+  @State compDTO: CompDTO = new CompDTO()
+  @State contentDTO: ContentDTO = new ContentDTO();
+  @State pageId: string = '';
+  @State pageName: string = '';
   @Prop rmhInfo: RmhInfoDTO
   @Prop rmhInfo: RmhInfoDTO
   @Prop publishTime: string | undefined
   @Prop publishTime: string | undefined
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
@@ -48,6 +53,16 @@ export struct RmhTitle {
     }
     }
     ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
     ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
       console.log('rmhTitle-data', JSON.stringify(res.data))
       console.log('rmhTitle-data', JSON.stringify(res.data))
+
+      InfomationCardClick.track(
+        this.compDTO,
+        this.contentDTO,
+        this.pageId,
+        this.pageName,
+        'follow', // like, commentClick, follow
+        this.followStatus == '0' ? true : false,
+      )
+
       if (this.followStatus == '1') {
       if (this.followStatus == '1') {
         this.followStatus = '0'
         this.followStatus = '0'
       } else {
       } else {

@@ -38,7 +38,16 @@ export struct Card12Component {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
       if  (this.contentDTO.rmhInfo) {
       if  (this.contentDTO.rmhInfo) {
-        RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
+        RmhTitle(
+          {
+            rmhInfo: this.contentDTO.rmhInfo,
+            publishTime: this.contentDTO.publishTime,
+            contentDTO: this.contentDTO,
+            compDTO: this.compDTO,
+            pageId: this.pageId,
+            pageName: this.pageName
+          }
+        )
       }
       }
       // 标题
       // 标题
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {

@@ -41,7 +41,16 @@ export struct Card14Component {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
       if (this.contentDTO.rmhInfo) {
       if (this.contentDTO.rmhInfo) {
-        RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
+        RmhTitle(
+          {
+            rmhInfo: this.contentDTO.rmhInfo,
+            publishTime: this.contentDTO.publishTime,
+            contentDTO: this.contentDTO,
+            compDTO: this.compDTO,
+            pageId: this.pageId,
+            pageName: this.pageName
+          }
+        )
       }
       }
       // 左标题，右图
       // 左标题，右图
       Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
       Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {

@@ -44,8 +44,16 @@ export struct Card15Component {
   build() {
   build() {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
-      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
-      //新闻标题
+      RmhTitle(
+        {
+          rmhInfo: this.contentDTO.rmhInfo,
+          publishTime: this.contentDTO.publishTime,
+          contentDTO: this.contentDTO,
+          compDTO: this.compDTO,
+          pageId: this.pageId,
+          pageName: this.pageName
+        }
+      )      //新闻标题
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {
         Text() {
         Text() {
           if (this.titleMarked) {
           if (this.titleMarked) {

@@ -46,7 +46,16 @@ export struct Card16Component {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
       if (this.contentDTO.rmhInfo) {
       if (this.contentDTO.rmhInfo) {
-        RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
+        RmhTitle(
+          {
+            rmhInfo: this.contentDTO.rmhInfo,
+            publishTime: this.contentDTO.publishTime,
+            contentDTO: this.contentDTO,
+            compDTO: this.compDTO,
+            pageId: this.pageId,
+            pageName: this.pageName
+          }
+        )
       }
       }
       // 标题
       // 标题
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {

@@ -38,8 +38,16 @@ export struct Card19Component {
   build() {
   build() {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
-      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
-      // 标题
+      RmhTitle(
+        {
+          rmhInfo: this.contentDTO.rmhInfo,
+          publishTime: this.contentDTO.publishTime,
+          contentDTO: this.contentDTO,
+          compDTO: this.compDTO,
+          pageId: this.pageId,
+          pageName: this.pageName
+        }
+      )      // 标题
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {
         Text() {
         Text() {
           if (this.titleMarked) {
           if (this.titleMarked) {

@@ -38,8 +38,16 @@ export struct Card20Component {
   build() {
   build() {
     Column() {
     Column() {
       // rmh信息
       // rmh信息
-      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
-      // 标题
+      RmhTitle(
+        {
+          rmhInfo: this.contentDTO.rmhInfo,
+          publishTime: this.contentDTO.publishTime,
+          contentDTO: this.contentDTO,
+          compDTO: this.compDTO,
+          pageId: this.pageId,
+          pageName: this.pageName
+        }
+      )      // 标题
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {
         Text() {
         Text() {
 
 

@@ -40,8 +40,16 @@ export struct Card21Component {
   build() {
   build() {
     Column() {
     Column() {
       // 顶部 rmh信息
       // 顶部 rmh信息
-      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo, publishTime: this.contentDTO.publishTime })
-      // 中间内容
+      RmhTitle(
+        {
+          rmhInfo: this.contentDTO.rmhInfo,
+          publishTime: this.contentDTO.publishTime,
+          contentDTO: this.contentDTO,
+          compDTO: this.compDTO,
+          pageId: this.pageId,
+          pageName: this.pageName
+        }
+      )      // 中间内容
       Grid() {
       Grid() {
         GridItem() {
         GridItem() {
           Text() {
           Text() {

@@ -43,10 +43,19 @@ export class InfomationCardClick {
     return summaryType;
     return summaryType;
   }
   }
 
 
-  public static track(compDTO: CompDTO, contentDTO: ContentDTO, pageId: string, pageName: string): void {
+  public static track(
+    compDTO: CompDTO,
+    contentDTO: ContentDTO,
+    pageId: string,
+    pageName: string,
+    action = 'detailPageShow', // like, commentClick, follow
+    bl = false,
+    followUserId = '',
+    followUserName = ''
+  ): void {
     try {
     try {
       const extParams: ParamType = {
       const extParams: ParamType = {
-        'action': 'detailPageShow',
+        'action': action,
         'shareChannel': '',
         'shareChannel': '',
         'duration': 0,
         'duration': 0,
         'contentName': contentDTO.newsTitle,
         'contentName': contentDTO.newsTitle,
@@ -87,7 +96,15 @@ export class InfomationCardClick {
         extParams['saAuthorName'] = contentDTO.source;
         extParams['saAuthorName'] = contentDTO.source;
       }
       }
       console.log('InfomationCardClick-params：', JSON.stringify(extParams))
       console.log('InfomationCardClick-params：', JSON.stringify(extParams))
-      TrackingContent.common(TrackConstants.EventType.Click, pageId, pageName, extParams)
+      if (action === 'detailPageShow') {
+        TrackingContent.common(TrackConstants.EventType.Click, pageId, pageName, extParams);
+      } else if (action === 'like') {
+        TrackingContent.like(bl, pageId, pageName, extParams);
+      } else if (action === 'commentClick') {
+        TrackingContent.commentClick(pageId, pageName, extParams);
+      } else if (action === 'follow') {
+        TrackingContent.follow(bl, followUserId, followUserName, pageId, pageName, extParams)
+      }
     } catch (err) {
     } catch (err) {
       console.log('InfomationCardClick-err', JSON.stringify(err))
       console.log('InfomationCardClick-err', JSON.stringify(err))
     }
     }