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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix(埋点)：发布评论

@@ -601,6 +601,8 @@ export struct DynamicDetailComponent {
         this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
         this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
+        this.publishCommentModel.pageId = TrackConstants.PageName.DynamicDetail
+        this.publishCommentModel.pageName = TrackConstants.PageName.DynamicDetail
       }
       }
 
 
       this.operationButtonList = ['comment', 'collect', 'share']
       this.operationButtonList = ['comment', 'collect', 'share']
@@ -680,7 +682,7 @@ export struct DynamicDetailComponent {
 
 
   //创建跳转信息
   //创建跳转信息
   makeJumpInfo() {
   makeJumpInfo() {
-    this.mJumpInfo.pageId = 'dynamicDetailPage'
+    this.mJumpInfo.pageId = TrackConstants.PageName.DynamicDetail
     this.mJumpInfo.objectId = this.contentDetailData.newsId + ""
     this.mJumpInfo.objectId = this.contentDetailData.newsId + ""
     this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType + ""
     this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType + ""
     this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId + ""
     this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId + ""

@@ -86,7 +86,7 @@ export struct ENewspaperItemComponent {
           } as ContentDTO
           } as ContentDTO
           ProcessUtils.processPage(content)
           ProcessUtils.processPage(content)
           //内容点击
           //内容点击
-          TrackingContent.commentClickWithEvent('current_Number_Panel_content_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
+          TrackingContent.clickWithEvent('current_Number_Panel_content_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
             ,{
             ,{
               'contentName':this.itemBeanClicked.title,
               'contentName':this.itemBeanClicked.title,
               'contentType':this.itemBeanClicked.newsType,
               'contentType':this.itemBeanClicked.newsType,

@@ -36,7 +36,7 @@ export struct ENewspaperPageComponent {
     this.swiperIndex = _swiperIndex > 0 ? _swiperIndex - 1 : _swiperIndex
     this.swiperIndex = _swiperIndex > 0 ? _swiperIndex - 1 : _swiperIndex
 
 
     //电子报--版面序号选择点击
     //电子报--版面序号选择点击
-    TrackingContent.commentClickWithEvent('panel_number_selection_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
+    TrackingContent.clickWithEvent('panel_number_selection_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
       ,{
       ,{
         'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
         'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
         'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,
         'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,
@@ -61,7 +61,7 @@ export struct ENewspaperPageComponent {
             new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
             new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
         }
         }
         //日历选择点击
         //日历选择点击
-        TrackingContent.commentClickWithEvent('date_selection_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
+        TrackingContent.clickWithEvent('date_selection_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
           ,{
           ,{
             'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
             'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
             'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,
             'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,
@@ -340,7 +340,7 @@ export struct ENewspaperPageComponent {
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
           if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
             this.isOpenListDialog = true
             this.isOpenListDialog = true
             //电子报--读报纸点击
             //电子报--读报纸点击
-            TrackingContent.commentClickWithEvent('read_newspaper_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
+            TrackingContent.clickWithEvent('read_newspaper_click',TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage
               ,{
               ,{
                 'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
                 'panelNumber':this.newspaperListBean?.list[this.swiperIndex].pageNum,
                 'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,
                 'panelName':this.newspaperListBean?.list[this.swiperIndex].pageName,

@@ -41,7 +41,8 @@ export class publishCommentModel {
 
 
   //最新发布的评论
   //最新发布的评论
   lastCommentModel: commentItemModel = new commentItemModel()
   lastCommentModel: commentItemModel = new commentItemModel()
-
+  pageId: string = ''
+  pageName: string = ''
 
 
 }
 }
 
 

@@ -16,7 +16,7 @@ const TAG = 'CommentComponent';
 
 
 
 
 const testString = '因为读书的人\n是低着头向上看的人\n身处一隅，却能放眼世界\n2，因为读书的人\n总是比不读书的人\n活得有趣一点\n3，因为读书的人\n即使平凡，绝不平庸'
 const testString = '因为读书的人\n是低着头向上看的人\n身处一隅，却能放眼世界\n2，因为读书的人\n总是比不读书的人\n活得有趣一点\n3，因为读书的人\n即使平凡，绝不平庸'
-
+//评论组件
 // @Entry
 // @Entry
 @Preview
 @Preview
 @Component
 @Component

@@ -6,6 +6,7 @@ import {
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { TrackConstants, TrackingContent } from 'wdTracking/Index';
 import {
 import {
   commentItemModel,
   commentItemModel,
   commentListModel,
   commentListModel,
@@ -16,7 +17,7 @@ import {
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { publishCommentModel } from '../model/PublishCommentModel';
 
 
 const TAG = "CommentViewModel"
 const TAG = "CommentViewModel"
-
+//评论model
 class CommentViewModel {
 class CommentViewModel {
   private static instance: CommentViewModel
   private static instance: CommentViewModel
 
 
@@ -166,9 +167,9 @@ class CommentViewModel {
     return new Promise<commentItemModel>((success, fail) => {
     return new Promise<commentItemModel>((success, fail) => {
       const visitorMode = model.visitorComment == "1" && HttpUtils.isLogin() == false
       const visitorMode = model.visitorComment == "1" && HttpUtils.isLogin() == false
       let url = visitorMode ? HttpUrlUtils.getNoUserPublishCommentUrl() : HttpUrlUtils.getPublishCommentUrl()
       let url = visitorMode ? HttpUrlUtils.getNoUserPublishCommentUrl() : HttpUrlUtils.getPublishCommentUrl()
-
+      let pageId = model.pageId;
+      let pageName = model.pageName;
       let bean: Record<string, string> = {};
       let bean: Record<string, string> = {};
-
       bean['targetId'] = model.targetId;
       bean['targetId'] = model.targetId;
       bean['targetRelId'] = model.targetRelId;
       bean['targetRelId'] = model.targetRelId;
       bean['commentType'] = model.commentType;
       bean['commentType'] = model.commentType;
@@ -188,6 +189,11 @@ class CommentViewModel {
       }
       }
 
 
       HttpRequest.post<ResponseDTO<commentItemModel>>(url, bean).then((data: ResponseDTO<commentItemModel>) => {
       HttpRequest.post<ResponseDTO<commentItemModel>>(url, bean).then((data: ResponseDTO<commentItemModel>) => {
+        // fixme 埋点 评论发布点击
+        TrackingContent.commentClick(pageId,pageName
+          ,{
+            'duration':0,
+          })
         if (data.code != 0) {
         if (data.code != 0) {
           ToastUtils.showToast(data.message, 1000);
           ToastUtils.showToast(data.message, 1000);
           fail()
           fail()

@@ -3,6 +3,7 @@ import { TrackConstants } from "../common/TrackConstants"
 import { TrackingUtils } from '../common/TrackingUtils'
 import { TrackingUtils } from '../common/TrackingUtils'
 import { Tracking } from './Tracking'
 import { Tracking } from './Tracking'
 import { PointerMatrix } from '@kit.TestKit'
 import { PointerMatrix } from '@kit.TestKit'
+import { StringUtils } from 'wdKit/Index'
 
 
 export class TrackingContent {
 export class TrackingContent {
 
 
@@ -86,10 +87,10 @@ export class TrackingContent {
   }
   }
 
 
   static commentClick(pageId: string, pageName: string, extParams?: ParamType) {
   static commentClick(pageId: string, pageName: string, extParams?: ParamType) {
-    TrackingContent.commentClickWithEvent("content_comment_click",pageId,pageName,extParams);
+    TrackingContent.clickWithEventAction("content_comment_click",pageId,pageName,TrackConstants.ActionType.Comment,extParams);
   }
   }
 
 
-  static commentClickWithEvent(event: string,pageId: string, pageName: string, extParams?: ParamType) {
+  static clickWithEventAction(event: string,pageId: string, pageName: string,action: string, extParams?: ParamType) {
     let params = TrackingUtils.generateParams(extParams)
     let params = TrackingUtils.generateParams(extParams)
     if (pageId.length) {
     if (pageId.length) {
       params["pageId"] = pageId
       params["pageId"] = pageId
@@ -97,11 +98,17 @@ export class TrackingContent {
     if (pageName.length) {
     if (pageName.length) {
       params["pageName"] = pageName
       params["pageName"] = pageName
     }
     }
-    params["action"] =TrackConstants.ActionType.Comment
+    if(!StringUtils.isEmpty(action)){
+      params["action"] =action
+    }
     TrackingUtils.fillPositionWith(params)
     TrackingUtils.fillPositionWith(params)
     Tracking.event(event, params)
     Tracking.event(event, params)
   }
   }
 
 
+  static clickWithEvent(event: string,pageId: string, pageName: string,extParams?: ParamType) {
+   TrackingContent.clickWithEventAction(event,pageId,pageName,'',extParams);
+  }
+
   static commentShare(pageId: string, pageName: string, extParams?: ParamType) {
   static commentShare(pageId: string, pageName: string, extParams?: ParamType) {
 
 
   }
   }