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

@@ -13,6 +13,11 @@ export class ContentConstants {
    */
    */
   static readonly TYPE_LIVE: string = "2";
   static readonly TYPE_LIVE: string = "2";
 
 
+  /**
+   * 3:活动
+   */
+  static readonly TYPE_Activity: string = "3";
+
   static readonly TYPE_FOUR: string = "4";
   static readonly TYPE_FOUR: string = "4";
   /**
   /**
    * 5:专题详情
    * 5:专题详情

@@ -65,3 +65,6 @@ export { MpaasUpgradeCheck, UpgradeTipContent } from './src/main/ets/mpaas/Mpaas
 export { TingyunAPM } from './src/main/ets/tingyunAPM/TingyunAPM'
 export { TingyunAPM } from './src/main/ets/tingyunAPM/TingyunAPM'
 
 
 export { FastClickUtil } from './src/main/ets/utils/FastClickUtil';
 export { FastClickUtil } from './src/main/ets/utils/FastClickUtil';
+
+// export { PublicPopupDialogView } from "./src/main/ets/pubComps/dialog/PublicPopupDialogView"
+export { PublicDialogManager, CloseAction } from "./src/main/ets/pubComps/dialog/PublicDialogManager"

+
+export type CloseAction = () => void
+
+export class PublicDialogManager {
+
+  private dialogControllers: CustomDialogController[] = []
+  private closeActions: CloseAction[] = []
+
+  private constructor() {
+  }
+  private static manager: PublicDialogManager
+  static shareInstance(): PublicDialogManager {
+    if (!PublicDialogManager.manager) {
+      PublicDialogManager.manager = new PublicDialogManager()
+    }
+    return PublicDialogManager.manager
+  }
+
+  openDialog(dialogController: CustomDialogController, closeAction: CloseAction) {
+    if (!dialogController) {
+      return
+    }
+    dialogController.open()
+    this.dialogControllers.push(dialogController)
+    this.closeActions.push(closeAction)
+  }
+
+  closeDialog(dialogController: CustomDialogController) {
+    if (!dialogController) {
+      return
+    }
+    dialogController.close()
+    const index = this.dialogControllers.indexOf(dialogController)
+    if (index != -1) {
+      this.dialogControllers.splice(index, 1)
+      this.closeActions.splice(index, 1)[0]()
+    }
+  }
+
+  closeLastDialog() {
+    const count = this.dialogControllers.length
+    if (count > 0) {
+      this.closeDialog(this.dialogControllers[count - 1])
+    }
+  }
+}

+import { PublicDialogManager } from './PublicDialogManager'
+
+/*
+ * 公共自定义弹出框，上层赋值showPopup变量，决定是否显示
+ *
+ * 当上层需要关闭，调用 PublicDialogManager.shareInstance().closeDialog(dialogController) 关闭
+ *
+ * ===> customBuilder 当前传值有问题，用不了
+ */
+@Component
+struct PublicPopupDialogView {
+
+  // 决定是否显示变量
+  @Link @Watch('showPopupAction') showPopup: boolean
+
+  // 自定义弹框的 @CustomDialog
+  private customBuilder: Object | null = null
+
+  private autoCancel: boolean = false
+
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: this.customBuilder,
+    autoCancel: this.autoCancel,
+    cancel: () => {
+      this.showPopup = false
+    },
+    customStyle: true,
+    alignment: DialogAlignment.Bottom,
+  })
+
+  showPopupAction(val: boolean) {
+    if (this.showPopup) {
+      PublicDialogManager.shareInstance().openDialog(this.dialogController, this.closeAction)
+    } else {
+      PublicDialogManager.shareInstance().closeDialog(this.dialogController)
+    }
+  }
+
+  @Builder emptyBuild() {
+
+  }
+
+  closeAction() {
+    this.showPopup = false
+  }
+
+  build() {
+    this.emptyBuild()
+  }
+
+}
+

@@ -106,7 +106,7 @@ export class ProcessUtils {
       case ContentConstants.TYPE_AUDIO:
       case ContentConstants.TYPE_AUDIO:
         ProcessUtils.gotoAudio(content)
         ProcessUtils.gotoAudio(content)
         break;
         break;
-      case ContentConstants.TYPE_TELETEXT:
+      case ContentConstants.TYPE_TELETEXT:case ContentConstants.TYPE_Activity:
       // 图文详情，跳转h5
       // 图文详情，跳转h5
         if (content?.linkUrl) { //有 linkUrl 走专题页展示逻辑
         if (content?.linkUrl) { //有 linkUrl 走专题页展示逻辑
           ProcessUtils.gotoSpecialTopic(content,true)
           ProcessUtils.gotoSpecialTopic(content,true)

@@ -5,12 +5,15 @@ import { BaseDTO } from './BaseDTO';
 
 
 @Observed
 @Observed
 export class CompDTO implements BaseDTO {
 export class CompDTO implements BaseDTO {
+  expIds: string = '';
+  itemId: string = '';
   contentText?: string = '';
   contentText?: string = '';
   backgroundColor: string = '';
   backgroundColor: string = '';
   backgroundImgUrl: string = '';
   backgroundImgUrl: string = '';
   cityCode: string = '';
   cityCode: string = '';
   compStyle: string = '';
   compStyle: string = '';
   compType: string = '';
   compType: string = '';
+  cardItemId: string = '';
   // dataSourceRequest: any[];
   // dataSourceRequest: any[];
   districtCode: string = '';
   districtCode: string = '';
   extraData?: string;
   extraData?: string;
@@ -44,7 +47,7 @@ export class CompDTO implements BaseDTO {
   matInfo: CompAdvMatInfoBean = new CompAdvMatInfoBean
   matInfo: CompAdvMatInfoBean = new CompAdvMatInfoBean
   pageId?: string;
   pageId?: string;
   objectType?: string;
   objectType?: string;
-  hasMore: number = 1
+  hasMore: number = 1;
 
 
   // keyGenerator相关字符串，用于刷新list布局
   // keyGenerator相关字符串，用于刷新list布局
   timestamp: String = '1'
   timestamp: String = '1'

@@ -13,12 +13,15 @@ import { LiveRoomDataBean } from '../live/LiveRoomDataBean';
 export class ContentDTO implements BaseDTO {
 export class ContentDTO implements BaseDTO {
   seoTags?:string;
   seoTags?:string;
   liveType?: string; // 直播新闻-直播状态
   liveType?: string; // 直播新闻-直播状态
+  expIds: string = '';
+  itemId: string = '';
   shareFlag?: string = '1';
   shareFlag?: string = '1';
   appStyle: string = '';
   appStyle: string = '';
   cityCode: string = '';
   cityCode: string = '';
   coverSize: string = '';
   coverSize: string = '';
   coverType: number = -1;
   coverType: number = -1;
   coverUrl: string = '';
   coverUrl: string = '';
+  cnsTraceId: string = ''
   description: string = '';
   description: string = '';
   districtCode: string = '';
   districtCode: string = '';
   endTime: string = '';
   endTime: string = '';
@@ -47,6 +50,8 @@ export class ContentDTO implements BaseDTO {
   startTime: string = '';
   startTime: string = '';
   subType: string = '';
   subType: string = '';
   subtitle: string = '';
   subtitle: string = '';
+  sceneId: string = '';
+  subSceneId: string = '';
   title: string = '';
   title: string = '';
   vImageUrl: string = '';
   vImageUrl: string = '';
   screenType: string = '';
   screenType: string = '';

@@ -6,7 +6,7 @@ export interface TopicInfo {
   commentFlag: number;
   commentFlag: number;
   commentPreviewFlag: number;
   commentPreviewFlag: number;
   commentShowFlag: number;
   commentShowFlag: number;
-  // frontFlag?: any;
+  frontFlag: number;
   frontLinkObject?: FrontLinkObject;
   frontLinkObject?: FrontLinkObject;
   posterFlag: number;
   posterFlag: number;
   posterUrl: string;
   posterUrl: string;

@@ -16,6 +16,8 @@ export { LikeComponent } from "./src/main/ets/components/view/LikeComponent"
 
 
 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent"
 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent"
 
 
+export { TopNavigationComponentNew } from "./src/main/ets/components/page/TopNavigationComponentNew"
+
 export { LabelComponent } from "./src/main/ets/components/view/LabelComponent"
 export { LabelComponent } from "./src/main/ets/components/view/LabelComponent"
 
 
 export { BannerComponent } from "./src/main/ets/components/view/BannerComponent"
 export { BannerComponent } from "./src/main/ets/components/view/BannerComponent"
@@ -96,3 +98,5 @@ export { PageRepository } from './src/main/ets/repository/PageRepository';
 export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
 export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
 
 
 export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
 export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
+
+export { CommentListDialogView } from './src/main/ets/components/comment/view/CommentListDialog';

@@ -23,6 +23,8 @@ import { SearchContentComponent } from './cardview/SearchContentComponent';
  */
  */
 @Component
 @Component
 export struct CardParser {
 export struct CardParser {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
 
 
@@ -34,39 +36,39 @@ export struct CardParser {
   contentBuilder(contentDTO: ContentDTO) {
   contentBuilder(contentDTO: ContentDTO) {
     // Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     // Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     if (!!contentDTO.contentText) {
     if (!!contentDTO.contentText) {
-      SearchContentComponent({ contentDTO })
+      SearchContentComponent({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
     } else {
     } else {
       if (contentDTO.appStyle === CompStyle.Card_02) {
       if (contentDTO.appStyle === CompStyle.Card_02) {
-        Card2Component({ compDTO: this.compDTO, contentDTO })
+        Card2Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_03) {
       } else if (contentDTO.appStyle === CompStyle.Card_03) {
-        Card3Component({ compDTO: this.compDTO, contentDTO })
+        Card3Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_04) {
       } else if (contentDTO.appStyle === CompStyle.Card_04) {
-        Card4Component({ compDTO: this.compDTO, contentDTO })
+        Card4Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_05) {
       } else if (contentDTO.appStyle === CompStyle.Card_05) {
-        Card5Component({ contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy})
+        Card5Component({ compDTO: this.compDTO, contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName})
       } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle
       } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle
         .Card_13) {
         .Card_13) {
-        Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
+        Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_10) {
       } else if (contentDTO.appStyle === CompStyle.Card_10) {
-        Card10Component({ compDTO: this.compDTO, contentDTO })
+        Card10Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_11) {
       } else if (contentDTO.appStyle === CompStyle.Card_11) {
-        Card11Component({ compDTO: this.compDTO, contentDTO })
+        Card11Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_12) {
       } else if (contentDTO.appStyle === CompStyle.Card_12) {
-        Card12Component({ contentDTO })
+        Card12Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_14) {
       } else if (contentDTO.appStyle === CompStyle.Card_14) {
-        Card14Component({ contentDTO })
+        Card14Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_15) {
       } else if (contentDTO.appStyle === CompStyle.Card_15) {
-        Card15Component({ contentDTO })
+        Card15Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_16) {
       } else if (contentDTO.appStyle === CompStyle.Card_16) {
-        Card16Component({ contentDTO })
+        Card16Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_17) {
       } else if (contentDTO.appStyle === CompStyle.Card_17) {
-        Card17Component({ compDTO: this.compDTO, contentDTO })
+        Card17Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_19) {
       } else if (contentDTO.appStyle === CompStyle.Card_19) {
-        Card19Component({ contentDTO })
+        Card19Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_20) {
       } else if (contentDTO.appStyle === CompStyle.Card_20) {
-        Card20Component({ contentDTO })
+        Card20Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_21) {
       } else if (contentDTO.appStyle === CompStyle.Card_21) {
-        Card21Component({ contentDTO })
+        Card21Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else {
       } else {
         // todo:组件未实现 / Component Not Implemented
         // todo:组件未实现 / Component Not Implemented
         // Text(contentDTO.appStyle)
         // Text(contentDTO.appStyle)

@@ -33,6 +33,8 @@ import { LiveHorizontalCardComponent } from './view/LiveHorizontalCardComponent'
  */
  */
 @Component
 @Component
 export struct CompParser {
 export struct CompParser {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
   @State compIndex: number = 0;
   @State compIndex: number = 0;
   @State private pageModel: PageModel = new PageModel();
   @State private pageModel: PageModel = new PageModel();
@@ -71,26 +73,26 @@ export struct CompParser {
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
         if (this.compDTO.operDataList.length > this.audioItems.length) {
         if (this.compDTO.operDataList.length > this.audioItems.length) {
-          ZhCarouselLayout01({ compDTO: this.compDTO })
+          ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
           Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
           Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         }
         }
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
         this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
         this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
 
 
-        LiveHorizontalCardComponent({ compDTO: this.compDTO })
+        LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
         if (this.compDTO.operDataList.length > 1) {
         if (this.compDTO.operDataList.length > 1) {
-          HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO })
+          HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         } else {
         } else {
-          HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO })
+          HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         }
         }
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
-        ZhSingleRow02({ compDTO: this.compDTO })
+        ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
-        ZhSingleRow03({ compDTO: this.compDTO })
+        ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
         //ZhGridLayout02({ compDTO: this.compDTO })
         //ZhGridLayout02({ compDTO: this.compDTO })
@@ -98,34 +100,34 @@ export struct CompParser {
         //   Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         //   Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
 
 
-        ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList })
+        ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList, pageId: this.pageId, pageName: this.pageName })
 
 
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
-        ZhGridLayout03({ compDTO: this.compDTO })
+        ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
-        ZhSingleRow04({ compDTO: this.compDTO })
+        ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
         // ZhSingleRow05({ compDTO })
         // ZhSingleRow05({ compDTO })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
-        ZhSingleRow06({ compDTO: this.compDTO })
+        ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
         //头图卡 和comStyle 2相同，
         //头图卡 和comStyle 2相同，
-        Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy })
+        Card5Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
         // 大图卡
         // 大图卡
-        Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] })
+        Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
         //时间链卡
         //时间链卡
-        Card9Component({ contentDTO:this.compDTO.operDataList[0] })
+        Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
-        ZhSingleColumn04({ compDTO: this.compDTO })
+        ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
         // ZhSingleColumn05({ compDTO: compDTO })
         // ZhSingleColumn05({ compDTO: compDTO })
@@ -133,14 +135,14 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
         Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
         Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
         Divider().strokeWidth(6).color('#f5f5f5')
         Divider().strokeWidth(6).color('#f5f5f5')
-        ZhSingleColumn09({ compDTO: this.compDTO })
+        ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(6).color('#f5f5f5')
         Divider().strokeWidth(6).color('#f5f5f5')
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
         AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
         AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
         //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
         //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
       } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
-        CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO });
+        CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName });
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else {
       } else {
         // Text(this.compDTO.compStyle)
         // Text(this.compDTO.compStyle)

@@ -109,7 +109,7 @@ export struct DynamicDetailComponent {
       //分割线
       //分割线
       Image($r('app.media.ic_news_detail_division'))
       Image($r('app.media.ic_news_detail_division'))
         .width('100%')
         .width('100%')
-        .height($r('app.float.margin_12'))
+        .height($r('app.float.margin_6'))
         .padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
         .padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
         if (!this.isNetConnected) {
         if (!this.isNetConnected) {

-import { Action, NewspaperListItemBean, NewspaperPositionItemBean, Params } from 'wdBean';
-import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
+import { ContentDTO, NewspaperListItemBean, NewspaperPositionItemBean, Params } from 'wdBean';
 import { StringUtils } from 'wdKit';
 import { StringUtils } from 'wdKit';
-import { WDRouterRule } from 'wdRouter';
+import { ProcessUtils } from 'wdRouter';
 import { newsSkeleton } from './skeleton/newsSkeleton';
 import { newsSkeleton } from './skeleton/newsSkeleton';
 
 
 @Component
 @Component
@@ -62,21 +61,15 @@ export struct ENewspaperItemComponent {
       }
       }
       if (event.type === TouchType.Up) {
       if (event.type === TouchType.Up) {
         this.context.clearRect(0, 0, this.context.width, this.context.height)
         this.context.clearRect(0, 0, this.context.width, this.context.height)
-        if (this.itemBeanClicked && this.itemBeanClicked.newsId) {
-          let taskAction: Action = {
-            type: 'JUMP_INNER_NEW_PAGE',
-            params: {
-              contentID: '' + this.itemBeanClicked.newsId,
-              pageID: 'IMAGE_TEXT_DETAIL',
-              extra: {
-                relType: this.itemBeanClicked.relType ?? '',
-                relId: '' + this.itemBeanClicked.relId,
-                sourcePage: '5'
-              } as ExtraDTO
-            } as Params,
-          };
-          WDRouterRule.jumpWithAction(taskAction)
-
+        if (this.itemBeanClicked != null && this.itemBeanClicked.newsId != 0) {
+          //公共跳转
+          let content: ContentDTO = {
+            objectId:this.itemBeanClicked.newsId+'',
+            objectType:this.itemBeanClicked.newsType+'',
+            relId:this.itemBeanClicked.relId+'',
+            relType:this.itemBeanClicked.relType ?? '0'
+          } as ContentDTO
+          ProcessUtils.processPage(content)
           this.itemBeanClicked = {} as NewspaperPositionItemBean
           this.itemBeanClicked = {} as NewspaperPositionItemBean
         }
         }
       }
       }
@@ -139,7 +132,6 @@ export struct ENewspaperItemComponent {
               }
               }
 
 
             }
             }
-
             if (vp2px(x) > minX && vp2px(x) < maxX && vp2px(y) > minY && vp2px(y) < maxY) {
             if (vp2px(x) > minX && vp2px(x) < maxX && vp2px(y) > minY && vp2px(y) < maxY) {
               this.itemBeanClicked = itemBean;
               this.itemBeanClicked = itemBean;
               return xys;
               return xys;

@@ -33,8 +33,6 @@ export struct FeedBackActivity {
   //添加图片
   //添加图片
   addPic: PhotoListBean = {itemType:1} as PhotoListBean
   addPic: PhotoListBean = {itemType:1} as PhotoListBean
   @State pics: PhotoListBean[] = [this.addPic] as PhotoListBean[]
   @State pics: PhotoListBean[] = [this.addPic] as PhotoListBean[]
-  // 选择媒体文件的最大数目
-  selectNum = 3;
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     await this.getContentDetailData()
     await this.getContentDetailData()
@@ -110,15 +108,15 @@ export struct FeedBackActivity {
                     GridCol({
                     GridCol({
                     }) {
                     }) {
                       if(1 == feedbackImageItem.itemType){
                       if(1 == feedbackImageItem.itemType){
-                        Image($r('app.media.feekback_add'))
-                          .width(60)
-                          .height(60)
-                          .onClick(async (event: ClickEvent) => {
-                            if(await FastClickUtil.isMinDelayTime()){
-                              return
-                            }
-                            this.callFilePickerSelectImage();
-                          })
+                        // Image($r('app.media.feekback_add'))
+                        //   .width(60)
+                        //   .height(60)
+                        //   .onClick(async (event: ClickEvent) => {
+                        //     if(await FastClickUtil.isMinDelayTime()){
+                        //       return
+                        //     }
+                        //     this.callFilePickerSelectImage();
+                        //   })
                       }else{
                       }else{
                         Stack({alignContent: Alignment.TopEnd}) {
                         Stack({alignContent: Alignment.TopEnd}) {
                           Image(feedbackImageItem.picPath)
                           Image(feedbackImageItem.picPath)
@@ -140,7 +138,6 @@ export struct FeedBackActivity {
                               if(await FastClickUtil.isMinDelayTime()){
                               if(await FastClickUtil.isMinDelayTime()){
                                 return
                                 return
                               }
                               }
-
                               let temp: PhotoListBean[] = [] as PhotoListBean[]
                               let temp: PhotoListBean[] = [] as PhotoListBean[]
                               temp.length = this.pics.length - 1;
                               temp.length = this.pics.length - 1;
                               let tempIndex = 0;
                               let tempIndex = 0;
@@ -267,7 +264,8 @@ export struct FeedBackActivity {
       // 设置photoPicker的参数
       // 设置photoPicker的参数
       let PhotoSelectOptions = new picker.PhotoSelectOptions();
       let PhotoSelectOptions = new picker.PhotoSelectOptions();
       PhotoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型
       PhotoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型
-      PhotoSelectOptions.maxSelectNumber = this.selectNum; // 选择媒体文件的最大数目
+      let max = 3-this.pics.length+1
+      PhotoSelectOptions.maxSelectNumber = max; // 选择媒体文件的最大数目
       let mediaFlag = false;
       let mediaFlag = false;
       let photoPicker = new picker.PhotoViewPicker(); // 使用图库选择器对象前，需要先创建PhotoViewPicker实例
       let photoPicker = new picker.PhotoViewPicker(); // 使用图库选择器对象前，需要先创建PhotoViewPicker实例
       photoPicker.select(PhotoSelectOptions).then((PhotoSelectResult) => {
       photoPicker.select(PhotoSelectOptions).then((PhotoSelectResult) => {
@@ -278,26 +276,35 @@ export struct FeedBackActivity {
           // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
           // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
           // 声明变量array，其取值为PhotoSelectResult中的数组。
           // 声明变量array，其取值为PhotoSelectResult中的数组。
           array = PhotoSelectResult['photoUris'];
           array = PhotoSelectResult['photoUris'];
-          let beforeLen = this.pics.length;
-          let startIndex = this.pics.length-1;
+          let beforeLen = this.pics.length + array.length;
           let totalLen = this.pics.length+array.length;
           let totalLen = this.pics.length+array.length;
           if(totalLen > 3){
           if(totalLen > 3){
             totalLen = 3
             totalLen = 3
           }
           }
-          this.pics.length = totalLen;
-
+          // this.pics.length = totalLen;
+          let tempPics =  [] as PhotoListBean[]
+          tempPics.length = totalLen;
+          let startIndex = 0;
+          this.pics.forEach((value) => {
+            if(value.itemType == 2){
+              value.id = startIndex
+              tempPics[startIndex] = value;
+              startIndex = startIndex+1;
+              mediaFlag = true;
+            }
+          })
           array.forEach((value) => {
           array.forEach((value) => {
             let pic: PhotoListBean = {itemType:2,picPath:value} as PhotoListBean
             let pic: PhotoListBean = {itemType:2,picPath:value} as PhotoListBean
             pic.id = startIndex
             pic.id = startIndex
-            this.pics[startIndex] = pic
+            tempPics[startIndex] = pic;
             startIndex = startIndex+1;
             startIndex = startIndex+1;
             mediaFlag = true;
             mediaFlag = true;
-            Logger.info(TAG, `select image/video uri: ${value}`);
           })
           })
-          if(this.pics.length<=3 && beforeLen != 3 && array.length != 3){
+          if(startIndex<3){
             this.addPic.id = startIndex
             this.addPic.id = startIndex
-            this.pics[this.pics.length-1]=this.addPic;
+            tempPics[startIndex]=this.addPic;
           }
           }
+          this.pics = tempPics;
         }
         }
         if (mediaFlag) {
         if (mediaFlag) {
           this.getFilenameByUriForMedia(array);
           this.getFilenameByUriForMedia(array);

@@ -23,6 +23,9 @@ import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel
 import { AudioSuspensionModel } from '../../viewmodel/AudioSuspensionModel'
 import { AudioSuspensionModel } from '../../viewmodel/AudioSuspensionModel'
 import { viewColumInsightIntentShare } from '../../utils/InsightIntentShare'
 import { viewColumInsightIntentShare } from '../../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
+import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
+import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
+import { ColorUtils } from '../../utils/ColorUtils';
 
 
 const TAG = 'MorningEveningPaperComponent';
 const TAG = 'MorningEveningPaperComponent';
 
 
@@ -200,13 +203,18 @@ export struct MorningEveningPaperComponent {
 
 
     const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
     const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
 
 
-    if (imageSource) {
+    if (imageSource && this.pageInfoBean.topicInfo.frontFlag === 1) {
       this.pickColor(imageSource)
       this.pickColor(imageSource)
 
 
     } else {
     } else {
-      this.mixedBgColor = this.pageInfoBean.backgroundColor
+      if (this.pageInfoBean.topicInfo.topicPattern === 1) {
+        this.mixedBgColor = '#66BDBD'
+      }else if(this.pageInfoBean.topicInfo.topicPattern === 2){
+        this.mixedBgColor = '#E78E17'
+      }else {
+        this.mixedBgColor = '#2F2170'
+      }
     }
     }
-
   }
   }
 
 
   private async pickColor(imageSource: image.ImageSource | undefined) {
   private async pickColor(imageSource: image.ImageSource | undefined) {
@@ -216,6 +224,7 @@ export struct MorningEveningPaperComponent {
         let color = colorPicker.getMainColorSync();
         let color = colorPicker.getMainColorSync();
         Logger.debug(TAG, "compInfoBean compStyle = " + color)
         Logger.debug(TAG, "compInfoBean compStyle = " + color)
 
 
+        color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
         // 将取色器选取的color示例转换为十六进制颜色代码
         // 将取色器选取的color示例转换为十六进制颜色代码
         this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
         this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
         Logger.debug(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
         Logger.debug(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
@@ -230,9 +239,15 @@ export struct MorningEveningPaperComponent {
     // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
   }
 
 
+  onPageShow(){
+    TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
+  }
+
   onPageHide() {
   onPageHide() {
     this.status = PlayerConstants.STATUS_PAUSE;
     this.status = PlayerConstants.STATUS_PAUSE;
     this.playerController?.pause();
     this.playerController?.pause();
+
+    TrackingPageBrowseUtils.TrackingPageBrowseExposureEnd('','',TrackParamConvert.pageInfoBean_ParamType(this.pageInfoBean))
   }
   }
 
 
   build() {
   build() {

-import { FrontLinkObject } from 'wdBean';
+import { ContentDTO, FrontLinkObject } from 'wdBean';
+import { ProcessUtils } from 'wdRouter/Index';
 
 
 /**
 /**
  * 早晚报，topic
  * 早晚报，topic
@@ -47,7 +48,15 @@ export struct topicInfoView {
       .backgroundColor($r('app.color.color_99636363'))
       .backgroundColor($r('app.color.color_99636363'))
       .margin({ top: 8, left: 16, right: 16, bottom: 16 })
       .margin({ top: 8, left: 16, right: 16, bottom: 16 })
       .borderRadius(2)
       .borderRadius(2)
-      // .backgroundColor(Color.Red)
+      .onClick(()=>{
+        if (this.frontLinkObject) {
+          let  contentDTO :ContentDTO = new ContentDTO();
+          contentDTO.objectType = this.frontLinkObject?.newsType.toString()
+          contentDTO.objectId = this.frontLinkObject?.newsId
+          contentDTO.linkUrl  =  this.frontLinkObject?.linkUrl
+          ProcessUtils.processPage(contentDTO)
+        }
+      }).width(80)
       .alignRules({
       .alignRules({
         left: { anchor: "__container__", align: HorizontalAlign.Start },
         left: { anchor: "__container__", align: HorizontalAlign.Start },
         bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
         bottom: { anchor: "__container__", align: VerticalAlign.Bottom }

@@ -138,6 +138,7 @@ export struct SpacialTopicPageComponent {
           contentDetailData: this.contentDetailData,
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
           operationButtonList: this.operationButtonList,
           operationButtonList: this.operationButtonList,
+          styleType: 1,
         })
         })
       }
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)

@@ -12,13 +12,18 @@ import font from '@ohos.font';
  */
  */
 @Component
 @Component
 export struct CardMediaInfo {
 export struct CardMediaInfo {
+
+  @State livePeopleNum :boolean  = true
   @State contentDTO: ContentDTO = new ContentDTO() // 如果有duraion，代表点播，显示时长；如果不传或者传0，显示直播中
   @State contentDTO: ContentDTO = new ContentDTO() // 如果有duraion，代表点播，显示时长；如果不传或者传0，显示直播中
   @State joinPeopleNum: number = 0;
   @State joinPeopleNum: number = 0;
   // objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
   // objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
   // 14动态图文,15动态视频16问政；100人民号,101标签
   // 14动态图文,15动态视频16问政；100人民号,101标签
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
+    if(this.livePeopleNum){
       this.getJoinPeopleNum();
       this.getJoinPeopleNum();
+    }
+
 
 
     font.registerFont({
     font.registerFont({
       familyName: 'BebasNeue',
       familyName: 'BebasNeue',

@@ -49,7 +49,7 @@ export struct CardAdvVideoComponent {
           .borderColor($r('app.color.color_0D000000'))
           .borderColor($r('app.color.color_0D000000'))
         //播放状态+时长
         //播放状态+时长
         CardMediaInfo({
         CardMediaInfo({
-          contentDTO: this.contentDTO
+          contentDTO: this.contentDTO, livePeopleNum:false,
         })
         })
       }
       }
       .alignContent(Alignment.BottomEnd)
       .alignContent(Alignment.BottomEnd)

@@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 /**
 /**
  * 大专题卡--CompStyle:  10
  * 大专题卡--CompStyle:  10
@@ -14,6 +15,8 @@ const TAG: string = 'Card10Component';
 @Preview
 @Preview
 @Component
 @Component
 export struct Card10Component {
 export struct Card10Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
@@ -57,6 +60,7 @@ export struct Card10Component {
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .margin({ bottom: 19 })
           .margin({ bottom: 19 })
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
+            InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)
           })
           })
       }
       }
@@ -70,6 +74,7 @@ export struct Card10Component {
             topRight: $r('app.float.image_border_radius')
             topRight: $r('app.float.image_border_radius')
           })
           })
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
+            InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)
           })
           })
         if (this.contentDTO.objectType == '5') {
         if (this.contentDTO.objectType == '5') {
@@ -102,6 +107,7 @@ export struct Card10Component {
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .margin({ top: 5 })
         .margin({ top: 5 })
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
+          InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
           ProcessUtils.processPage(this.contentDTO)
           ProcessUtils.processPage(this.contentDTO)
         })
         })
       }
       }

@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card11Component';
 const TAG = 'Card11Component';
 
 
@@ -14,6 +15,8 @@ const TAG = 'Card11Component';
  */
  */
 @Component
 @Component
 export struct Card11Component {
 export struct Card11Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
@@ -78,6 +81,7 @@ export struct Card11Component {
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card12Component';
 const TAG = 'Card12Component';
 
 
@@ -13,6 +14,9 @@ const TAG = 'Card12Component';
  */
  */
 @Component
 @Component
 export struct Card12Component {
 export struct Card12Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @State titleMarked: boolean = false;
   @State titleMarked: boolean = false;
@@ -70,6 +74,7 @@ export struct Card12Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card14Component';
 const TAG = 'Card14Component';
 
 
@@ -14,6 +15,9 @@ const TAG = 'Card14Component';
  */
  */
 @Component
 @Component
 export struct Card14Component {
 export struct Card14Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -89,6 +93,7 @@ export struct Card14Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
@@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index';
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG: string = 'Card15Component';
 const TAG: string = 'Card15Component';
 
 
@@ -18,6 +19,9 @@ const TAG: string = 'Card15Component';
  */
  */
 @Component
 @Component
 export struct Card15Component {
 export struct Card15Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -87,6 +91,7 @@ export struct Card15Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card16Component';
 const TAG = 'Card16Component';
 
 
@@ -19,6 +20,9 @@ interface fullColumnImgUrlItem {
  */
  */
 @Component
 @Component
 export struct Card16Component {
 export struct Card16Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -88,6 +92,7 @@ export struct Card16Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -6,6 +6,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card17Component';
 const TAG = 'Card17Component';
 
 
@@ -14,6 +15,8 @@ const TAG = 'Card17Component';
  */
  */
 @Component
 @Component
 export struct Card17Component {
 export struct Card17Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -106,6 +109,7 @@ export struct Card17Component {
       }
       }
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
+        InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
         this.clicked = true;
         this.clicked = true;
         persistentStorage(this.contentDTO.objectId);
         persistentStorage(this.contentDTO.objectId);
         let taskAction: Action = {
         let taskAction: Action = {

-import { ContentDTO, FullColumnImgUrlDTO, PhotoListBean } from 'wdBean';
+import { ContentDTO, FullColumnImgUrlDTO, PhotoListBean, CompDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { CarderInteraction } from '../CarderInteraction'
 import { CarderInteraction } from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card19Component';
 const TAG = 'Card19Component';
 
 
@@ -13,6 +14,9 @@ const TAG = 'Card19Component';
  */
  */
 @Component
 @Component
 export struct Card19Component {
 export struct Card19Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO()
   @State contentDTO: ContentDTO = new ContentDTO()
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @State titleMarked: boolean = false;
   @State titleMarked: boolean = false;
@@ -48,7 +52,7 @@ export struct Card19Component {
               .fontColor(0xED2800)
               .fontColor(0xED2800)
             Span(this.str03)
             Span(this.str03)
           } else {
           } else {
-            Span(this.contentDTO.newsTitle)
+            Span(this.contentDTO.newsTitle=='null'?"":this.contentDTO.newsTitle)
           }
           }
         }
         }
           .fontSize($r('app.float.font_size_18'))
           .fontSize($r('app.float.font_size_18'))
@@ -58,6 +62,7 @@ export struct Card19Component {
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .lineHeight(25)
           .lineHeight(25)
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
+            InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
             this.clicked = true;
             this.clicked = true;
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)
           })
           })
@@ -75,6 +80,7 @@ export struct Card19Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Card20Component';
 const TAG = 'Card20Component';
 
 
@@ -14,6 +15,9 @@ const TAG = 'Card20Component';
  */
  */
 @Component
 @Component
 export struct Card20Component {
 export struct Card20Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @State titleMarked: boolean = false;
   @State titleMarked: boolean = false;
@@ -72,6 +76,7 @@ export struct Card20Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
@@ -98,7 +103,7 @@ struct createImg {
 
 
   build() {
   build() {
     GridRow() {
     GridRow() {
-      if (this.contentDTO.fullColumnImgUrls[0].landscape === 1) {
+      if (this.contentDTO.fullColumnImgUrls[0].landscape === 1 || this.contentDTO.fullColumnImgUrls[0].weight > this.contentDTO.fullColumnImgUrls[0].height) {
         // 横屏
         // 横屏
         GridCol({
         GridCol({
           span: { xs: 12 }
           span: { xs: 12 }

-import { ContentDTO } from 'wdBean';
+import { ContentDTO, CompDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import {CarderInteraction} from '../CarderInteraction'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG: string = 'Card6Component-Card13Component';
 const TAG: string = 'Card6Component-Card13Component';
 
 
@@ -14,6 +15,9 @@ const TAG: string = 'Card6Component-Card13Component';
  */
  */
 @Component
 @Component
 export struct Card21Component {
 export struct Card21Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -80,6 +84,7 @@ export struct Card21Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     }
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -6,8 +6,9 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
-
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
+
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
 /**
 /**
@@ -19,6 +20,8 @@ const TAG: string = 'Card2Component';
  */
  */
 @Component
 @Component
 export struct Card2Component {
 export struct Card2Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -110,6 +113,7 @@ export struct Card2Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
+
 
 
 /**
 /**
  * 卡片样式："appStyle":"3"
  * 卡片样式："appStyle":"3"
@@ -11,6 +13,8 @@ import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  */
  */
 @Component
 @Component
 export struct Card3Component {
 export struct Card3Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
@@ -71,6 +75,7 @@ export struct Card3Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -6,6 +6,8 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
+
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
 /**
 /**
@@ -17,6 +19,8 @@ const TAG: string = 'Card4Component';
  */
  */
 @Component
 @Component
 export struct Card4Component {
 export struct Card4Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -106,6 +110,7 @@ export struct Card4Component {
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
+        InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
         this.clicked = true;
         this.clicked = true;
         persistentStorage(this.contentDTO.objectId);
         persistentStorage(this.contentDTO.objectId);
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)

@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
+
 
 
 const TAG: string = 'Card5Component';
 const TAG: string = 'Card5Component';
 
 
@@ -12,7 +14,10 @@ const TAG: string = 'Card5Component';
  */
  */
 @Component
 @Component
 export struct Card5Component {
 export struct Card5Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
+  @ObjectLink compDTO: CompDTO
   @Prop titleShowPolicy: number | string
   @Prop titleShowPolicy: number | string
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -96,6 +101,7 @@ export struct Card5Component {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -7,6 +7,7 @@ import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Logger } from 'wdKit/Index';
 import { Logger } from 'wdKit/Index';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG: string = 'Card6Component-Card13Component';
 const TAG: string = 'Card6Component-Card13Component';
 
 
@@ -15,6 +16,8 @@ const TAG: string = 'Card6Component-Card13Component';
  */
  */
 @Component
 @Component
 export struct Card6Component {
 export struct Card6Component {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
   @State titleMarked: boolean = false;
   @State titleMarked: boolean = false;
@@ -104,6 +107,7 @@ export struct Card6Component {
       }
       }
     }
     }
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

-import { ContentDTO, slideShows } from 'wdBean';
+import { ContentDTO, slideShows, CompDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { Notes } from './notes';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 /**
 /**
  * 时间链卡--CompStyle:  09
  * 时间链卡--CompStyle:  09
@@ -13,6 +14,9 @@ const TAG: string = 'Card9Component';
 
 
 @Component
 @Component
 export struct Card9Component {
 export struct Card9Component {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   // @State loadImg: boolean = true;
   // @State loadImg: boolean = true;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -22,6 +26,7 @@ export struct Card9Component {
   @State str03: string = '';
   @State str03: string = '';
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
+    console.log('Card9Component', JSON.stringify(this.contentDTO))
     this.titleInit();
     this.titleInit();
     // this.loadImg = await onlyWifiLoadImg();
     // this.loadImg = await onlyWifiLoadImg();
     this.clicked = hasClicked(this.contentDTO.objectId)
     this.clicked = hasClicked(this.contentDTO.objectId)
@@ -112,6 +117,7 @@ export struct Card9Component {
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
     .margin({ bottom: 8 })
     .margin({ bottom: 8 })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       persistentStorage(this.contentDTO.objectId);
       persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)

@@ -3,7 +3,7 @@
  */
  */
 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
 
 
-const TAG: string = 'Card9Component';
+const TAG: string = 'More_Comp';
 
 
 @Entry
 @Entry
 @Component
 @Component

@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
+
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
 /**
 /**
@@ -11,6 +13,9 @@ const TAG: string = 'Card4Component';
  */
  */
 @Component
 @Component
 export struct SearchContentComponent {
 export struct SearchContentComponent {
+  @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
@@ -57,6 +62,7 @@ export struct SearchContentComponent {
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
+        InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
         this.clicked = true;
         this.clicked = true;
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)
       })
       })

-import { DateTimeUtils, EmitterEventId, EmitterUtils, LazyDataSource, StringUtils } from 'wdKit/Index';
+import { DateTimeUtils, EmitterEventId, EmitterUtils, LazyDataSource,
+  PublicDialogManager,
+  StringUtils } from 'wdKit/Index';
 import { commentItemModel, WDPublicUserType } from '../model/CommentModel';
 import { commentItemModel, WDPublicUserType } from '../model/CommentModel';
 import commentViewModel from '../viewmodel/CommentViewModel';
 import commentViewModel from '../viewmodel/CommentViewModel';
 import { CommentText } from './CommentText';
 import { CommentText } from './CommentText';
@@ -21,6 +23,7 @@ const testString = '因为读书的人\n是低着头向上看的人\n身处一
 export struct CommentComponent {
 export struct CommentComponent {
   private onCloseClick = () => {
   private onCloseClick = () => {
   }
   }
+  showTitleComponent: boolean = true
   @Prop showCloseIcon?: boolean = false
   @Prop showCloseIcon?: boolean = false
   @State hasMore: boolean = true;
   @State hasMore: boolean = true;
   @State currentPage: number = 1;
   @State currentPage: number = 1;
@@ -40,6 +43,9 @@ export struct CommentComponent {
   @Prop @Watch("parentOnReachEnd") reachEndIncreament: number = 0
   @Prop @Watch("parentOnReachEnd") reachEndIncreament: number = 0
   reachEndLoadMoreFinish?: () => void
   reachEndLoadMoreFinish?: () => void
 
 
+  // 是否在弹框中
+  @Provide inDialog: boolean = false
+
   // 在自定义组件即将析构销毁时将dialogControlle置空
   // 在自定义组件即将析构销毁时将dialogControlle置空
   aboutToDisappear() {
   aboutToDisappear() {
     this.dialogController = null // 将dialogController置空
     this.dialogController = null // 将dialogController置空
@@ -163,7 +169,9 @@ export struct CommentComponent {
   build() {
   build() {
     Column() {
     Column() {
       List({ scroller: this.listScroller }) {
       List({ scroller: this.listScroller }) {
+        if (this.showTitleComponent) {
           ListItemGroup({ header: this.titleHeader() })
           ListItemGroup({ header: this.titleHeader() })
+        }
 
 
         if (!this.isComments) {
         if (!this.isComments) {
           EmptyComponent({ emptyType: 17 })
           EmptyComponent({ emptyType: 17 })
@@ -259,7 +267,7 @@ export struct CommentComponent {
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''
           this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + ''
         }
         }
 
 
-        if (commentListModel.list.length === 0) {
+        if (commentListModel.list.length === 0 && this.allDatas.totalCount() == 0) {
           this.isComments = false
           this.isComments = false
         }
         }
 
 
@@ -299,6 +307,8 @@ struct ChildCommentItem {
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
   @Consume contentDetailData: ContentDetailDTO
   @Consume contentDetailData: ContentDetailDTO
 
 
+  @Consume inDialog: boolean
+
   build() {
   build() {
     Column() {
     Column() {
       Row() {
       Row() {
@@ -406,7 +416,12 @@ struct ChildCommentItem {
     .margin({ left: 47 })
     .margin({ left: 47 })
     .alignContent(Alignment.Center)
     .alignContent(Alignment.Center)
     .onClick(() => {
     .onClick(() => {
-      commentViewModel.jumpToAccountPage(this.item)
+
+      commentViewModel.jumpToAccountPage(this.item, () => {
+        if (this.inDialog) {
+          PublicDialogManager.shareInstance().closeLastDialog()
+        }
+      })
     })
     })
   }
   }
 
 
@@ -514,6 +529,8 @@ struct commentHeaderView {
   @Link dialogController: CustomDialogController | null
   @Link dialogController: CustomDialogController | null
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
 
 
+  @Consume inDialog: boolean
+
   build() {
   build() {
     Column() {
     Column() {
       Row() {
       Row() {
@@ -607,7 +624,12 @@ struct commentHeaderView {
     .margin({ left: 8 })
     .margin({ left: 8 })
     .alignContent(Alignment.Center)
     .alignContent(Alignment.Center)
     .onClick(() => {
     .onClick(() => {
-      commentViewModel.jumpToAccountPage(this.item)
+
+      commentViewModel.jumpToAccountPage(this.item, () => {
+        if (this.inDialog) {
+          PublicDialogManager.shareInstance().closeLastDialog()
+        }
+      })
     })
     })
   }
   }
 
 
@@ -640,6 +662,8 @@ struct commentFooterView {
   @Link dialogController: CustomDialogController | null
   @Link dialogController: CustomDialogController | null
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
 
 
+  @Consume inDialog: boolean
+
   build() {
   build() {
     Row() {
     Row() {
 
 
@@ -710,6 +734,9 @@ struct commentFooterView {
     // 未登录，跳转登录
     // 未登录，跳转登录
     const user_id = HttpUtils.getUserId()
     const user_id = HttpUtils.getUserId()
     if (!user_id) {
     if (!user_id) {
+      if (this.inDialog) {
+        PublicDialogManager.shareInstance().closeLastDialog()
+      }
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
 import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
+import { PublicDialogManager } from 'wdKit/Index'
+import { TrackConstants } from 'wdTracking/Index'
 import { OperRowListView } from '../../view/OperRowListView'
 import { OperRowListView } from '../../view/OperRowListView'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { CommentComponent } from './CommentComponent'
 import { CommentComponent } from './CommentComponent'
 
 
 /// 评论列表弹框
 /// 评论列表弹框
+@Component
+export struct CommentListDialogView {
+  @Link @Watch('showCommentListChange') showCommentList: boolean
+  @Link contentDetailData: ContentDetailDTO // 详情页传
+  @Link pageInfo: PageInfoDTO           // 专题页传
+  onClose?: () => void
+
+  // @Consume pageId: TrackConstants.PageName
+  // @Consume pageName: TrackConstants.PageName
+
+  private dialogController: CustomDialogController = new CustomDialogController({
+    builder: CommentListDialog({
+      contentDetailData: this.contentDetailData,
+      pageInfo: this.pageInfo,
+      onClose: this.onClose
+    }),
+    autoCancel: false,
+    customStyle: true,
+    alignment: DialogAlignment.Bottom,
+  })
+
+  showCommentListChange(val: boolean) {
+    if (this.showCommentList) {
+      PublicDialogManager.shareInstance().openDialog(this.dialogController, this.closeAction.bind(this))
+    } else {
+      PublicDialogManager.shareInstance().closeDialog(this.dialogController)
+    }
+  }
+
+  closeAction() {
+    this.showCommentList = false
+  }
+
+  build() {
+  }
+}
+
 @CustomDialog
 @CustomDialog
-export struct CommentListDialog {
+struct CommentListDialog {
 
 
   /// 内部使用
   /// 内部使用
   @State private publishCommentModel: publishCommentModel = new publishCommentModel()
   @State private publishCommentModel: publishCommentModel = new publishCommentModel()
@@ -15,12 +54,12 @@ export struct CommentListDialog {
   @State windowHeight: number = AppStorage.get<number>('windowHeight') || 0
   @State windowHeight: number = AppStorage.get<number>('windowHeight') || 0
 
 
   /// 外部初始化
   /// 外部初始化
-  @Consume contentDetailData: ContentDetailDTO // 详情页传
-  @Consume pageInfo: PageInfoDTO           // 专题页传
+  @Link contentDetailData: ContentDetailDTO // 详情页传
+  @Link pageInfo: PageInfoDTO           // 专题页传
   onClose?: () => void
   onClose?: () => void
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-    if (this.contentDetailData) {
+    if (this.contentDetailData.newsId) {
       if (this.contentDetailData?.openComment) {
       if (this.contentDetailData?.openComment) {
         this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
         this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
         this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
         this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
@@ -33,40 +72,76 @@ export struct CommentListDialog {
 
 
         this.operationButtonList.push('comment')
         this.operationButtonList.push('comment')
       }
       }
+      if (this.contentDetailData?.openLikes && this.contentDetailData?.likesStyle != 4) {
+        this.operationButtonList.push('like')
+      }
       this.operationButtonList.push('collect')
       this.operationButtonList.push('collect')
+
       this.operationButtonList.push('share')
       this.operationButtonList.push('share')
     }
     }
 
 
     if (this.pageInfo) {
     if (this.pageInfo) {
+      //TODO: 专题的逻辑判断
+
     }
     }
   }
   }
 
 
   build() {
   build() {
     Column() {
     Column() {
+      this.titleHeaderView()
+
       CommentComponent({
       CommentComponent({
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,
-        showCloseIcon: true,
         fixedHeightMode: true,
         fixedHeightMode: true,
-        onCloseClick: () => {
-          this.controller!.close()
-          if (this.onClose) {
-            this.onClose()
-          }
-        }
+        inDialog: true,
+        showTitleComponent: false
       }).layoutWeight(1)
       }).layoutWeight(1)
 
 
       OperRowListView({
       OperRowListView({
-        componentType: 1,
+        componentType: 4,
         pageComponentType: 8,
         pageComponentType: 8,
         showBackIcon: false,
         showBackIcon: false,
         operationButtonList: this.operationButtonList,
         operationButtonList: this.operationButtonList,
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,
         showCommentIcon: true,
         showCommentIcon: true,
+        styleType: 1,
+        inDialog: true,
+        dialogBeforeJumpOtherPageAction: () => {
+          PublicDialogManager.shareInstance().closeLastDialog()
+        }
       })
       })
     }
     }
     .height(this.windowHeight - this.windowWidth * 9 / 16 + 'px')
     .height(this.windowHeight - this.windowWidth * 9 / 16 + 'px')
-    .zIndex(1000)
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
   }
   }
+
+  @Builder titleHeaderView() {
+    Row() {
+      Row() {
+        Image($r('app.media.redLine'))
+          .height(16)
+          .width(3)
+        Text('全部评论')
+          .fontSize(18)// .fontColor('#222222')
+          .fontColor($r('app.color.color_222222'))
+          .fontWeight(FontWeight.Medium)
+          .margin({ left: 5 })
+      }
+      .margin({ left: 16 })
+
+      Image($r('app.media.close_button'))
+        .height(16)
+        .width(16)
+        .margin({ right: 16 })// .visibility(this.showCloseIcon ? Visibility.Visible : Visibility.Hidden)
+        .onClick(() => {
+          if (this.onClose) {
+            this.onClose()
+          }
+        })
+    }
+    .height(44)
+    .width('100%')
+    .justifyContent(FlexAlign.SpaceBetween)
+  }
 }
 }

@@ -483,7 +483,7 @@ class CommentViewModel {
     return false
     return false
   }
   }
 
 
-  jumpToAccountPage(commentItem: commentItemModel) {
+  jumpToAccountPage(commentItem: commentItemModel, beforeJump: () => void = () => {}) {
     let url = HttpUrlUtils.getOtherUserDetailDataUrl()
     let url = HttpUrlUtils.getOtherUserDetailDataUrl()
     let item : Record<string, string >= {}
     let item : Record<string, string >= {}
 
 
@@ -504,6 +504,7 @@ class CommentViewModel {
         return
         return
       }
       }
 
 
+      beforeJump()
       if (result.data.userType === "1") { // 普通用户
       if (result.data.userType === "1") { // 普通用户
         let params: Record<string, string> = {'userId': result.data.userId};
         let params: Record<string, string> = {'userId': result.data.userId};
         WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
         WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)

@@ -7,6 +7,7 @@ import { EmptyComponent } from '../view/EmptyComponent';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from '../cardview/notes';
 import { Notes } from '../cardview/notes';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Zh_Carousel_Layout-01';
 const TAG = 'Zh_Carousel_Layout-01';
 
 
@@ -41,6 +42,8 @@ class MyDataSource implements IDataSource {
 
 
 @Component
 @Component
 export struct ZhCarouselLayout01 {
 export struct ZhCarouselLayout01 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string =
   @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string =
     BreakpointConstants.BREAKPOINT_XS;
     BreakpointConstants.BREAKPOINT_XS;
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
@@ -149,6 +152,7 @@ export struct ZhCarouselLayout01 {
         bottom: $r('app.float.card_comp_pagePadding_tb')
         bottom: $r('app.float.card_comp_pagePadding_tb')
       })
       })
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
+        InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[this.swiperIndex], this.pageId, this.pageName)
         Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`);
         Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`);
         ProcessUtils.processPage(this.compDTO.operDataList[this.swiperIndex])
         ProcessUtils.processPage(this.compDTO.operDataList[this.swiperIndex])
       })
       })
@@ -196,7 +200,7 @@ struct CarouselLayout01CardView {
       Column() {
       Column() {
         // 这里用于展示轮播图右上角信息，这里只对直播类型的展示
         // 这里用于展示轮播图右上角信息，这里只对直播类型的展示
         if (this.item.objectType === '2' || this.item.objectType === '4') {
         if (this.item.objectType === '2' || this.item.objectType === '4') {
-          CardMediaInfo({ contentDTO: this.item })
+          CardMediaInfo({ contentDTO: this.item,livePeopleNum:false })
             .width(CommonConstants.FULL_PARENT)
             .width(CommonConstants.FULL_PARENT)
         }
         }
         Blank()
         Blank()

@@ -4,6 +4,7 @@ import { Logger } from 'wdKit/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 let listSize: number = 2;
 let listSize: number = 2;
 
 
@@ -13,6 +14,8 @@ let listSize: number = 2;
  */
  */
 @Component
 @Component
 export struct ZhGridLayout02NewsContent {
 export struct ZhGridLayout02NewsContent {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
   @State operDataList: ContentDTO[] = []
   @State operDataList: ContentDTO[] = []
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
@@ -42,7 +45,7 @@ export struct ZhGridLayout02NewsContent {
   buildItemCard(item: ContentDTO, index: number) {
   buildItemCard(item: ContentDTO, index: number) {
     Column() {
     Column() {
       Stack({ alignContent: Alignment.BottomEnd }) {
       Stack({ alignContent: Alignment.BottomEnd }) {
-        Image(this.loadImg ? item.fullColumnImgUrls[0].url : '')
+        Image(this.loadImg ? item == undefined ? '' : item.fullColumnImgUrls[0].url : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .width('100%')
           .width('100%')
           .height(95)
           .height(95)
@@ -55,7 +58,12 @@ export struct ZhGridLayout02NewsContent {
             .fontSize(12)
             .fontSize(12)
             .fontWeight(400)
             .fontWeight(400)
             .fontColor(Color.White)
             .fontColor(Color.White)
-            .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
+            .textShadow({
+              radius: 2,
+              color: 'rgba(0,0,0,0.3)',
+              offsetX: 0,
+              offsetY: 2
+            })
             .margin({
             .margin({
               right: '5vp',
               right: '5vp',
               bottom: '5vp'
               bottom: '5vp'
@@ -74,6 +82,7 @@ export struct ZhGridLayout02NewsContent {
     }
     }
     .width('100%')
     .width('100%')
     .onClick(() => {
     .onClick(() => {
+      InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
       ProcessUtils.processPage(item)
       ProcessUtils.processPage(item)
     })
     })
   }
   }

@@ -4,6 +4,7 @@ import { Logger } from 'wdKit';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Zh_Grid_Layout-03';
 const TAG = 'Zh_Grid_Layout-03';
 const FULL_PARENT: string = '100%';
 const FULL_PARENT: string = '100%';
@@ -18,6 +19,8 @@ let listSize: number = 4;
 @Preview
 @Preview
 @Component
 @Component
 export struct ZhGridLayout03 {
 export struct ZhGridLayout03 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
 
 
@@ -73,6 +76,7 @@ export struct ZhGridLayout03 {
     }
     }
     .width('100%')
     .width('100%')
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
       if (item.objectType === '11') {
       if (item.objectType === '11') {
         ProcessUtils.jumpChannelTab(item.objectId, item.pageId, item.newsTitle)
         ProcessUtils.jumpChannelTab(item.objectId, item.pageId, item.newsTitle)
       } else {
       } else {

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Zh_Single_Column-04';
 const TAG = 'Zh_Single_Column-04';
 
 
@@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-04';
  */
  */
 @Component
 @Component
 export struct ZhSingleColumn04 {
 export struct ZhSingleColumn04 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   operDataList: ContentDTO[] = [
   operDataList: ContentDTO[] = [
   // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO,
   // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO,
@@ -83,6 +86,7 @@ export struct ZhSingleColumn04 {
     .backgroundImage($r('app.media.rmh_theme_bg'))
     .backgroundImage($r('app.media.rmh_theme_bg'))
     .backgroundImageSize({ width: CommonConstants.FULL_WIDTH, height: CommonConstants.FULL_WIDTH })
     .backgroundImageSize({ width: CommonConstants.FULL_WIDTH, height: CommonConstants.FULL_WIDTH })
     .onClick(() => {
     .onClick(() => {
+      InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
       ProcessUtils.processPage(item)
       ProcessUtils.processPage(item)
     })
     })
   }
   }

 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { Action, CompDTO, Params } from 'wdBean';
 import { Action, CompDTO, Params } from 'wdBean';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 const TAG = 'Zh_Single_Column-05';
 const TAG = 'Zh_Single_Column-05';
 
 
@@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-05';
  */
  */
 @Component
 @Component
 export struct ZhSingleColumn05 {
 export struct ZhSingleColumn05 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
 
 
   build() {
   build() {
@@ -29,6 +32,7 @@ export struct ZhSingleColumn05 {
       .justifyContent(FlexAlign.Center)
       .justifyContent(FlexAlign.Center)
       .borderRadius($r('app.float.button_border_radius'))
       .borderRadius($r('app.float.button_border_radius'))
       .onClick(() => {
       .onClick(() => {
+        // InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
         let taskAction: Action = {
         let taskAction: Action = {
           type: 'JUMP_H5_BY_WEB_VIEW',
           type: 'JUMP_H5_BY_WEB_VIEW',
           params: {
           params: {

@@ -5,6 +5,8 @@ import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { Tracking, TrackingContent, TrackConstants, ParamType } from 'wdTracking';
+import { TrackingUtils } from 'wdTracking/src/main/ets/common/TrackingUtils'
 /**
 /**
  * 兴趣卡
  * 兴趣卡
  * Zh_Single_Column-09
  * Zh_Single_Column-09
@@ -14,6 +16,8 @@ const TAG = 'Zh_Single_Column-09'
 @Entry
 @Entry
 @Component
 @Component
 export struct ZhSingleColumn09 {
 export struct ZhSingleColumn09 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State activeIndexs: Array<number> = []
   @State activeIndexs: Array<number> = []
   @State operDataList: ContentDTO[] = this.compDTO?.operDataList || []
   @State operDataList: ContentDTO[] = this.compDTO?.operDataList || []
@@ -25,6 +29,43 @@ export struct ZhSingleColumn09 {
     this.operDataList = this.shuffleArray(this.compDTO?.operDataList)
     this.operDataList = this.shuffleArray(this.compDTO?.operDataList)
   }
   }
 
 
+  trackClick(type: 'close_interest_card_click' | 'interest_card_selecting_click') {
+    try {
+      const contentDTO = this.compDTO.operDataList[0];
+      const extParams: ParamType = {
+        'value': type === 'close_interest_card_click' ? 'closeInterestCard' : 'selectInterestCard',
+        'duration': 0,
+        'action': 'detailPageShow',
+        'shareChannel': '',
+        'contentName': '兴趣选项卡',
+        'contentType': this.compDTO.objectType || '',
+        'contentId': this.compDTO.objectId,
+        // 'channelSourceId': this.compDTO.channelId,
+        // 'contentShowChannelId': this.compDTO.channelId,
+        'regionName': 2, // 信息流：2
+        'componentType': this.compDTO.compStyle,
+        'sceneId': contentDTO.sceneId,
+        'subSceneId': contentDTO.subSceneId,
+        'cnsTraceId': contentDTO.cnsTraceId,
+        'cardItemId': this.compDTO.cardItemId,
+        'itemId': this.compDTO.itemId || contentDTO.itemId,
+        'expIds': this.compDTO.expIds || contentDTO.expIds,
+      }
+      if (type === 'interest_card_selecting_click') {
+        // extParams['interestOptions'] = this.operDataList.map(item => {
+        //   return item.
+        // })
+      }
+      let params = TrackingUtils.generateParams(extParams);
+      params['pageId'] = this.pageId;
+      params['pageName'] = this.pageName;
+      TrackingUtils.fillPositionWith(params)
+      Tracking.event(type, params)
+    } catch (e) {
+      console.log('Zh_Single_Column-09', JSON.stringify(e))
+    }
+  }
+
   getItemWidth(index: number) {
   getItemWidth(index: number) {
     if (index % 4 === 0 || index % 4 === 3) {
     if (index % 4 === 0 || index % 4 === 3) {
       return 80
       return 80
@@ -73,6 +114,7 @@ export struct ZhSingleColumn09 {
           .margin({top: -10})
           .margin({top: -10})
           .padding({top: 0, bottom: 0, left: 0, right: 0})
           .padding({top: 0, bottom: 0, left: 0, right: 0})
           .onClick(() => {
           .onClick(() => {
+            this.trackClick('interest_card_selecting_click')
             if (this.activeIndexs.length > 0) {
             if (this.activeIndexs.length > 0) {
               this.selfClosed = true;
               this.selfClosed = true;
             }
             }
@@ -142,6 +184,7 @@ export struct ZhSingleColumn09 {
           .width(14)
           .width(14)
           .height(14)
           .height(14)
           .onClick(() => {
           .onClick(() => {
+            this.trackClick('close_interest_card_click')
             this.selfClosed = true;
             this.selfClosed = true;
           })
           })
       }
       }

@@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick'
 
 
 /**
 /**
  * 小视频横划卡
  * 小视频横划卡
@@ -15,6 +16,8 @@ const TAG = 'Zh_Single_Row-02'
 
 
 @Component
 @Component
 export struct ZhSingleRow02 {
 export struct ZhSingleRow02 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
 
 
   build() {
   build() {
@@ -26,7 +29,11 @@ export struct ZhSingleRow02 {
         List() {
         List() {
           ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
           ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
             CreatorItem({
             CreatorItem({
-              item
+              item,
+              index,
+              compDTO: this.compDTO,
+              pageId: this.pageId,
+              pageName: this.pageName
             })
             })
               .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0})
               .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0})
           })
           })
@@ -69,11 +76,6 @@ export struct ZhSingleRow02 {
         Image($r("app.media.more"))
         Image($r("app.media.more"))
           .width(14)
           .width(14)
           .height(14)
           .height(14)
-          .onClick(() => {
-            // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
-            let params = {'index': "1"} as Record<string, string>
-            WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
-          })
       }
       }
       .padding({
       .padding({
         right: $r('app.float.card_comp_pagePadding_lf'),
         right: $r('app.float.card_comp_pagePadding_lf'),
@@ -103,7 +105,11 @@ function textOverflowStyle(maxLine: number) {
 
 
 @Component
 @Component
 struct CreatorItem {
 struct CreatorItem {
+  @Prop pageId: string = '';
+  @Prop pageName: string = '';
+  @Prop compDTO: CompDTO
   @Prop item: ContentDTO
   @Prop item: ContentDTO
+  @Prop index: number
   @State rmhIsAttention: number = 0
   @State rmhIsAttention: number = 0
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
 
 
@@ -143,6 +149,7 @@ struct CreatorItem {
       .borderRadius($r('app.float.image_border_radius'))
       .borderRadius($r('app.float.image_border_radius'))
     }
     }
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
+      InfomationCardClick.track(this.compDTO, this.item, this.pageId, this.pageName)
       ProcessUtils.processPage(this.item)
       ProcessUtils.processPage(this.item)
     })
     })
   }
   }

@@ -9,6 +9,7 @@ import { LiveModel } from '../../viewmodel/LiveModel'
 import { Logger, ToastUtils } from 'wdKit';
 import { Logger, ToastUtils } from 'wdKit';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 /**
 /**
  * 直播预约卡
  * 直播预约卡
@@ -25,6 +26,8 @@ interface reserveReqItem {
 @Entry
 @Entry
 @Component
 @Component
 export struct ZhSingleRow03 {
 export struct ZhSingleRow03 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State isEndEdge: boolean = false;
   @State isEndEdge: boolean = false;
   // @State reserveStatus: reserveItem[] = []
   // @State reserveStatus: reserveItem[] = []
@@ -197,6 +200,7 @@ export struct ZhSingleRow03 {
     .backgroundColor(0xf9f9f9)
     .backgroundColor(0xf9f9f9)
     .margin({right: 8})
     .margin({right: 8})
     .onClick(() => {
     .onClick(() => {
+      InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
       ProcessUtils.processPage(item)
       ProcessUtils.processPage(item)
     })
     })
   }
   }

@@ -2,6 +2,7 @@ import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 /**
 /**
  * 本地精选卡
  * 本地精选卡
@@ -10,6 +11,8 @@ import { ProcessUtils } from 'wdRouter';
 
 
 @Component
 @Component
 export struct ZhSingleRow04 {
 export struct ZhSingleRow04 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
 
 
   build() {
   build() {
@@ -71,6 +74,7 @@ export struct ZhSingleRow04 {
                 top: 6
                 top: 6
               })
               })
               .onClick(() => {
               .onClick(() => {
+                InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
                 ProcessUtils.processPage(item)
                 ProcessUtils.processPage(item)
               })
               })
           }
           }

@@ -4,6 +4,7 @@ import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 /**
 /**
  * 人民号横划卡
  * 人民号横划卡
@@ -14,6 +15,8 @@ const TAG = 'Zh_Single_Row-05'
 @Entry
 @Entry
 @Component
 @Component
 export struct ZhSingleRow05 {
 export struct ZhSingleRow05 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {
   @State compDTO: CompDTO = {
     // objectTitle: '创作者推荐',
     // objectTitle: '创作者推荐',
     // operDataList: [
     // operDataList: [
@@ -83,8 +86,8 @@ export struct ZhSingleRow05 {
           .height(14)
           .height(14)
           .onClick(() => {
           .onClick(() => {
             // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
             // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
-            let params = {'index': "1"} as Record<string, string>;
-            WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
+            // let params = {'index': "1"} as Record<string, string>;
+            // WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
           })
           })
       }
       }
       .padding({
       .padding({

@@ -10,6 +10,7 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV
 import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
 import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
 import { commentItemModel } from '../../components/comment/model/CommentModel'
 import { commentItemModel } from '../../components/comment/model/CommentModel'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 /**
 /**
  * 精选评论卡
  * 精选评论卡
@@ -19,6 +20,8 @@ const TAG = 'Zh_Single_Row-06'
 @Entry
 @Entry
 @Component
 @Component
 export struct ZhSingleRow06 {
 export struct ZhSingleRow06 {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State newsStatusOfUser: batchLikeAndCollectResult = {
   @State newsStatusOfUser: batchLikeAndCollectResult = {
     likeStatus: '0'
     likeStatus: '0'
@@ -143,8 +146,6 @@ export struct ZhSingleRow06 {
           Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞')
           Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞')
             .fontSize(15)
             .fontSize(15)
             .fontColor(0x999999)
             .fontColor(0x999999)
-            .onClick(() => {
-            })
         }
         }
         .onClick(() => {
         .onClick(() => {
           this.toggleLikeStatus()
           this.toggleLikeStatus()
@@ -160,6 +161,9 @@ export struct ZhSingleRow06 {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .backgroundColor($r('app.color.white'))
     .backgroundColor($r('app.color.white'))
+    .onClick(() => {
+      InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
+    })
   }
   }
 
 
   @Builder
   @Builder

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import { WDRouterRule, WDRouterPage, ProcessUtils } from 'wdRouter'
 import { WDRouterRule, WDRouterPage, ProcessUtils } from 'wdRouter'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
-import { ToastUtils } from 'wdKit/Index';
 import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 
 
 @Component
 @Component

+import { TrackConstants, TrackingButton } from 'wdTracking/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { onlyWifiLoadImg } from '../../../utils/lazyloadImg'
 import { onlyWifiLoadImg } from '../../../utils/lazyloadImg'
 import { AppointmentOperationRequestItem } from '../../../viewmodel/AppointmentOperationRequestItem'
 import { AppointmentOperationRequestItem } from '../../../viewmodel/AppointmentOperationRequestItem'
@@ -38,25 +39,32 @@ export struct AppointmentListChildComponent {
           .interpolation(ImageInterpolation.High)
           .interpolation(ImageInterpolation.High)
 
 
 
 
-        if (this.item.relType === 1) {
+        if (this.item.status == "wait") {
           Row() {
           Row() {
             Row() {
             Row() {
               Image($r('app.media.reserve_icon'))
               Image($r('app.media.reserve_icon'))
-                .width('42lpx')
-                .height('35lpx')
+                .width('27lpx')
+                .height('27lpx')
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
                 .interpolation(ImageInterpolation.High)
                 .interpolation(ImageInterpolation.High)
+                .margin({right:"6lpx"})
 
 
               Text("预约")
               Text("预约")
                 .fontWeight(400)
                 .fontWeight(400)
-                .fontSize('21lpx')
-                .backgroundColor($r('app.color.color_4D000000'))
+                .fontSize('23lpx')
+                .textShadow({
+                  radius: 2,
+                  color: `rgba(0,0,0,0.3)`,
+                  offsetY:2,
+                  offsetX:0
+                })
                 .fontColor($r('app.color.white'))
                 .fontColor($r('app.color.white'))
                 .lineHeight('31lpx')
                 .lineHeight('31lpx')
                 .layoutWeight(1)
                 .layoutWeight(1)
-                .textAlign(TextAlign.Center)
+                .textAlign(TextAlign.Start)
             }.width('94lpx')
             }.width('94lpx')
             .margin({ bottom: '15lpx', right: '15lpx' })
             .margin({ bottom: '15lpx', right: '15lpx' })
+            .alignItems(VerticalAlign.Center)
           }.width('100%')
           }.width('100%')
           .height('100%')
           .height('100%')
           .alignItems(VerticalAlign.Bottom)
           .alignItems(VerticalAlign.Bottom)
@@ -78,7 +86,7 @@ export struct AppointmentListChildComponent {
           .width('100%')
           .width('100%')
         Row() {
         Row() {
           Row() {
           Row() {
-            if (this.item.relType === 2) {
+            if (this.item.status == "end") {
               Image($r('app.media.play_status_history_icon'))
               Image($r('app.media.play_status_history_icon'))
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
                 .interpolation(ImageInterpolation.High)
                 .interpolation(ImageInterpolation.High)
@@ -88,6 +96,16 @@ export struct AppointmentListChildComponent {
               Text('已结束').fontColor($r('app.color.color_999999'))
               Text('已结束').fontColor($r('app.color.color_999999'))
                 .fontWeight('500lpx')
                 .fontWeight('500lpx')
                 .fontSize('23lpx')
                 .fontSize('23lpx')
+            }else if(this.item.status == "running"){
+              Image($r('app.media.play_status_icon'))
+                .objectFit(ImageFit.Auto)
+                .interpolation(ImageInterpolation.High)
+                .width('38lpx')
+                .height('38lpx')
+                .margin({ right: '12lpx' })
+              Text('已开始').fontColor($r('app.color.color_999999'))
+                .fontWeight('500lpx')
+                .fontSize('23lpx')
             } else {
             } else {
               Image($r('app.media.play_status_icon'))
               Image($r('app.media.play_status_icon'))
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
@@ -118,7 +136,7 @@ export struct AppointmentListChildComponent {
 
 
           Blank()
           Blank()
             .layoutWeight(1)
             .layoutWeight(1)
-          if (this.item.relType === 1) {
+          if (this.item.status === "wait") {
             Text(this.item.isAppointment ? "已预约" : "预约")
             Text(this.item.isAppointment ? "已预约" : "预约")
               .fontWeight(400)
               .fontWeight(400)
               .fontSize('23lpx')
               .fontSize('23lpx')
@@ -132,8 +150,19 @@ export struct AppointmentListChildComponent {
               .onClick(() => {
               .onClick(() => {
                 this.dialogController.open()
                 this.dialogController.open()
               })
               })
+          }else if(this.item.status == "running"){
+            Text("去观看" )
+              .fontWeight(400)
+              .fontSize('23lpx')
+              .backgroundColor($r('app.color.color_ED2800'))
+              .fontColor($r('app.color.white'))
+              .lineHeight('31lpx')
+              .textAlign(TextAlign.Center)
+              .width('100lpx')
+              .height('46lpx')
+              .borderRadius('6lpx')
           } else {
           } else {
-            Text(this.item.relType === 2 ? "去观看" : "看回放")
+            Text("看回放")
               .fontWeight(400)
               .fontWeight(400)
               .fontSize('23lpx')
               .fontSize('23lpx')
               .backgroundColor($r('app.color.color_ED2800'))
               .backgroundColor($r('app.color.color_ED2800'))
@@ -172,6 +201,10 @@ export struct AppointmentListChildComponent {
       if (value != null) {
       if (value != null) {
         if (value.code === 0 || value.code.toString() === "0") {
         if (value.code === 0 || value.code.toString() === "0") {
           this.item.isAppointment = !this.item.isAppointment
           this.item.isAppointment = !this.item.isAppointment
+
+          if(!this.item.isAppointment){
+            TrackingButton.click("mySavedLivePageUnSubscribe",TrackConstants.PageName.My_Saved_Live,TrackConstants.PageName.My_Saved_Live)
+          }
         }
         }
       }
       }
     })
     })

@@ -7,17 +7,20 @@ import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { Action } from 'wdBean/Index';
 import { Action } from 'wdBean/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 
 
 const TAG = "AppointmentListUI"
 const TAG = "AppointmentListUI"
 
 
 @Component
 @Component
 export struct AppointmentListUI {
 export struct AppointmentListUI {
   @State data: LazyDataSource<MineAppointmentItem> = new LazyDataSource();
   @State data: LazyDataSource<MineAppointmentItem> = new LazyDataSource();
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State count: number = 0;
   @State count: number = 0;
   @State isLoading: boolean = false
   @State isLoading: boolean = false
   @State hasMore: boolean = true
   @State hasMore: boolean = true
   curPageNum: number = 1;
   curPageNum: number = 1;
   @State isGetRequest: boolean = false
   @State isGetRequest: boolean = false
+  private scroller: Scroller = new Scroller();
 
 
   aboutToAppear() {
   aboutToAppear() {
     this.getNewPageData()
     this.getNewPageData()
@@ -26,7 +29,7 @@ export struct AppointmentListUI {
   build() {
   build() {
     Column() {
     Column() {
       //标题栏目
       //标题栏目
-      CustomTitleUI({ titleName: "预约列表" })
+      CustomTitleUI({ titleName: "我的预约" })
       if (this.count == 0) {
       if (this.count == 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {
           EmptyComponent({ emptyType: 10 })
           EmptyComponent({ emptyType: 10 })
@@ -35,9 +38,40 @@ export struct AppointmentListUI {
         }
         }
 
 
       } else {
       } else {
-        //刷新控件 TODO
-        //List
-        List({ space: '6lpx' }) {
+
+        CustomPullToRefresh({
+          alldata:this.data,
+          scroller:this.scroller,
+          customList:()=>{
+            this.ListLayout()
+          },
+          onRefresh:(resolve)=>{
+            this.curPageNum = 1;
+            this.hasMore = true
+            this.isGetRequest = false
+            this.data.clear()
+
+            if (!this.isLoading){
+              this.getNewPageData()
+              if(resolve) resolve('刷新成功')
+            }
+          },
+          onLoadMore:(resolve)=> {
+            if (!this.isLoading) {
+              this.isLoading = true
+              this.getNewPageData()
+            }
+          }
+        })
+      }
+    }
+    .backgroundColor($r('app.color.color_F9F9F9'))
+    .height('100%')
+    .width('100%')
+  }
+
+  @Builder ListLayout(){
+    List({ space:6,scroller: this.scroller }) {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
       LazyForEach(this.data, (item: MineAppointmentItem, index: number) => {
         ListItem() {
         ListItem() {
           AppointmentListChildComponent({ item: item })
           AppointmentListChildComponent({ item: item })
@@ -62,25 +96,14 @@ export struct AppointmentListUI {
       if (!this.hasMore) {
       if (!this.hasMore) {
         ListItem() {
         ListItem() {
           ListHasNoMoreDataUI()
           ListHasNoMoreDataUI()
-            }
+        }.padding({bottom:px2vp(this.bottomSafeHeight) + 20})
       }
       }
     }
     }
     .cachedCount(4)
     .cachedCount(4)
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
-        .margin({ top: '23lpx', left: '23lpx', right: '23lpx' })
+    .edgeEffect(EdgeEffect.None)
+    .margin({ top: '23lpx', left: '23lpx', right: '23lpx'})
     .layoutWeight(1)
     .layoutWeight(1)
-        .onReachEnd(() => {
-          console.log(TAG, "触底了");
-          if (!this.isLoading) {
-            //加载分页数据
-            this.getNewPageData()
-          }
-        })
-      }
-    }
-    .backgroundColor($r('app.color.color_F9F9F9'))
-    .height('100%')
-    .width('100%')
   }
   }
 
 
   getNewPageData() {
   getNewPageData() {

@@ -2,6 +2,7 @@ import { SpConstants } from 'wdConstant/Index'
 import { SPHelper, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
 import { SPHelper, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
 import { HttpUtils } from 'wdNetwork/Index'
 import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
+import { TrackConstants, TrackingContent } from 'wdTracking/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem'
 import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem'
@@ -266,6 +267,12 @@ export struct FollowChildComponent{
             this.data.status = this.data.status ==="0"?"1":"0"
             this.data.status = this.data.status ==="0"?"1":"0"
 
 
             UserDataLocal.setUserFollowOperation(this.data.creatorId+","+this.data.status)
             UserDataLocal.setUserFollowOperation(this.data.creatorId+","+this.data.status)
+
+            if(this.data.status == "1"){//关注
+              TrackingContent.follow(true,this.data.cnUserName,this.data.cnUserId,TrackConstants.PageName.My_Follow,TrackConstants.PageName.My_Follow)
+            }else {//取消关注
+              TrackingContent.follow(false,this.data.cnUserName,this.data.cnUserId,TrackConstants.PageName.My_Follow,TrackConstants.PageName.My_Follow)
+            }
           }
           }
         }
         }
       })
       })

 import { EmitterUtils, EmitterEventId, Logger, NetworkUtil } from 'wdKit/Index'
 import { EmitterUtils, EmitterEventId, Logger, NetworkUtil } from 'wdKit/Index'
+import { ParamType, TrackConstants, Tracking } from 'wdTracking/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { FollowListItem } from '../../../viewmodel/FollowListItem'
 import { FollowListItem } from '../../../viewmodel/FollowListItem'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
@@ -70,6 +71,7 @@ export struct FollowFirstTabsComponent{
     }.onClick(()=>{
     }.onClick(()=>{
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
+      trackTabFirstClick(item.directoryName)
     })
     })
     .height('100%')
     .height('100%')
     .margin({right:'9lpx'})
     .margin({right:'9lpx'})
@@ -103,6 +105,7 @@ export struct FollowFirstTabsComponent{
         .animationDuration(0)
         .animationDuration(0)
         .onChange((index: number) => {
         .onChange((index: number) => {
           this.currentIndex = index
           this.currentIndex = index
+          trackTabFirstClick(this.data[index].directoryName)
         })
         })
         .width('100%')
         .width('100%')
         .layoutWeight(1)
         .layoutWeight(1)
@@ -118,3 +121,12 @@ export struct FollowFirstTabsComponent{
     }
     }
   }
   }
 }
 }
+
+  function trackTabFirstClick(firstLevelTabName: string){
+    let params: ParamType = {}
+    params["firstLevelTabName"] = firstLevelTabName
+    params["pageName"] = TrackConstants.PageName.My_Follow
+    params["pageId"] = TrackConstants.PageName.My_Follow
+
+    Tracking.event("my_follow_page_tab_click", params)
+  }

@@ -411,7 +411,9 @@ export struct PaperSingleColumn999CardView {
       result = `${minutes}分钟前`;
       result = `${minutes}分钟前`;
     } else if (hours < 24) {
     } else if (hours < 24) {
       result = `${hours}小时前`;
       result = `${hours}小时前`;
-    } else {
+    } else if(hours > 24 && hours <48){
+      result = '1天前';
+    }else {
       result = '';
       result = '';
     }
     }
 
 
@@ -483,11 +485,15 @@ export struct PaperSingleColumn999CardView {
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .fontColor('#B0B0B0')
                 .margin({ left: 16 })
                 .margin({ left: 16 })
+
+              ///不显示时间或者不显示评论
+              if (this.getPublishTime().length > 0 || this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
                 Image($r('app.media.point'))
                 Image($r('app.media.point'))
                   .width(16)
                   .width(16)
                   .height(16)
                   .height(16)
                   .margin({ top: 10, bottom: 10 })
                   .margin({ top: 10, bottom: 10 })
               }
               }
+            }
 
 
             Text(this.getPublishTime())
             Text(this.getPublishTime())
               .fontSize(12)
               .fontSize(12)
@@ -497,7 +503,7 @@ export struct PaperSingleColumn999CardView {
               Text(this.interactData.commentNum + "评")
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .fontColor('#B0B0B0')
-                .margin({ left: 6 })
+                .margin({ left: this.getPublishTime().length >0? 6:0 })
             }
             }
           }
           }
           .justifyContent(FlexAlign.Start)
           .justifyContent(FlexAlign.Start)

@@ -265,19 +265,24 @@ struct LiveMorePage {
         .fontSize('12vp')
         .fontSize('12vp')
         .fontWeight(400)
         .fontWeight(400)
         .fontColor(Color.White)
         .fontColor(Color.White)
+        .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
         .margin({
         .margin({
           right: '5vp'
           right: '5vp'
         })
         })
-      Divider()
-        .vertical(true)
-        .strokeWidth(1)
-        .height('12vp')
-        .margin({ top: 2, bottom: 2 })
-        .color(Color.White)
+      // Divider()
+      //   .vertical(true)
+      //   .strokeWidth(1)
+      //   .height('12vp')
+      //   .margin({ top: 2, bottom: 2 })
+      //   .color(Color.White)
+
+      Image($r('app.media.icon_comp_line_live')).height('11vp').width('1.5vp')
+
       if (this.getLiveRoomNumber(item).length > 0) {
       if (this.getLiveRoomNumber(item).length > 0) {
         Text(this.getLiveRoomNumber(item))
         Text(this.getLiveRoomNumber(item))
           .fontSize('12vp')
           .fontSize('12vp')
           .fontWeight(400)
           .fontWeight(400)
+          .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
           .fontColor(Color.White)
           .fontColor(Color.White)
           .margin({
           .margin({
             left: '5vp'
             left: '5vp'

@@ -2,7 +2,7 @@ import { CommonConstants, ViewType } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
-import { autoRefresh, listTouchEvent } from '../../utils/PullDownRefresh';
+import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
 import LoadMoreLayout from './LoadMoreLayout';
 import LoadMoreLayout from './LoadMoreLayout';
 import { CompParser } from '../CompParser';
 import { CompParser } from '../CompParser';
 import { CompDTO } from 'wdBean';
 import { CompDTO } from 'wdBean';
@@ -14,9 +14,6 @@ import PageNoMoreLayout from './PageNoMoreLayout';
 import { NoMoreBean } from './NoMoreBean';
 import { NoMoreBean } from './NoMoreBean';
 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
 import RefreshLayout from '../refresh/RefreshLayout';
 import RefreshLayout from '../refresh/RefreshLayout';
-import json from '@ohos.util.json';
-import { viewBlogInsightIntentShare, ActionMode } from '../../utils/InsightIntentShare'
-import { common } from '@kit.AbilityKit';
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
 @Component
 @Component
@@ -31,6 +28,7 @@ export struct PageComponent {
   // 自动刷新通知
   // 自动刷新通知
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   private listScroller: Scroller = new Scroller();
   private listScroller: Scroller = new Scroller();
+  private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
   needload: boolean = true;
   needload: boolean = true;
   build() {
   build() {
     Column() {
     Column() {
@@ -51,13 +49,26 @@ export struct PageComponent {
     }
     }
     .width(CommonConstants.FULL_PARENT)
     .width(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
-    .onTouch((event: TouchEvent | undefined) => {
-      if (event) {
-        if (this.pageModel.viewType === ViewType.LOADED) {
-          listTouchEvent(this.pageModel, this.pageAdvModel, event);
-        }
-      }
+    // .onTouch((event: TouchEvent | undefined) => {
+    //   if (event) {
+    //     if (this.pageModel.viewType === ViewType.LOADED) {
+    //       listTouchEvent(this.pageModel, this.pageAdvModel, event);
+    //     }
+    //   }
+    // })
+    // 对接新的下拉刷新手势，替换touch事件
+    .parallelGesture(
+      PanGesture(this.panOption)
+        .onActionStart((event?: GestureEvent) => {
+          onActionStart(this.pageModel, this.pageAdvModel, event)
+        })
+        .onActionUpdate((event?: GestureEvent) => {
+          onActionUpdate(this.pageModel, this.pageAdvModel, event)
+        })
+        .onActionEnd(() => {
+          onActionEnd(this.pageModel, this.pageAdvModel)
         })
         })
+    )
 
 
   }
   }
 
 

@@ -460,9 +460,19 @@ export struct TopNavigationComponent {
   }
   }
 
 
   /**
   /**
+   * 判断是否当前页面处理逻辑，如消息通知，只需要切换到当前底导的处理，过滤掉非当前。
+   */
+  private isCurrentPage(): boolean {
+    return this._currentNavIndex === this.navIndex
+  }
+
+  /**
    * 频道id变化，即指定频道跳转场景
    * 频道id变化，即指定频道跳转场景
    */
    */
   onAssignChannelChange() {
   onAssignChannelChange() {
+    if (!this.isCurrentPage()) {
+      return
+    }
     let channelId = this.assignChannel.channelId
     let channelId = this.assignChannel.channelId
     let index = -1
     let index = -1
     if (this._currentNavIndex === 0) {
     if (this._currentNavIndex === 0) {
@@ -536,45 +546,45 @@ export struct TopNavigationComponent {
     return null
     return null
   }
   }
 
 
-  private getTextInfo(index: number): Record<string, number> {
-    let strJson = getInspectorByKey(index.toString())
-    try {
-      let obj: Record<string, string> = JSON.parse(strJson)
-      let rectInfo: number[][] = JSON.parse('[' + obj.$rect + ']')
-      return { 'left': px2vp(rectInfo[0][0]), 'width': px2vp(rectInfo[1][0] - rectInfo[0][0]) }
-    } catch (error) {
-      return { 'left': 0, 'width': 0 }
-    }
-  }
-
-  private getCurrentIndicatorInfo(index: number, event: TabsAnimationEvent): Record<string, number> {
-    let nextIndex = index
-    if (index > 0 && event.currentOffset > 0) {
-      nextIndex--
-    } else if (index < 3 && event.currentOffset < 0) {
-      nextIndex++
-    }
-    let indexInfo = this.getTextInfo(index)
-    let nextIndexInfo = this.getTextInfo(nextIndex)
-    let swipeRatio = Math.abs(event.currentOffset / this.tabsWidth)
-    let currentIndex = swipeRatio > 0.5 ? nextIndex : index // 页面滑动超过一半，tabBar切换到下一页。
-    let currentLeft = indexInfo.left + (nextIndexInfo.left - indexInfo.left) * swipeRatio
-    let currentWidth = indexInfo.width + (nextIndexInfo.width - indexInfo.width) * swipeRatio
-    return { 'index': currentIndex, 'left': currentLeft, 'width': currentWidth }
-  }
-
-  private startAnimateTo(duration: number, leftMargin: number, width: number) {
-    animateTo({
-      duration: duration, // 动画时长
-      curve: Curve.Linear, // 动画曲线
-      iterations: 1, // 播放次数
-      playMode: PlayMode.Normal, // 动画模式
-      onFinish: () => {
-        console.info('play end')
-      }
-    }, () => {
-      this.indicatorLeftMargin = leftMargin
-      this.indicatorWidth = width
-    })
-  }
+  // private getTextInfo(index: number): Record<string, number> {
+  //   let strJson = getInspectorByKey(index.toString())
+  //   try {
+  //     let obj: Record<string, string> = JSON.parse(strJson)
+  //     let rectInfo: number[][] = JSON.parse('[' + obj.$rect + ']')
+  //     return { 'left': px2vp(rectInfo[0][0]), 'width': px2vp(rectInfo[1][0] - rectInfo[0][0]) }
+  //   } catch (error) {
+  //     return { 'left': 0, 'width': 0 }
+  //   }
+  // }
+  //
+  // private getCurrentIndicatorInfo(index: number, event: TabsAnimationEvent): Record<string, number> {
+  //   let nextIndex = index
+  //   if (index > 0 && event.currentOffset > 0) {
+  //     nextIndex--
+  //   } else if (index < 3 && event.currentOffset < 0) {
+  //     nextIndex++
+  //   }
+  //   let indexInfo = this.getTextInfo(index)
+  //   let nextIndexInfo = this.getTextInfo(nextIndex)
+  //   let swipeRatio = Math.abs(event.currentOffset / this.tabsWidth)
+  //   let currentIndex = swipeRatio > 0.5 ? nextIndex : index // 页面滑动超过一半，tabBar切换到下一页。
+  //   let currentLeft = indexInfo.left + (nextIndexInfo.left - indexInfo.left) * swipeRatio
+  //   let currentWidth = indexInfo.width + (nextIndexInfo.width - indexInfo.width) * swipeRatio
+  //   return { 'index': currentIndex, 'left': currentLeft, 'width': currentWidth }
+  // }
+
+  // private startAnimateTo(duration: number, leftMargin: number, width: number) {
+  //   animateTo({
+  //     duration: duration, // 动画时长
+  //     curve: Curve.Linear, // 动画曲线
+  //     iterations: 1, // 播放次数
+  //     playMode: PlayMode.Normal, // 动画模式
+  //     onFinish: () => {
+  //       console.info('play end')
+  //     }
+  //   }, () => {
+  //     this.indicatorLeftMargin = leftMargin
+  //     this.indicatorWidth = width
+  //   })
+  // }
 }
 }

@@ -72,6 +72,7 @@ export struct TopNavigationComponentNew {
   private tabsWidth: number = 0
   private tabsWidth: number = 0
 
 
   build() {
   build() {
+    Column() {
       // 频道分类list
       // 频道分类list
       RelativeContainer() {
       RelativeContainer() {
         this.tabBar()
         this.tabBar()
@@ -135,6 +136,7 @@ export struct TopNavigationComponentNew {
       .width('100%')
       .width('100%')
       .height('100%')
       .height('100%')
     }
     }
+  }
 
 
   @Builder
   @Builder
   topBar() {
   topBar() {
@@ -316,7 +318,7 @@ export struct TopNavigationComponentNew {
       bottom: 2,
       bottom: 2,
     })
     })
     .id(`col_tabBar${index}`)
     .id(`col_tabBar${index}`)
-    .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
+    // .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
     .onClick(() => {
     .onClick(() => {
       Logger.debug(TAG, `onClick, index: ${index}`);
       Logger.debug(TAG, `onClick, index: ${index}`);
       if (this.currentTopNavSelectedIndex === index) {
       if (this.currentTopNavSelectedIndex === index) {
@@ -487,9 +489,19 @@ export struct TopNavigationComponentNew {
   }
   }
 
 
   /**
   /**
+   * 判断是否当前页面处理逻辑，如消息通知，只需要切换到当前底导的处理，过滤掉非当前。
+   */
+  private isCurrentPage(): boolean {
+    return this._currentNavIndex === this.bottomNavIndex
+  }
+
+  /**
    * 频道id变化，即指定频道跳转场景
    * 频道id变化，即指定频道跳转场景
    */
    */
   onAssignChannelChange() {
   onAssignChannelChange() {
+    if (!this.isCurrentPage()) {
+      return
+    }
     let channelId = this.assignChannel.channelId
     let channelId = this.assignChannel.channelId
     let index = -1
     let index = -1
     if (this._currentNavIndex === 0) {
     if (this._currentNavIndex === 0) {
@@ -537,7 +549,7 @@ export struct TopNavigationComponentNew {
   private getChannelByMine(channelId: string) {
   private getChannelByMine(channelId: string) {
     for (let i = 0; i < this.myChannelList.length; i++) {
     for (let i = 0; i < this.myChannelList.length; i++) {
       let topNavDTO: TopNavDTO = this.myChannelList[i]
       let topNavDTO: TopNavDTO = this.myChannelList[i]
-      if (topNavDTO.channelId?.toString() === channelId) {
+      if (topNavDTO?.channelId?.toString() === channelId) {
         return i
         return i
       }
       }
     }
     }

@@ -26,7 +26,6 @@ export struct CustomTitleUI {
       }
       }
 
 
       Text(this.titleName)
       Text(this.titleName)
-        .height('42lpx')
         .maxLines(1)
         .maxLines(1)
         .id("title")
         .id("title")
         .fontSize('35lpx')
         .fontSize('35lpx')

 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { ContentDTO, CompDTO, Action, Params } from 'wdBean'
 import { ContentDTO, CompDTO, Action, Params } from 'wdBean'
 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter';
 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -76,6 +79,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
           // .offset({x:16})
           // .offset({x:16})
           .onClick(() => {
           .onClick(() => {
+            InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
             ProcessUtils.processPage(item)
             ProcessUtils.processPage(item)
           })
           })
         })
         })

@@ -3,9 +3,12 @@ import { WDRouterRule } from 'wdRouter/Index'
 import { Logger } from 'wdKit/Index'
 import { Logger } from 'wdKit/Index'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { LiveModel } from '../../viewmodel/LiveModel'
 import { LiveModel } from '../../viewmodel/LiveModel'
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State clicked: boolean = false;
   @State clicked: boolean = false;
 
 
@@ -64,6 +67,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
     .margin({ bottom: 8 })
     .margin({ bottom: 8 })
     .onClick(() => {
     .onClick(() => {
+      InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
       this.clicked = true;
       this.clicked = true;
       this.gotoLive(this.compDTO?.operDataList[0])
       this.gotoLive(this.compDTO?.operDataList[0])
     })
     })

@@ -9,10 +9,13 @@ import { LiveModel } from '../../viewmodel/LiveModel'
 import { ContentConstants } from '../../constants/ContentConstants'
 import { ContentConstants } from '../../constants/ContentConstants'
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { InfomationCardClick } from '../../utils/infomationCardClick';
 
 
 
 
 @Component
 @Component
 export struct LiveHorizontalCardComponent {
 export struct LiveHorizontalCardComponent {
+  @State pageId: string = '';
+  @State pageName: string = '';
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
 
 
@@ -78,6 +81,7 @@ export struct LiveHorizontalCardComponent {
                     .borderRadius(4)
                     .borderRadius(4)
                     .objectFit(ImageFit.Cover)
                     .objectFit(ImageFit.Cover)
                   CardMediaInfo({
                   CardMediaInfo({
+                    livePeopleNum:false,
                     contentDTO: item
                     contentDTO: item
                   })
                   })
                 }
                 }
@@ -95,6 +99,7 @@ export struct LiveHorizontalCardComponent {
             }
             }
             .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
             .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
             .onClick(() => {
             .onClick(() => {
+              InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
               if (item.objectType != '0') {
               if (item.objectType != '0') {
                 console.log(item.objectId)
                 console.log(item.objectId)
                 this.gotoLive(item)
                 this.gotoLive(item)

@@ -15,7 +15,7 @@ export struct LiveHorizontalCardForOneComponent {
           .borderRadius(4)
           .borderRadius(4)
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
         CardMediaInfo({
         CardMediaInfo({
-          contentDTO: this.contentDTO
+          contentDTO: this.contentDTO, livePeopleNum:false,
         })
         })
       }
       }
 
 

@@ -57,7 +57,7 @@ export struct LiveHorizontalReservationComponent {
                     .borderRadius(4)
                     .borderRadius(4)
                     .objectFit(ImageFit.Cover)
                     .objectFit(ImageFit.Cover)
                   CardMediaInfo({
                   CardMediaInfo({
-                    contentDTO: item
+                    contentDTO: item, livePeopleNum:false,
                   })
                   })
                 }
                 }
 
 

@@ -50,6 +50,10 @@ export struct OperRowListView {
   }
   }
   private onCommentIconClick: () => void = () => {
   private onCommentIconClick: () => void = () => {
   }
   }
+
+  @Provide inDialog: boolean = false
+  private dialogBeforeJumpOtherPageAction: () => void = () => {}
+
   @Prop @Watch('onDetailUpdated') contentDetailData: ContentDetailDTO // 稿件详情
   @Prop @Watch('onDetailUpdated') contentDetailData: ContentDetailDTO // 稿件详情
   /**
   /**
    * 组件样式类型，根据详情页类型传值，组件内部根据样式展现类型做判断
    * 组件样式类型，根据详情页类型传值，组件内部根据样式展现类型做判断
@@ -88,8 +92,7 @@ export struct OperRowListView {
   @State dialogController: CustomDialogController | null = null;
   @State dialogController: CustomDialogController | null = null;
 
 
   async aboutToAppear() {
   async aboutToAppear() {
-    console.info(TAG, '22222----', this.styleType)
-    console.info(TAG, '3333----', this.needLike)
+    console.info(TAG, 'this.needLike', this.needLike)
     this.handleStyle()
     this.handleStyle()
     this.onDetailUpdated()
     this.onDetailUpdated()
     EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => {
     EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => {
@@ -108,7 +111,7 @@ export struct OperRowListView {
   }
   }
 
 
   async onDetailUpdated() {
   async onDetailUpdated() {
-    console.info(TAG, '111111----', this.styleType)
+    console.info(TAG, 'this.styleType', this.styleType)
     this.handleStyle()
     this.handleStyle()
     if (!this.contentDetailData) {
     if (!this.contentDetailData) {
       return
       return
@@ -199,7 +202,7 @@ export struct OperRowListView {
       .padding({
       .padding({
         top: 10,
         top: 10,
         // bottom: 10
         // bottom: 10
-        bottom: `${this.bottomSafeHeight}px`
+        bottom: px2vp(this.bottomSafeHeight)
         // bottom: 50
         // bottom: 50
       })
       })
     }
     }
@@ -234,9 +237,10 @@ export struct OperRowListView {
       left: 16
       left: 16
     })
     })
 
 
-    if (this.showCommentIcon) {
+    if (this.showCommentIcon  // 页面控制开关，直播传false
+      && this.contentDetailData.openComment == 1  // 内容开关
+      && this.publishCommentModel?.targetId) {
       Column() {
       Column() {
-        if (this.publishCommentModel?.targetId) {
         CommentIconComponent({
         CommentIconComponent({
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
           styleType: this.styleType,
           styleType: this.styleType,
@@ -251,7 +255,6 @@ export struct OperRowListView {
             !this.showBackIcon && this.dialogController?.open()
             !this.showBackIcon && this.dialogController?.open()
           })
           })
       }
       }
-      }
       .width(48)
       .width(48)
     }
     }
 
 
@@ -380,7 +383,7 @@ export struct OperRowListView {
           {
           {
             contentId: this.contentDetailData?.newsId + '',
             contentId: this.contentDetailData?.newsId + '',
             contentType: this.contentDetailData?.newsType + '',
             contentType: this.contentDetailData?.newsType + '',
-            contentRelId: this.contentDetailData?.reLInfo?.relId + '',
+            contentRelId: this.contentDetailData?.reLInfo?.relId || ''  + '',
           }
           }
         ]
         ]
       }
       }
@@ -397,7 +400,6 @@ export struct OperRowListView {
    * 收藏、取消收藏
    * 收藏、取消收藏
    */
    */
   async toggleCollectStatus() {
   async toggleCollectStatus() {
-    console.log(TAG, '收藏点击')
     // 未登录，跳转登录
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     console.log(TAG, '收藏点击，登录', user_id)
     console.log(TAG, '收藏点击，登录', user_id)
@@ -411,15 +413,13 @@ export struct OperRowListView {
       contentList: [{
       contentList: [{
         contentId: this.contentDetailData?.newsId + '',
         contentId: this.contentDetailData?.newsId + '',
         contentType: this.contentDetailData?.newsType + '',
         contentType: this.contentDetailData?.newsType + '',
-        relType: this.contentDetailData?.reLInfo?.relType + '',
-        contentRelId: this.contentDetailData?.reLInfo?.relId + '',
+        relType: this.contentDetailData?.reLInfo?.relType || '' + '',
+        contentRelId: this.contentDetailData?.reLInfo?.relId || '' + '',
       }],
       }],
 
 
     }
     }
-    // console.log(TAG, '收藏点击', JSON.stringify(params))
+    console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
-      console.log(TAG, '收藏点击 res', JSON.stringify(res))
-      console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
       if (this.newsStatusOfUser) {
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         if (this.newsStatusOfUser.collectStatus === 1) {
         if (this.newsStatusOfUser.collectStatus === 1) {
@@ -427,6 +427,7 @@ export struct OperRowListView {
         }
         }
         this.queryContentInteractCount()
         this.queryContentInteractCount()
       }
       }
+      console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
     })
     })
 
 
   }
   }

@@ -31,6 +31,7 @@ export struct PermissionDesComponent {
     .border({ radius: 5 })
     .border({ radius: 5 })
     .margin({ top: 12 })
     .margin({ top: 12 })
     .padding(12)
     .padding(12)
+    .zIndex(20)
   }
   }
 
 
   startDismiss() {
   startDismiss() {

@@ -96,7 +96,7 @@ class MinePageDatasModel{
    * 包含名字和图标
    * 包含名字和图标
    */
    */
   getMoreFunctionsData():MinePageCreatorFunctionsItem[]{
   getMoreFunctionsData():MinePageCreatorFunctionsItem[]{
-    if(this.moreData.length === 5){
+    if(this.moreData.length === 3){
       return this.moreData
       return this.moreData
     }
     }
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))
     // this.moreData.push(new MinePageMoreFunctionModel("扫一扫",$r('app.media.mine_scan')))

@@ -173,4 +173,47 @@ export class ColorUtils {
       alpha: (color & 0xFF000000) >> 24
       alpha: (color & 0xFF000000) >> 24
     }
     }
   }
   }
+
+
+  public static getMorningEveningPaperRgb(color: ColorRgb): ColorRgb{
+    // RGB颜色取值范围是0~255，需要转换为0~1的浮点数
+    const red: number = color.red / MAX_RGB_VALUE;
+    const green: number = color.green / MAX_RGB_VALUE;
+    const blue: number = color.blue / MAX_RGB_VALUE;
+
+    const max: number = Math.max(red, green, blue);
+    const min: number = Math.min(red, green, blue);
+    const delta: number = max - min;
+
+    // 色调
+    let hue: number = 0;
+    // 饱和度
+    let saturation: number = 0;
+    // 明度
+    let value: number = 0;
+    // 计算hue值
+    if (max === min) {
+      hue = 0;
+    } else if (Math.abs(max - red) < Number.EPSILON) {
+      hue = (green >= blue ? ((green - blue) / delta) * 60 : ((green - blue) / delta) * 60 + 360);
+    } else if (Math.abs(max - green) < Number.EPSILON) {
+      hue = (((blue - red) / delta) + 2) * 60;
+    } else if (Math.abs(max - blue) < Number.EPSILON) {
+      hue = (((red - green) / delta) + 4) * 60;
+    }
+
+    // 计算saturation值
+    saturation = 0.9;
+    // 计算value值
+    value = 0.3;
+
+    return ColorUtils.hsv2rgb({
+      hue: hue,
+      saturation: saturation,
+      value: value,
+      alpha: color.alpha
+    })
+
+  }
+
 }
 }

@@ -4,7 +4,88 @@ import PageModel from '../viewmodel/PageModel';
 import PageHelper from '../viewmodel/PageHelper';
 import PageHelper from '../viewmodel/PageHelper';
 import PageAdModel from '../viewmodel/PageAdvModel';
 import PageAdModel from '../viewmodel/PageAdvModel';
 import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
 import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
+import { Logger } from 'wdKit/Index';
+
+const TAG = 'PullDownRefresh'
+/***********新的下拉、上拉手势 start **********/
+export function onActionStart(pageModel: PageModel, pageAdvModel: PageAdModel, event?: GestureEvent) {
+  if (event === undefined) {
+    return
+  }
+  pageModel.downY = event.offsetY;
+  pageModel.lastMoveY = event.offsetY;
+}
+
+export function onActionUpdate(pageModel: PageModel, pageAdvModel: PageAdModel, event?: GestureEvent) {
+  if (event === undefined) {
+    return
+  }
+  if ((pageModel.isRefreshing === true) || (pageModel.isLoading === true)) {
+    return;
+  }
+  let isDownPull = event.offsetY - pageModel.lastMoveY > 0;
+  if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) &&
+    (pageModel.isCanLoadMore === false)) {
+    actionUpdatePullRefresh(pageModel, event);
+  } else {
+    actionUpdateLoadMore(pageModel, event);
+  }
+  pageModel.lastMoveY = event.offsetY;
+}
+
+export function onActionEnd(pageModel: PageModel, pageAdvModel: PageAdModel) {
+  if ((pageModel.isRefreshing === true) || (pageModel.isLoading === true)) {
+    return;
+  }
+  if ((pageModel.isPullRefreshOperation === true)) {
+    touchUpPullRefresh(pageModel, pageAdvModel);
+  } else {
+    // touchUpLoadMore(pageModel);
+  }
+}
+
+export function actionUpdatePullRefresh(pageModel: PageModel, event: GestureEvent) {
+  if (pageModel.startIndex === 0) {
+    pageModel.isPullRefreshOperation = true;
+    let height = vp2px(Const.CUSTOM_REFRESH_DECIDE_HEIGHT);
+    pageModel.offsetY = event.offsetY - pageModel.downY;
+    if (pageModel.offsetY >= height) {
+      pullRefreshState(pageModel, RefreshState.Release);
+      pageModel.offsetY = height + pageModel.offsetY * Const.Y_OFF_SET_COEFFICIENT;
+    } else {
+      pullRefreshState(pageModel, RefreshState.DropDown);
+    }
+    if (pageModel.offsetY < 0) {
+      pageModel.offsetY = 0;
+      pageModel.isPullRefreshOperation = false;
+    }
+  }
+}
+
+export function actionUpdateLoadMore(model: PageModel, event: GestureEvent) {
+  // list size +1
+  if (model.endIndex >= model.compList.totalCount() - 3 && model.endIndex <= model.compList.totalCount()) {
+    // model.offsetY = event.touches[0].y - model.downY;
+    // if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) {
+    //   model.isCanLoadMore = true;
+    //   model.isVisiblePullUpLoad = true;
+    //   model.offsetY = -vp2px(model.pullUpLoadHeight) + model.offsetY * Const.Y_OFF_SET_COEFFICIENT;
+    // }
+
+    // 不用分页动画，直接预加载
+    model.isCanLoadMore = true;
+    model.isVisiblePullUpLoad = true;
+    touchUpLoadMore(model);
+  }
+}
+
+/***********新的下拉、上拉手势 end **********/
+
+
 //下拉刷新上拉加载更多组件
 //下拉刷新上拉加载更多组件
+/**
+ * @deprecated
+ */
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
   switch (event.type) {
   switch (event.type) {
     case TouchType.Down:
     case TouchType.Down:
@@ -16,7 +97,8 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
         return;
         return;
       }
       }
       let isDownPull = event.touches[0].y - pageModel.lastMoveY > 0;
       let isDownPull = event.touches[0].y - pageModel.lastMoveY > 0;
-      if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) && (pageModel.isCanLoadMore === false)) {
+      if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) &&
+        (pageModel.isCanLoadMore === false)) {
         // Finger movement, processing pull-down refresh.
         // Finger movement, processing pull-down refresh.
         touchMovePullRefresh(pageModel, event);
         touchMovePullRefresh(pageModel, event);
       } else {
       } else {
@@ -44,6 +126,9 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
   }
   }
 }
 }
 
 
+/**
+ * @deprecated
+ */
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
   if (pageModel.startIndex === 0) {
   if (pageModel.startIndex === 0) {
     pageModel.isPullRefreshOperation = true;
     pageModel.isPullRefreshOperation = true;
@@ -73,11 +158,22 @@ export function touchUpPullRefresh(pageModel: PageModel, pageAdvModel: PageAdMod
       let advSelf: PageAdModel = pageAdvModel;
       let advSelf: PageAdModel = pageAdvModel;
       PageHelper.refreshUI(self, advSelf)
       PageHelper.refreshUI(self, advSelf)
     }, Const.DELAY_TIME);
     }, Const.DELAY_TIME);
+    setRefreshTimeoutTimer(pageModel)
   } else {
   } else {
     closeRefresh(pageModel, false);
     closeRefresh(pageModel, false);
   }
   }
 }
 }
 
 
+export function setRefreshTimeoutTimer(pageModel: PageModel) {
+  let timeoutId = setTimeout(() => {
+    closeRefresh(pageModel, false);
+    Logger.error(TAG, 'closeRefresh by timeout')
+  }, Const.REFRESH_TIMEOUT__TIME);
+  // 取消超时关闭定时器
+  clearTimeout(pageModel.refreshTimeoutTimerId)
+  pageModel.refreshTimeoutTimerId = timeoutId
+}
+
 /**
 /**
  * 自动刷新接口，如首页底导，双击按钮自动刷新
  * 自动刷新接口，如首页底导，双击按钮自动刷新
  * @param pageModel 页面数据
  * @param pageModel 页面数据
@@ -93,6 +189,7 @@ export function autoRefresh(pageModel: PageModel, pageAdvModel: PageAdModel) {
   pullRefreshState(pageModel, RefreshState.Refreshing);
   pullRefreshState(pageModel, RefreshState.Refreshing);
   pageModel.currentPage = 1;
   pageModel.currentPage = 1;
   PageHelper.refreshUI(pageModel, pageAdvModel)
   PageHelper.refreshUI(pageModel, pageAdvModel)
+  setRefreshTimeoutTimer(pageModel)
 }
 }
 
 
 export function pullRefreshState(pageModel: PageModel, state: number) {
 export function pullRefreshState(pageModel: PageModel, state: number) {
@@ -141,6 +238,8 @@ export function pullRefreshState(pageModel: PageModel, state: number) {
 
 
 export function closeRefresh(pageModel: PageModel, isRefreshSuccess: boolean) {
 export function closeRefresh(pageModel: PageModel, isRefreshSuccess: boolean) {
   let self = pageModel;
   let self = pageModel;
+  // 取消超时关闭定时器
+  clearTimeout(self.refreshTimeoutTimerId)
   setTimeout(() => {
   setTimeout(() => {
     let delay = Const.RefreshConstant_DELAY_PULL_DOWN_REFRESH;
     let delay = Const.RefreshConstant_DELAY_PULL_DOWN_REFRESH;
     if (self.isCanRefresh === true) {
     if (self.isCanRefresh === true) {

 import PageModel from '../viewmodel/PageModel';
 import PageModel from '../viewmodel/PageModel';
 import { RefreshConstants as Const } from './RefreshConstants';
 import { RefreshConstants as Const } from './RefreshConstants';
 import PageHelper from '../viewmodel/PageHelper';
 import PageHelper from '../viewmodel/PageHelper';
+import { Logger } from 'wdKit/Index';
+
+const TAG = 'PullUpLoadMore'
 
 
 export function touchMoveLoadMore(model: PageModel, event: TouchEvent) {
 export function touchMoveLoadMore(model: PageModel, event: TouchEvent) {
   // list size +1
   // list size +1
-  if (model.endIndex >= model.compList.totalCount()-3 && model.endIndex <= model.compList.totalCount()) {
+  if (model.endIndex >= model.compList.totalCount() - 3 && model.endIndex <= model.compList.totalCount()) {
     // model.offsetY = event.touches[0].y - model.downY;
     // model.offsetY = event.touches[0].y - model.downY;
     // if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) {
     // if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) {
     //   model.isCanLoadMore = true;
     //   model.isCanLoadMore = true;
@@ -32,6 +35,7 @@ export function touchUpLoadMore(model: PageModel) {
       // closeLoadMore(model);
       // closeLoadMore(model);
       PageHelper.loadMore(self)
       PageHelper.loadMore(self)
     }, Const.DELAY_TIME);
     }, Const.DELAY_TIME);
+    setLoadMoreTimeoutTimer(self)
   } else {
   } else {
     closeLoadMore(self);
     closeLoadMore(self);
   }
   }
@@ -42,3 +46,13 @@ export function closeLoadMore(model: PageModel) {
   model.isLoading = false;
   model.isLoading = false;
   model.isVisiblePullUpLoad = false;
   model.isVisiblePullUpLoad = false;
 }
 }
+
+export function setLoadMoreTimeoutTimer(pageModel: PageModel) {
+  let timeoutId = setTimeout(() => {
+    closeLoadMore(pageModel);
+    Logger.error(TAG, 'closeLoadMore by timeout')
+  }, Const.REFRESH_TIMEOUT__TIME);
+  // 取消超时关闭定时器
+  clearTimeout(pageModel.loadMoreTimeoutTimerId)
+  pageModel.loadMoreTimeoutTimerId = timeoutId
+}

@@ -14,7 +14,7 @@ export class RefreshConstants {
    * The delay time.
    * The delay time.
    */
    */
   static readonly DELAY_TIME: number = 50;
   static readonly DELAY_TIME: number = 50;
-
+  static readonly REFRESH_TIMEOUT__TIME: number = 10000;
   /**
   /**
    * The animation duration.
    * The animation duration.
    */
    */
@@ -25,12 +25,10 @@ export class RefreshConstants {
   static readonly RefreshConstant_DELAY_PULL_DOWN_REFRESH: number = 50;
   static readonly RefreshConstant_DELAY_PULL_DOWN_REFRESH: number = 50;
   static readonly RefreshConstant_CLOSE_PULL_DOWN_REFRESH_TIME: number = 150;
   static readonly RefreshConstant_CLOSE_PULL_DOWN_REFRESH_TIME: number = 150;
   static readonly RefreshConstant_DELAY_SHRINK_ANIMATION_TIME: number = 1500;
   static readonly RefreshConstant_DELAY_SHRINK_ANIMATION_TIME: number = 1500;
-
   /**
   /**
    * The page size.
    * The page size.
    */
    */
   static readonly PAGE_SIZE: number = 20;
   static readonly PAGE_SIZE: number = 20;
-
   /**
   /**
    * The refresh and load height.
    * The refresh and load height.
    */
    */
@@ -59,6 +57,7 @@ export class RefreshConstants {
   static readonly RefreshLayout_IMAGE_WIDTH: number = 18;
   static readonly RefreshLayout_IMAGE_WIDTH: number = 18;
   static readonly RefreshLayout_IMAGE_HEIGHT: number = 18;
   static readonly RefreshLayout_IMAGE_HEIGHT: number = 18;
 }
 }
+
 /**
 /**
  * The refresh state enum.
  * The refresh state enum.
  */
  */

+import { TrackingContent, TrackConstants, ParamType } from 'wdTracking';
+import { CompDTO, ContentDTO } from 'wdBean';
+
+export class InfomationCardClick {
+
+  private static getLiveState(contentDTO: ContentDTO) {
+    if (contentDTO?.liveInfo?.liveState === 'wait') {
+      return 'liveSubscribe'
+    } else if (contentDTO?.liveInfo?.liveState === 'running') {
+      return 'livePlaying'
+    } else if (contentDTO?.liveInfo?.liveState === 'end') {
+      return 'liveEnd'
+    } else {
+      return ''
+    }
+  }
+
+  private static getSummaryType(objectType: string) {
+    let summaryType: string = ''
+    switch(objectType) {
+      case '2':
+        summaryType = 'liveTopic';
+        break;
+      case '8':
+        summaryType = 'articleTopic';
+        break;
+      case '13':
+        summaryType = 'audioTopic';
+        break;
+    // case '':
+    //   summaryType = 'talkTopic';
+    //   break;
+    // case '':
+    //   summaryType = 'morningAndEveningNewsTopic';
+    //   break;
+    // case '':
+    //   summaryType = 'timeAxisTopic';
+    //   break;
+      default:
+        summaryType = '';
+        break;
+    }
+    return summaryType;
+  }
+
+  public static track(compDTO: CompDTO, contentDTO: ContentDTO, pageId: string, pageName: string): void {
+    try {
+      const extParams: ParamType = {
+        'action': 'detailPageShow',
+        'shareChannel': '',
+        'duration': 0,
+        'contentName': contentDTO.newsTitle,
+        'contentType': contentDTO.objectType,
+        // 'contentClassify': '' // 废除
+        'contentId': contentDTO.objectId,
+        // 'compId': contentDTO.relId,
+        'contentStyle': contentDTO.appStyle,
+        'liveType': InfomationCardClick.getLiveState(contentDTO),
+        'channelSourceId': contentDTO.channelId,
+        'contentShowChannelId': contentDTO.channelId,
+        // 'contentShowChannelName': '',
+        'linkUrl': contentDTO.linkUrl,
+        'regionName': 2, // 信息流：2
+        'componentType': compDTO.compStyle,
+        'sceneId': contentDTO.sceneId,
+        'subSceneId': contentDTO.subSceneId,
+        'cnsTraceId': contentDTO.cnsTraceId,
+        'cardItemId': compDTO.cardItemId,
+        'itemId': compDTO.itemId || contentDTO.itemId,
+        'expIds': compDTO.expIds || contentDTO.expIds
+      }
+      if (contentDTO.objectType === '5') {
+        extParams['summaryId'] = contentDTO.objectId;
+        extParams['summaryType'] = InfomationCardClick.getSummaryType(contentDTO.objectType);
+        extParams['specialLink'] = contentDTO.linkUrl;
+      }
+      if (contentDTO.objectType === '2') {
+        extParams['liveStreamType'] = contentDTO?.liveInfo.vrType === 0 ? 1 : 2;
+        extParams['vliveId'] = contentDTO.objectId;
+        extParams['vliveName'] = contentDTO.newsTitle;
+        extParams['liveMode'] = 1;
+      }
+      if (contentDTO.rmhPlatform === 1) {
+        extParams['saAuthorName'] = contentDTO.rmhInfo?.rmhName;
+        extParams['saAuthorId'] = contentDTO.rmhInfo?.rmhId;
+      } else if (contentDTO.source) {
+        extParams['saAuthorName'] = contentDTO.source;
+      }
+      console.log('InfomationCardClick-params：', JSON.stringify(extParams))
+      TrackingContent.common(TrackConstants.EventType.Click, pageId, pageName, extParams)
+    } catch (err) {
+      console.log('InfomationCardClick-err', JSON.stringify(err))
+    }
+  }
+}

@@ -49,6 +49,9 @@ export class PageHelper {
   }
   }
 
 
   private refreshUIEnd(pageModel: PageModel, isRefreshSuccess: boolean) {
   private refreshUIEnd(pageModel: PageModel, isRefreshSuccess: boolean) {
+    if (pageModel.loadStrategy != 2) {
+      return
+    }
     closeRefresh(pageModel, isRefreshSuccess)
     closeRefresh(pageModel, isRefreshSuccess)
   }
   }
 
 
@@ -119,6 +122,7 @@ export class PageHelper {
         }
         }
       }).catch((err: string | Resource) => {
       }).catch((err: string | Resource) => {
         promptAction.showToast({ message: err });
         promptAction.showToast({ message: err });
+        this.refreshUIEnd(pageModel, false)
       })
       })
     } else {
     } else {
       Logger.debug(TAG, 'getPageInfo')
       Logger.debug(TAG, 'getPageInfo')
@@ -127,6 +131,7 @@ export class PageHelper {
         if (pageInfo == null) {
         if (pageInfo == null) {
           pageModel.viewType = ViewType.EMPTY;
           pageModel.viewType = ViewType.EMPTY;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
+          this.refreshUIEnd(pageModel, false)
           return;
           return;
         }
         }
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
@@ -146,6 +151,7 @@ export class PageHelper {
         Logger.debug(TAG, 'getPageInfo go on')
         Logger.debug(TAG, 'getPageInfo go on')
         this.parseGroup(pageModel, false)
         this.parseGroup(pageModel, false)
       }).catch(() => {
       }).catch(() => {
+        this.refreshUIEnd(pageModel, false)
         if (this.isPageLoaded(pageModel)) {
         if (this.isPageLoaded(pageModel)) {
           return
           return
         }
         }
@@ -406,7 +412,7 @@ export class PageHelper {
   /**
   /**
    * 竖直方向list，将数据拆出来，组装成comp
    * 竖直方向list，将数据拆出来，组装成comp
    */
    */
-  private createSpecialComp(compList: CompDTO[]): CompDTO[]{
+  private createSpecialComp(compList: CompDTO[]): CompDTO[] {
     if (!compList) {
     if (!compList) {
       return compList
       return compList
     }
     }
@@ -458,7 +464,6 @@ export class PageHelper {
 
 
     // 批查直播观看人数
     // 批查直播观看人数
     this.getLiveRoomDataInfo(compList)
     this.getLiveRoomDataInfo(compList)
-
     //
     //
 
 
 
 

@@ -28,13 +28,28 @@ export default class PageModel {
   loadStrategy: number = 1;
   loadStrategy: number = 1;
   currentPage: number = 1;
   currentPage: number = 1;
   pageSize: number = Const.PAGE_SIZE;
   pageSize: number = Const.PAGE_SIZE;
+  /**
+   * @deprecated
+   */
   pullDownRefreshText: Resource = $r('app.string.pull_down_refresh_text');
   pullDownRefreshText: Resource = $r('app.string.pull_down_refresh_text');
+  /**
+   * @deprecated
+   */
   pullDownRefreshImage: Resource = $r('app.media.ic_pull_down_refresh');
   pullDownRefreshImage: Resource = $r('app.media.ic_pull_down_refresh');
   pullDownRefreshHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   pullDownRefreshHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   isVisiblePullDown: boolean = false;
   isVisiblePullDown: boolean = false;
   load: LoadStatus = LoadStatus.IDLE;
   load: LoadStatus = LoadStatus.IDLE;
+  /**
+   * @deprecated
+   */
   pullUpLoadText: Resource = $r('app.string.pull_up_load_text');
   pullUpLoadText: Resource = $r('app.string.pull_up_load_text');
+  /**
+   * @deprecated
+   */
   pullUpLoadImage: Resource = $r('app.media.ic_pull_up_load');
   pullUpLoadImage: Resource = $r('app.media.ic_pull_up_load');
+  /**
+   * @deprecated
+   */
   pullUpLoadHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   pullUpLoadHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   isVisiblePullUpLoad: boolean = false;
   isVisiblePullUpLoad: boolean = false;
   offsetY: number = 0;
   offsetY: number = 0;
@@ -50,6 +65,8 @@ export default class PageModel {
   isPullRefreshOperation = false;
   isPullRefreshOperation = false;
   isLoading: boolean = false;
   isLoading: boolean = false;
   isCanLoadMore: boolean = false;
   isCanLoadMore: boolean = false;
+  refreshTimeoutTimerId: number = 0;
+  loadMoreTimeoutTimerId: number = 0;
   // keyGenerator相关字符串，用于刷新list布局
   // keyGenerator相关字符串，用于刷新list布局
   timestamp: String = '1';
   timestamp: String = '1';
 
 

@@ -83,23 +83,29 @@ export struct DetailPlayLiveCommon {
    * 获取直播信息，可区分横竖屏直播
    * 获取直播信息，可区分横竖屏直播
    */
    */
   getLiveDetails() {
   getLiveDetails() {
+
     this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType)
     this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType)
       .then(
       .then(
         (data) => {
         (data) => {
           if (data.length > 0) {
           if (data.length > 0) {
+
+            //todo  不加setTimeOut ，接口返回的数据 就没法让PlayerComponent #@Consume @Watch('updateData') liveDetailsBean 的updateData方法运行
+            setTimeout(() => {
               this.liveDetailsBean = data[0]
               this.liveDetailsBean = data[0]
-            this.liveState = this.liveDetailsBean.liveInfo?.liveState
-            this.liveStyle = this.liveDetailsBean.liveInfo.liveStyle
+            }, 10)
+
+            this.liveState = data[0].liveInfo?.liveState
+            this.liveStyle = data[0].liveInfo.liveStyle
 
 
-            if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {
-              this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url
+            if (data[0].fullColumnImgUrls && data[0].fullColumnImgUrls.length > 0) {
+              this.imgUrl = data[0].fullColumnImgUrls[0].url
             }
             }
 
 
-            if (this.liveDetailsBean.liveInfo.liveState == 'end') {
-              this.playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
+            if (data[0].liveInfo.liveState == 'end') {
+              this.playUrl = data[0].liveInfo.vlive[0].replayUri
             }
             }
 
 
-            console.log(TAG, 'getLiveDetails:', JSON.stringify((this.liveDetailsBean)))
+           // console.log(TAG, 'getLiveDetails:', JSON.stringify((this.liveDetailsBean)))
           }
           }
         },
         },
         () => {
         () => {

@@ -53,17 +53,23 @@ export struct DetailPlayLivePage {
     console.error(TAG, 'this.publishCommentModel', this.publishCommentModel.targetId)
     console.error(TAG, 'this.publishCommentModel', this.publishCommentModel.targetId)
   }
   }
 
 
+  async aboutToDisappear() {
+    Logger.info(TAG, `wyj-aboutToDisappear`)
+    await this.playerController?.stop()
+    await this.playerController?.release()
+  }
+
   build() {
   build() {
     Column() {
     Column() {
       TopPlayComponent({ playerController: this.playerController })
       TopPlayComponent({ playerController: this.playerController })
-        .layoutWeight(211)
+        .height(211)
       TabComponent({ tabs: this.tabs, changeToTab: this.changeToTab })
       TabComponent({ tabs: this.tabs, changeToTab: this.changeToTab })
-        .layoutWeight(503)
+        .layoutWeight(1)
         .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
         .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
-
       OperRowListView({
       OperRowListView({
         componentType: 4,
         componentType: 4,
         operationButtonList: ['comment', 'collect', 'share', 'like'],
         operationButtonList: ['comment', 'collect', 'share', 'like'],
+        styleType: 1,
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,
         showCommentIcon: false,
         showCommentIcon: false,
@@ -79,12 +85,7 @@ export struct DetailPlayLivePage {
     }
     }
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
-  }
-
-  async aboutToDisappear() {
-    Logger.info(TAG, `wyj-aboutToDisappear`)
-    await this.playerController?.stop()
-    await this.playerController?.release()
+    // 设置底部绘制延伸到导航条
   }
   }
 
 
   onPageShowCus(): void {
   onPageShowCus(): void {

@@ -36,6 +36,7 @@ export struct DetailPlayVLivePage {
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.openFullScreen()
     this.openFullScreen()
     this.getLiveRoomData()
     this.getLiveRoomData()
+
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {

@@ -21,6 +21,7 @@ export struct PlayerComponent {
   @State playUrl: string = ''
   @State playUrl: string = ''
   @State isCanplay: boolean = false
   @State isCanplay: boolean = false
 
 
+
   pageShowChange() {
   pageShowChange() {
     this.playerController?.play()
     this.playerController?.play()
   }
   }
@@ -30,15 +31,10 @@ export struct PlayerComponent {
   }
   }
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-    console.log(TAG, 'aboutToAppear')
-    this.playerController.onCanplay = () => {
-      console.log('可以播放了')
-      this.playerController?.play()
-      this.isCanplay = true
-    }
   }
   }
 
 
   async aboutToDisappear(): Promise<void> {
   async aboutToDisappear(): Promise<void> {
+
     await this.playerController?.pause()
     await this.playerController?.pause()
     await this.playerController?.stop()
     await this.playerController?.stop()
     await this.playerController?.release()
     await this.playerController?.release()
@@ -63,7 +59,6 @@ export struct PlayerComponent {
 
 
       this.liveStreamType = liveStreamType
       this.liveStreamType = liveStreamType
       this.playUrl = playUrl
       this.playUrl = playUrl
-
     }
     }
   }
   }
 
 
@@ -75,6 +70,7 @@ export struct PlayerComponent {
           WDPlayerRenderVLiveView({
           WDPlayerRenderVLiveView({
             playerController: this.playerController,
             playerController: this.playerController,
             onLoad: () => {
             onLoad: () => {
+              this.isCanplay = true
               this.playerController?.firstPlay(this.playUrl);
               this.playerController?.firstPlay(this.playUrl);
             }
             }
           })
           })
@@ -82,12 +78,14 @@ export struct PlayerComponent {
           AliPlayerRenderView({
           AliPlayerRenderView({
             playerController: this.playerController,
             playerController: this.playerController,
             onLoad: () => {
             onLoad: () => {
+              this.isCanplay = true
               this.playerController?.firstPlay(this.playUrl);
               this.playerController?.firstPlay(this.playUrl);
             }
             }
           }).margin({ top: 195 }).height(211)
           }).margin({ top: 195 }).height(211)
         }
         }
 
 
         PictureLoading().visibility(this.isCanplay ? Visibility.None : Visibility.Visible)
         PictureLoading().visibility(this.isCanplay ? Visibility.None : Visibility.Visible)
+
       }
       }
       .height('100%')
       .height('100%')
       .width('100%')
       .width('100%')
@@ -98,8 +96,11 @@ export struct PlayerComponent {
           this.isShowControl = !this.isShowControl
           this.isShowControl = !this.isShowControl
         }
         }
       })
       })
+
     }
     }
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
   }
   }
+
+
 }
 }

@@ -185,7 +185,7 @@ export struct DetailPlayShortVideoPage {
             index: $index,
             index: $index,
             currentIndex: $currentIndex,
             currentIndex: $currentIndex,
             showCommentList: $showCommentList,
             showCommentList: $showCommentList,
-            publishCommentModel: $publishCommentModel
+            // publishCommentModel: $publishCommentModel
           })
           })
           this.playerViewBuilder()
           this.playerViewBuilder()
 
 

-import { ContentDetailDTO } from 'wdBean/Index'
-import { WindowModel } from 'wdKit/Index'
-import {
-  publishCommentModel
-} from '../../../../../wdComponent/src/main/ets/components/comment/model/PublishCommentModel'
-import { CommentComponent } from '../../../../../wdComponent/src/main/ets/components/comment/view/CommentComponent'
-import { OperRowListView } from '../../../../../wdComponent/src/main/ets/components/view/OperRowListView'
+import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
 
 
+import { CommentListDialogView } from 'wdComponent/Index'
 
 
 @Component
 @Component
 export struct CommentDialogView {
 export struct CommentDialogView {
-  @Link publishCommentModel: publishCommentModel
   @Link @Watch('showCommentListChange') showCommentList: boolean
   @Link @Watch('showCommentListChange') showCommentList: boolean
   @Link index: number
   @Link index: number
   @Link currentIndex: number
   @Link currentIndex: number
-  @Consume windowWidth: number
-  @Consume windowHeight: number
-  @Consume bottomSafeHeight: number
-  @Consume topSafeHeight: number
   @Consume contentDetailData: ContentDetailDTO
   @Consume contentDetailData: ContentDetailDTO
+  @State fakePageInfo: PageInfoDTO = {} as PageInfoDTO
   @State dialogOffsetY: number = 0 // (this.windowHeight - this.windowWidth * 9 / 16)
   @State dialogOffsetY: number = 0 // (this.windowHeight - this.windowWidth * 9 / 16)
-  // @State modifier: DrawModifier = new DrawModifier();
-  dialogController: CustomDialogController = new CustomDialogController({
-    builder: DetailDialog({
-      publishCommentModel: $publishCommentModel,
-      contentDetailData: $contentDetailData,
-      dialogOffsetY: $dialogOffsetY,
-      showCommentList: $showCommentList,
-      windowWidth: this.windowWidth,
-      windowHeight: this.windowHeight
-    }),
-    autoCancel: false,
-    customStyle: true,
-    alignment: DialogAlignment.Bottom,
-    // onWillDismiss: (dismissDialogAction: DismissDialogAction) => {
-    //   this.showCommentList = false
-    //   dismissDialogAction.dismiss()
-    // },
-    // openAnimation: { duration: 0 },
-    // closeAnimation: { duration: 0 },
-  })
 
 
-  /**
-   * 问题：弹窗从底部到上动画无法添加
-   */
+  @State @Watch("innerShowCommentChange") innerShowComment: boolean = false
 
 
   showCommentListChange(val: boolean) {
   showCommentListChange(val: boolean) {
     if (this.showCommentList && this.index === this.currentIndex) {
     if (this.showCommentList && this.index === this.currentIndex) {
-      this.dialogController.open()
-      console.log('open')
-      // animateTo({ duration: 10000, expectedFrameRateRange: { min: 60, max: 60, expected: 60 } }, () => {
-      //   this.dialogOffsetY = 500
-      //   this.modifier.invalidate()
-      // })
+      this.innerShowComment = true
     } else {
     } else {
-      this.dialogController.close()
-      console.log('close')
+      this.innerShowComment = false
     }
     }
   }
   }
 
 
-  build() {
+  innerShowCommentChange() {
+    this.showCommentList = this.innerShowComment
   }
   }
-}
-
-@CustomDialog
-export struct DetailDialog {
-  controller: CustomDialogController
-  @Link publishCommentModel: publishCommentModel
-  @Link dialogOffsetY: number
-  @Link contentDetailData: ContentDetailDTO
-  @Link showCommentList: boolean
-  @Prop windowWidth: number
-  @Prop windowHeight: number
 
 
   build() {
   build() {
-    Column() {
-      CommentComponent({
-        publishCommentModel: this.publishCommentModel,
-        showCloseIcon: true,
-        fixedHeightMode: true,
-        onCloseClick: () => {
-          console.log('onCloseClick')
-          this.showCommentList = false
-          this.controller.close()
-          // setTimeout(() => {
-          //
-          // }, 1000)
-
-        }
-      }).layoutWeight(1)
-
-      OperRowListView({
-        componentType: 4,
-        pageComponentType: 8,
-        showBackIcon: false,
-        operationButtonList: ['comment', 'like', 'collect', 'share'],
+    CommentListDialogView({
+      showCommentList: this.innerShowComment,
       contentDetailData: this.contentDetailData,
       contentDetailData: this.contentDetailData,
-        publishCommentModel: this.publishCommentModel,
-        showCommentIcon: true,
-        styleType: 1,
-        onBack: () => {
-          WindowModel.shared.setWindowLayoutFullScreen(false)
-          WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+      pageInfo: this.fakePageInfo,
+      onClose: () => {
+        this.showCommentList = false
       }
       }
     })
     })
   }
   }
-    .height(this.windowHeight - this.windowWidth * 9 / 16 + 'px')
-    // .margin({ top: this.dialogOffsetY + 'px' })
-    .zIndex(1000)
-    .backgroundColor(Color.White)
-  }
 }
 }

@@ -2,15 +2,11 @@ import { Logger, EmitterEventId, EmitterUtils, DateTimeUtils,CustomToast, String
 import router from '@ohos.router'
 import router from '@ohos.router'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginInputComponent } from './LoginInputComponent'
 import { LoginInputComponent } from './LoginInputComponent'
-import { ErrorToastUtils, SPHelper } from 'wdKit'
 import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage';
 import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage';
 import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
 import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
-import HuaweiAuth from '../../utils/HuaweiAuth'
-import { loginComponentManager, LoginWithHuaweiIDButton } from '@hms.core.account.LoginComponent'
-import { BusinessError } from '@ohos.base'
-import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index'
+import { TrackingPageBrowse, TrackConstants, TrackingButton, ParamType, Tracking } from 'wdTracking/Index'
 
 
 @Extend(Row)
 @Extend(Row)
 function otherStyle() {
 function otherStyle() {
@@ -43,7 +39,6 @@ struct LoginPage {
   @State isSubmit: boolean = false
   @State isSubmit: boolean = false
   @State checkCodePage: boolean = true //判断是否是验证码页面 默认验证码登录
   @State checkCodePage: boolean = true //判断是否是验证码页面 默认验证码登录
   @State passwordSwitch: boolean = true //密码显示
   @State passwordSwitch: boolean = true //密码显示
-  // @State isPasswordSubmit: boolean = false //账户密码状态 是否出发登录
   lastTime: number = 0
   lastTime: number = 0
   @State codeStateSuccess:boolean=false
   @State codeStateSuccess:boolean=false
   @State toastText:string = ""
   @State toastText:string = ""
@@ -64,6 +59,7 @@ struct LoginPage {
   onCodeSend() {
   onCodeSend() {
     Logger.debug(TAG, "isCodeSend:" + this.isCodeSend + "")
     Logger.debug(TAG, "isCodeSend:" + this.isCodeSend + "")
     if (this.isCodeSend) {
     if (this.isCodeSend) {
+      TrackingButton.click("loginPageGetVerificationCode",TrackConstants.PageName.Phone_Login_Page,TrackConstants.PageName.Phone_Login_Page)
       this.sendVerifyCode()
       this.sendVerifyCode()
     }
     }
   }
   }
@@ -81,8 +77,13 @@ struct LoginPage {
     this.pageHideTime = DateTimeUtils.getTimeStamp()
     this.pageHideTime = DateTimeUtils.getTimeStamp()
     let duration = 0
     let duration = 0
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
+
+    if(this.checkCodePage){
+      TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Phone_Login_Page,TrackConstants.PageName.Phone_Login_Page,duration)
+    }else{
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
       TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
     }
     }
+  }
 
 
   build() {
   build() {
     Stack() {
     Stack() {
@@ -96,7 +97,6 @@ struct LoginPage {
             .margin({ top: 78 })
             .margin({ top: 78 })
             .align(Alignment.Center)
             .align(Alignment.Center)
 
 
-          if (this.checkCodePage) {
           LoginInputComponent({
           LoginInputComponent({
             phoneContent: $phoneContent,
             phoneContent: $phoneContent,
             codeContent: $codeContent,
             codeContent: $codeContent,
@@ -105,11 +105,8 @@ struct LoginPage {
             codeStateSuccess:$codeStateSuccess,
             codeStateSuccess:$codeStateSuccess,
             protocolState:this.protocolState,
             protocolState:this.protocolState,
             isNeedProtocol:true
             isNeedProtocol:true
-            })
-          } else {
+          }).visibility(this.checkCodePage ? Visibility.Visible : Visibility.None)
           this.addPassword()
           this.addPassword()
-          }
-
 
 
           Row() {
           Row() {
             Image(this.protocolState ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected'))
             Image(this.protocolState ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected'))
@@ -122,11 +119,21 @@ struct LoginPage {
             Text() {
             Text() {
               Span("我已阅读并同意").fontColor("#999999").fontSize(12)
               Span("我已阅读并同意").fontColor("#999999").fontSize(12)
               Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
               Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
+                if(this.checkCodePage){
+                  TrackingButton.click("loginPageUserAgreement",TrackConstants.PageName.Phone_Login_Page,TrackConstants.PageName.Phone_Login_Page)
+                }else{
+                  TrackingButton.click("loginPageUserAgreement",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
+                }
                 let bean = { contentID: "1", pageID: "" } as Params
                 let bean = { contentID: "1", pageID: "" } as Params
                 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
                 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
               })
               })
               Span("及").fontColor("#999999").fontSize(12)
               Span("及").fontColor("#999999").fontSize(12)
               Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
               Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
+                if(this.checkCodePage){
+                  TrackingButton.click("loginPagePrivacyAgreement",TrackConstants.PageName.Phone_Login_Page,TrackConstants.PageName.Phone_Login_Page)
+                }else{
+                  TrackingButton.click("loginPagePrivacyAgreement",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
+                }
                 let bean = { contentID: "2", pageID: "" } as Params
                 let bean = { contentID: "2", pageID: "" } as Params
                 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
                 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
               })
               })
@@ -137,9 +144,10 @@ struct LoginPage {
             Text("登录")
             Text("登录")
               .borderRadius(4)
               .borderRadius(4)
               .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF")
               .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF")
-              .fontSize(18)
-              .fontWeight(FontWeight.Medium)
+              .fontSize("31lpx")
+              .fontWeight(400)
               .margin({ top: 20 })
               .margin({ top: 20 })
+              .lineHeight("50lpx")
 				      .height(44)
 				      .height(44)
               .textAlign(TextAlign.Center)
               .textAlign(TextAlign.Center)
               .width("100%")
               .width("100%")
@@ -160,9 +168,14 @@ struct LoginPage {
 
 
 
 
           if (!this.checkCodePage) {
           if (!this.checkCodePage) {
-            Text('忘记密码').fontColor('#666666').fontSize(14).margin({ top: 16 })
+            Text('忘记密码')
+              .fontColor('#666666')
+              .fontSize("31lpx")
+              .fontWeight(400)
+              .lineHeight("38lpx")
+              .margin({ top: 16 })
               .onClick(() => {
               .onClick(() => {
-                // router.pushUrl({ url: 'pages/login/ForgetPasswordPage' })
+                TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
                 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){
                 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){
                   let pageType = { 'pageType': 0, 'phone': Number(this.accountContent) } as Record<string, number>;
                   let pageType = { 'pageType': 0, 'phone': Number(this.accountContent) } as Record<string, number>;
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
@@ -228,11 +241,7 @@ struct LoginPage {
         })
         })
 
 
       RelativeContainer() {
       RelativeContainer() {
-        // if (this.passwordSwitch) {
           this.addPasswordInputLayout()
           this.addPasswordInputLayout()
-        // } else {
-        //   this.addPasswordInputLayout()
-        // }
 
 
         Image(this.passwordSwitch ? $r('app.media.login_password_off') : $r('app.media.login_password_on'))
         Image(this.passwordSwitch ? $r('app.media.login_password_off') : $r('app.media.login_password_on'))
           .onClick(() => {
           .onClick(() => {
@@ -251,6 +260,7 @@ struct LoginPage {
       .height(48)
       .height(48)
       .width('100%')
       .width('100%')
     }.padding({ left: 25, right: 25 }).width('100%').margin({ top: 36 })
     }.padding({ left: 25, right: 25 }).width('100%').margin({ top: 36 })
+    .visibility(this.checkCodePage ? Visibility.None : Visibility.Visible)
 
 
   }
   }
 
 
@@ -289,24 +299,6 @@ struct LoginPage {
       }.width('100%')
       }.width('100%')
 
 
       Row() {
       Row() {
-        /*Row() {
-          Image($r('app.media.login_wx'))
-            .width(20).height(20).onClick(()=>{
-            ErrorToastUtils.ErrorToast.showToast(ErrorToastUtils.ErrorType.NET_CORE_NO_NETWORK)
-          })
-        }.backgroundImage($r('app.media.login_other_left'), ImageRepeat.NoRepeat)
-        .otherStyle()
-
-        Row() {
-          Image($r('app.media.login_qq')).size({ width: 20, height: 20 })
-        }.backgroundImage($r('app.media.login_other_middle'), ImageRepeat.NoRepeat)
-        .otherStyle()
-
-        Row() {
-          Image($r('app.media.login_wb')).size({ width: 20, height: 20 })
-        }.backgroundImage($r('app.media.login_other_middle'), ImageRepeat.NoRepeat)
-        .otherStyle()*/
-
         Row() {
         Row() {
           Image(this.checkCodePage ? $r('app.media.login_qt') : $r('app.media.login_other_password'))
           Image(this.checkCodePage ? $r('app.media.login_qt') : $r('app.media.login_other_password'))
             .size({ width: "35lpx", height: "35lpx" })
             .size({ width: "35lpx", height: "35lpx" })
@@ -320,10 +312,19 @@ struct LoginPage {
             .lineHeight("38lpx")
             .lineHeight("38lpx")
         }
         }
         .onClick(() => {
         .onClick(() => {
+          this.onPageHide()
+
+          if(this.checkCodePage){
+            trackTypeClick(0,TrackConstants.PageName.Phone_Login_Page)
+          }else{
+            trackTypeClick(6,TrackConstants.PageName.Login_Page)
+          }
+
           this.updateAccount()
           this.updateAccount()
-          this.checkCodePage = !this.checkCodePage;
+          this.checkCodePage = !this.checkCodePage
           this.passwordSwitch = true
           this.passwordSwitch = true
           this.isSubmit = false
           this.isSubmit = false
+          this.pageShowTime = DateTimeUtils.getTimeStamp()
         }).width('100%')
         }).width('100%')
         .alignItems(VerticalAlign.Center)
         .alignItems(VerticalAlign.Center)
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
@@ -374,6 +375,7 @@ struct LoginPage {
   requestLogin() {
   requestLogin() {
     Logger.debug('LoginViewModel', "requestLogin")
     Logger.debug('LoginViewModel', "requestLogin")
     if (this.checkCodePage) {
     if (this.checkCodePage) {
+      TrackingButton.click("loginPageLoginButton",TrackConstants.PageName.Phone_Login_Page,TrackConstants.PageName.Phone_Login_Page)
       this.loginViewModel.appLogin(this.phoneContent, 2, this.codeContent).then((data) => {
       this.loginViewModel.appLogin(this.phoneContent, 2, this.codeContent).then((data) => {
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
         ///同步兴趣tag
         ///同步兴趣tag
@@ -385,6 +387,7 @@ struct LoginPage {
         this.showToastTip(error)
         this.showToastTip(error)
       })
       })
     } else {
     } else {
+      TrackingButton.click("loginPageLoginButton",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
       this.loginViewModel.appLoginByPassword(this.accountContent, 0, this.passwordContent, "").then((data) => {
       this.loginViewModel.appLoginByPassword(this.accountContent, 0, this.passwordContent, "").then((data) => {
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
         Logger.debug(TAG, "requestLogin: " + data.jwtToken)
         this.showToastTip('登录成功')
         this.showToastTip('登录成功')
@@ -588,3 +591,12 @@ struct ProtocolComponent {
 
 
   }
   }
 }
 }
+
+function trackTypeClick(typeValue: number,pageId: string){
+  let params: ParamType = {}
+  params["loginType"] = typeValue
+  params["pageName"] = pageId
+  params["pageId"] = pageId
+
+  Tracking.event("login_type_click", params)
+}

@@ -137,7 +137,6 @@ export class WDAliPlayerController {
       onStateChanged: (status: number) => {
       onStateChanged: (status: number) => {
         this.avPlayerStatus = status
         this.avPlayerStatus = status
         Logger.debug(TAG, "status update:" + `${this.getStatusStringWith(status)}`)
         Logger.debug(TAG, "status update:" + `${this.getStatusStringWith(status)}`)
-
         switch (status) {
         switch (status) {
           case initalized: {
           case initalized: {
             //this.avPlayer?.prepare();
             //this.avPlayer?.prepare();

@@ -196,8 +196,8 @@ struct LaunchAdvertisingPage {
   contentTrackingDict(){
   contentTrackingDict(){
     this.pageParam = {
     this.pageParam = {
       'adType':'0',
       'adType':'0',
-      'adId':this.model.launchAdInfo[0].matInfo.id.toString(),
-      'adName':this.model.launchAdInfo[0].matInfo.advTitle,
+      'adId':this.model.launchAdInfo[0]?.matInfo.id.toString(),
+      'adName':this.model.launchAdInfo[0]?.matInfo.advTitle,
       'regionName':'0'
       'regionName':'0'
     }
     }
   }
   }

@@ -4,7 +4,7 @@ import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
 import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
 import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
-import { CompUtils, TopNavigationComponent } from 'wdComponent/Index';
+import { CompUtils, TopNavigationComponent, TopNavigationComponentNew } from 'wdComponent/Index';
 import { VideoChannelPage } from './VideoChannelPage';
 import { VideoChannelPage } from './VideoChannelPage';
 import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
 import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
 
 
@@ -17,6 +17,7 @@ let storage = LocalStorage.getShared();
 @Entry(storage)
 @Entry(storage)
 @Component
 @Component
 export struct BottomNavigationComponent {
 export struct BottomNavigationComponent {
+  private isNewTopPage = true // TODO 顶导重构页面开关，false，则用原来的顶导
   @Provide bottomRectHeight: number = 0
   @Provide bottomRectHeight: number = 0
   @Provide topRectHeight: number = 0
   @Provide topRectHeight: number = 0
   @Provide isLayoutFullScreen: boolean = false
   @Provide isLayoutFullScreen: boolean = false
@@ -82,6 +83,17 @@ export struct BottomNavigationComponent {
               autoRefresh: this.autoRefresh
               autoRefresh: this.autoRefresh
             })
             })
           } else {
           } else {
+            if (this.isNewTopPage) {
+              TopNavigationComponentNew({
+                groupId: navItem.id,
+                topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
+                _currentNavIndex: $currentNavIndex,
+                bottomNavIndex: index,
+                currentBottomNavName: navItem.name,
+                assignChannel: this.assignChannel,
+                autoRefresh: this.autoRefresh
+              })
+            } else {
               TopNavigationComponent({
               TopNavigationComponent({
                 groupId: navItem.id,
                 groupId: navItem.id,
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
@@ -92,6 +104,8 @@ export struct BottomNavigationComponent {
                 autoRefresh: this.autoRefresh
                 autoRefresh: this.autoRefresh
               })
               })
             }
             }
+
+          }
         }
         }
         .tabBar(this.tabBarBuilder(navItem, index))
         .tabBar(this.tabBarBuilder(navItem, index))
 
 

@@ -99,7 +99,7 @@ export struct MultiPictureDetailPageComponent {
         index: $index,
         index: $index,
         currentIndex: $currentIndex,
         currentIndex: $currentIndex,
         showCommentList: $showCommentList,
         showCommentList: $showCommentList,
-        publishCommentModel: $publishCommentModel
+        // publishCommentModel: $publishCommentModel
       })
       })
 
 
     }
     }