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

+{
+  "float": [
+    {
+      "name": "font_size_10",
+      "value": "10fp"
+    },
+    {
+      "name": "font_size_11",
+      "value": "11fp"
+    },
+    {
+      "name": "font_size_12",
+      "value": "12fp"
+    },
+    {
+      "name": "font_size_13",
+      "value": "13fp"
+    },
+    {
+      "name": "font_size_14",
+      "value": "14fp"
+    },
+    {
+      "name": "font_size_16",
+      "value": "16fp"
+    },
+    {
+      "name": "normal_text_size",
+      "value": "16fp"
+    },
+    {
+      "name": "font_size_17",
+      "value": "17fp"
+    },
+    {
+      "name": "selected_text_size",
+      "value": "17vp"
+    },
+    {
+      "name": "font_size_18",
+      "value": "18fp"
+    },
+    {
+      "name": "font_size_24",
+      "value": "24fp"
+    },
+    {
+      "name": "font_size_20",
+      "value": "20fp"
+    },
+    {
+      "name": "font_size_36",
+      "value": "36fp"
+    },
+    {
+      "name": "margin_4_negative",
+      "value": "-4vp"
+    },
+    {
+      "name": "margin_6_negative",
+      "value": "-6vp"
+    },
+    {
+      "name": "main_margin",
+      "value": "14vp"
+    },
+    {
+      "name": "margin_4",
+      "value": "4vp"
+    },
+    {
+      "name": "margin_8",
+      "value": "8vp"
+    },
+    {
+      "name": "margin_9",
+      "value": "9vp"
+    },
+    {
+      "name": "label_margin_top",
+      "value": "10vp"
+    },
+    {
+      "name": "margin_12",
+      "value": "12vp"
+    },
+    {
+      "name": "margin_bottom_16",
+      "value": "16vp"
+    },
+    {
+      "name": "label_margin_bottom",
+      "value": "8vp"
+    },
+    {
+      "name": "single_row_03_item_width",
+      "value": "158vp"
+    },
+    {
+      "name": "single_row_03_item_height",
+      "value": "160vp"
+    },
+    {
+      "name": "margin_80",
+      "value": "80vp"
+    },
+    {
+      "name": "margin_2",
+      "value": "2vp"
+    },
+    {
+      "name": "margin_5",
+      "value": "5vp"
+    },
+    {
+      "name": "margin_7",
+      "value": "7vp"
+    },
+    {
+      "name": "margin_20",
+      "value": "20vp"
+    },
+    {
+      "name": "margin_24",
+      "value": "24vp"
+    },
+    {
+      "name": "margin_25",
+      "value": "25vp"
+    },
+    {
+      "name": "margin_28",
+      "value": "28vp"
+    },
+    {
+      "name": "margin_40",
+      "value": "40vp"
+    },
+    {
+      "name": "margin_48",
+      "value": "48vp"
+    },
+    {
+      "name": "margin_54",
+      "value": "54vp"
+    },
+    {
+      "name": "margin_60",
+      "value": "60vp"
+    },
+    {
+      "name": "margin_154",
+      "value": "154vp"
+    },
+    {
+      "name": "single_row_03_img_height",
+      "value": "88vp"
+    },
+    {
+      "name": "image_border_radius",
+      "value": "5vp"
+    },
+    {
+      "name": "button_border_radius",
+      "value": "3vp"
+    },
+    {
+      "name": "border_radius_6",
+      "value": "6vp"
+    },
+    {
+      "name": "bottom_navigation_margin_bottom",
+      "value": "4vp"
+    },
+    {
+      "name": "bottom_navigation_barHeight",
+      "value": "50vp"
+    },
+    {
+      "name": "top_tab_bar_height",
+      "value": "40vp"
+    },
+    {
+      "name": "top_tab_item_max_width",
+      "value": "300vp"
+    },
+    {
+      "name": "top_tab_item_min_width",
+      "value": "20vp"
+    },
+    {
+      "name": "top_tab_item_padding_horizontal",
+      "value": "7vp"
+    },
+    {
+      "name": "top_tab_item_padding_bottom",
+      "value": "2vp"
+    },
+    {
+      "name": "top_tab_item_padding_top",
+      "value": "5vp"
+    },
+    {
+      "name": "top_bar_height",
+      "value": "44vp"
+    },
+    {
+      "name": "top_arrow_size",
+      "value": "24vp"
+    },
+    {
+      "name": "margin_1",
+      "value": "1vp"
+    },
+    {
+      "name": "margin_6",
+      "value": "6vp"
+    },
+    {
+      "name": "margin_16",
+      "value": "16vp"
+    },
+    {
+      "name": "vp_20",
+      "value": "20vp"
+    },
+    {
+      "name": "margin_32",
+      "value": "32vp"
+    },
+    {
+      "name": "margin_36",
+      "value": "36vp"
+    },
+    {
+      "name": "margin_44",
+      "value": "44vp"
+    },
+    {
+      "name": "vp_3",
+      "value": "3vp"
+    },
+    {
+      "name": "vp_2",
+      "value": "2vp"
+    },
+    {
+      "name": "vp_55",
+      "value": "55vp"
+    },
+    {
+      "name": "vp_12",
+      "value": "12vp"
+    },
+    {
+      "name": "vp_4",
+      "value": "4vp"
+    },
+    {
+      "name": "vp_8",
+      "value": "8vp"
+    },
+    {
+      "name": "vp_16",
+      "value": "16vp"
+    },
+    {
+      "name": "vp_28",
+      "value": "28vp"
+    },
+    {
+      "name": "vp_80",
+      "value": "80vp"
+    },
+    {
+      "name": "card_comp_pagePadding_lf",
+      "value": "16fp"
+    },
+    {
+      "name": "card_comp_pagePadding_tb",
+      "value": "14fp"
+    },
+    {
+      "name": "margin_116",
+      "value": "116vp"
+    },
+    {
+      "name": "vp_11",
+      "value": "11vp"
+    },
+    {
+      "name": "vp_22",
+      "value": "22vp"
+    },
+    {
+      "name": "vp_14",
+      "value": "14vp"
+    },
+    {
+      "name": "vp_15",
+      "value": "15vp"
+    },
+    {
+      "name": "vp_18",
+      "value": "18vp"
+    },
+    {
+      "name": "vp_13",
+      "value": "13vp"
+    },
+    {
+      "name": "margin_115",
+      "value": "115vp"
+    }
+  ]
+}

@@ -64,6 +64,7 @@ export const enum CompStyle {
   Card_21 = '21', // 小视频卡人民号
   Card_21 = '21', // 小视频卡人民号
   Card_22 = '22', // 时间链
   Card_22 = '22', // 时间链
   Card_23 = '23', // 问政卡
   Card_23 = '23', // 问政卡
+  More_Comp= 'More_Comp', // 点击查看更多相似
 
 
 
 
 
 

@@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen
 
 
 export { PageComponent } from "./src/main/ets/components/page/PageComponent"
 export { PageComponent } from "./src/main/ets/components/page/PageComponent"
 
 
-export { BottomNavigationComponent } from "./src/main/ets/components/page/BottomNavigationComponent"
-
 export { LikeComponent } from "./src/main/ets/components/view/LikeComponent"
 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"
@@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
 
 
 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
 
 
-export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"
-
 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
 
 
 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
@@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo
 
 
 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel';
 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel';
 
 
+export { MultiPictureDetailItemComponent } from './src/main/ets/components/MultiPictureDetailItemComponent';
+
+export { OperRowListView } from './src/main/ets/components/view/OperRowListView';
+
+export { ImageDownloadComponent } from './src/main/ets/components/ImageDownloadComponent';
+
+export { PageRepository } from './src/main/ets/repository/PageRepository';
+
+export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
+
+export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';

@@ -14,7 +14,6 @@
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
-    "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdJsBridge": "file:../../commons/wdJsBridge",
     "wdJsBridge": "file:../../commons/wdJsBridge",

@@ -278,6 +278,7 @@ 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 startIndex = this.pics.length-1;
           let totalLen = this.pics.length+array.length;
           let totalLen = this.pics.length+array.length;
           if(totalLen > 3){
           if(totalLen > 3){
@@ -293,7 +294,7 @@ export struct FeedBackActivity {
             mediaFlag = true;
             mediaFlag = true;
             Logger.info(TAG, `select image/video uri: ${value}`);
             Logger.info(TAG, `select image/video uri: ${value}`);
           })
           })
-          if(this.pics.length<3){
+          if(this.pics.length<=3 && beforeLen != 3 && array.length != 3){
             this.addPic.id = startIndex
             this.addPic.id = startIndex
             this.pics[this.pics.length-1]=this.addPic;
             this.pics[this.pics.length-1]=this.addPic;
           }
           }

+/**
+ *   More_Comp
+ */
+const TAG: string = 'Card9Component';
+
+@Entry
+@Component
+export struct MoreComponent {
+
+  build() {
+    Row() {
+      Text('点击展开更多相似')
+        .fontSize(16)
+      Image($r('app.media.comment_unfold'))
+        .width(16)
+        .height(16)
+    }
+    .justifyContent(FlexAlign.Center)
+    .width('100%')
+    .height(48)
+    .backgroundColor(0xffffff)
+  }
+}

@@ -679,7 +679,7 @@ struct commentFooterView {
             .fontColor($r('app.color.color_666666'))
             .fontColor($r('app.color.color_666666'))
             .fontSize(14)
             .fontSize(14)
 
 
-          Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal'))
+          Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))
             .size({
             .size({
               width: 16,
               width: 16,
               height: 16
               height: 16

@@ -381,7 +381,7 @@ struct QualityCommentItem {
             })
             })
 
 
             Row() {
             Row() {
-              Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal'))
+              Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))
                 .width(16)
                 .width(16)
                 .height(16)
                 .height(16)
               if (this.item.likeNum && this.item.likeNum != '0') {
               if (this.item.likeNum && this.item.likeNum != '0') {

-import { LazyDataSource, NetworkUtil, StringUtils } from 'wdKit/Index';
+import { LazyDataSource, NetworkUtil, StringUtils, ToastUtils } from 'wdKit/Index';
 import { Remark, SubscribeMessageModel,
 import { Remark, SubscribeMessageModel,
   WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
   WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
@@ -88,13 +88,9 @@ export struct SubscribeMessageComponent{
     .width('100%')
     .width('100%')
   }
   }
 
 
-  @Builder ListLayout(){
-    List({scroller: this.scroller}) {
-      LazyForEach(this.data, (item: SubscribeMessageModel, index: number) => {
-        ListItem() {
-          SubscribeListChildComponent({ item: item })
-        }.width('100%')
-        .onClick(()=>{
+  jumpDetail(item: SubscribeMessageModel){
+    MinePageDatasModel.getAssertDetailData(item.relId,item.contentId,item.relType).then((value) => {
+      if(value == "1"){
         let action = {
         let action = {
           type:item.contentType,
           type:item.contentType,
           params:{
           params:{
@@ -106,6 +102,25 @@ export struct SubscribeMessageComponent{
           }
           }
         } as Action
         } as Action
         WDRouterRule.jumpWithPage(WDRouterPage.detailPlayLiveCommon, action)
         WDRouterRule.jumpWithPage(WDRouterPage.detailPlayLiveCommon, action)
+      }else{
+        ToastUtils.shortToast("内容不存在")
+      }
+    }).catch((err: Error) => {
+      console.log(TAG, JSON.stringify(err))
+    })
+
+
+
+  }
+
+  @Builder ListLayout(){
+    List({scroller: this.scroller}) {
+      LazyForEach(this.data, (item: SubscribeMessageModel, index: number) => {
+        ListItem() {
+          SubscribeListChildComponent({ item: item })
+        }.width('100%')
+        .onClick(()=>{
+          this.jumpDetail(item)
         })
         })
       })
       })
       //没有更多数据  显示提示
       //没有更多数据  显示提示

@@ -3,7 +3,7 @@ import { PrivacySettingModel } from '../../model/PrivacySettingModel'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
-import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
+import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
 
 
 const TAG = 'PrivacySettingPage';
 const TAG = 'PrivacySettingPage';
 const DiyString = '开启个性化推荐'
 const DiyString = '开启个性化推荐'
@@ -79,8 +79,19 @@ export struct PrivacySettingPage {
             }
             }
           }.onClick(() => {
           }.onClick(() => {
             if (item.privacyName == DiyString) {
             if (item.privacyName == DiyString) {
+              trackButtonClick("privacySettingPagePersonalizedRecommendations")
               return
               return
             }
             }
+            if(item.privacyName == "相册权限"){
+              trackButtonClick("privacySettingPageAlbumPermissions")
+            }else if(item.privacyName == "相机权限"){
+              trackButtonClick("privacySettingPageCameraPermissions")
+            }else if(item.privacyName == "定位权限"){
+              trackButtonClick("privacySettingPageLocationPermissions")
+            }else if(item.privacyName == "麦克风权限"){
+              trackButtonClick("privacySettingPageMicrophonePermissions")
+            }
+
             if (!item.permission) {
             if (!item.permission) {
               //跳转权限设置
               //跳转权限设置
               const permissionUtil = new PermissionUtil();
               const permissionUtil = new PermissionUtil();
@@ -213,3 +224,7 @@ struct getTuiJianCell {
     .padding({ left: '29lpx', right: '29lpx' })
     .padding({ left: '29lpx', right: '29lpx' })
   }
   }
 }
 }
+
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.Privacy_Setting, TrackConstants.PageName.Privacy_Setting)
+}

@@ -4,7 +4,7 @@ import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { Action, Params } from 'wdBean';
 import { Action, Params } from 'wdBean';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
-import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
+import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -67,6 +67,4 @@ struct SettingPage {
 
 
 export { SettingPage };
 export { SettingPage };
 
 
-/*
 
 
-* */

 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { AppUtils, StringUtils } from 'wdKit/Index';
 import { AppUtils, StringUtils } from 'wdKit/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
+import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 import { CustomTitleUI } from '../reusable/CustomTitleUI';
 import { CustomTitleUI } from '../reusable/CustomTitleUI';
 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog';
 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog';
 
 
@@ -58,9 +59,11 @@ export struct AboutPageUI {
             this.getArrowCell(item, index)
             this.getArrowCell(item, index)
           }.onClick(() => {
           }.onClick(() => {
             if (index == 0) {
             if (index == 0) {
+              trackButtonClick("aboutPagePrivacyAgreement")
               let bean = { contentID: "2", pageID: "" } as Params
               let bean = { contentID: "2", pageID: "" } as Params
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
             } else if(index == 1){
             } else if(index == 1){
+              trackButtonClick("aboutPageUserAgreement")
               let bean = { contentID: "1", pageID: "" } as Params
               let bean = { contentID: "1", pageID: "" } as Params
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
               WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
             }else if(index == 2){
             }else if(index == 2){
@@ -124,4 +127,8 @@ export struct AboutPageUI {
   }
   }
 }
 }
 
 
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.About, TrackConstants.PageName.About)
+}
+
 
 

-
-import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';
-import { Logger, SPHelper, ToastUtils, UserDataLocal, EmitterEventId, EmitterUtils } from 'wdKit';
-import { TopNavigationComponent } from '../page/TopNavigationComponent';
-import PageViewModel from '../../viewmodel/PageViewModel';
+import {  SpConstants } from 'wdConstant';
+import { Logger, SPHelper, ToastUtils,  EmitterEventId, EmitterUtils } from 'wdKit';
 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
-import storageStatistics from "@ohos.file.storageStatistics";
-import { BusinessError } from '@ohos.base';
-import ArrayList from '@ohos.util.ArrayList';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
-import { SettingPasswordParams } from 'wdLogin';
 import { LoginViewModel } from 'wdLogin/src/main/ets/pages/login/LoginViewModel';
 import { LoginViewModel } from 'wdLogin/src/main/ets/pages/login/LoginViewModel';
-import { Router } from '@ohos.arkui.UIContext';
 import promptAction from '@ohos.promptAction';
 import promptAction from '@ohos.promptAction';
 import { LogoutViewModel } from '../../viewmodel/LogoutViewModel';
 import { LogoutViewModel } from '../../viewmodel/LogoutViewModel';
 import { CustomLogoutDialog } from './CustomLogoutDialog';
 import { CustomLogoutDialog } from './CustomLogoutDialog';
 import { emitter } from '@kit.BasicServicesKit';
 import { emitter } from '@kit.BasicServicesKit';
 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog';
 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog';
-
+import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 export { SettingPasswordParams } from "wdLogin"
 export { SettingPasswordParams } from "wdLogin"
 
 
 @Component
 @Component
@@ -183,9 +175,11 @@ export struct AccountAndSecurityLayout {
             .onClick(() => {
             .onClick(() => {
               console.log(index + "")
               console.log(index + "")
               if (index == 0){
               if (index == 0){
+                trackButtonClick("accountManagementPageChangePhoneNumber")
                 let pageType = {'pageType': 2} as Record<string, number>;
                 let pageType = {'pageType': 2} as Record<string, number>;
                 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
               }else if (index == 1) {
               }else if (index == 1) {
+                trackButtonClick("accountManagementPageAccountManagementPassword")
                 if (this.ifSetPassword) {
                 if (this.ifSetPassword) {
                   //修改密码
                   //修改密码
                   WDRouterRule.jumpWithPage(WDRouterPage.modifyPasswordPage)
                   WDRouterRule.jumpWithPage(WDRouterPage.modifyPasswordPage)
@@ -195,6 +189,7 @@ export struct AccountAndSecurityLayout {
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                   WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                 }
                 }
               }else if (index == 3) {
               }else if (index == 3) {
+                trackButtonClick("accountManagementPageAccountCancellation")
                 this.isAccountPage=false
                 this.isAccountPage=false
                 // WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
                 // WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
               }
               }
@@ -215,6 +210,7 @@ export struct AccountAndSecurityLayout {
 
 
       Column() {
       Column() {
         Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal}).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').borderRadius('8lpx').onClick(()=>{
         Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal}).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').borderRadius('8lpx').onClick(()=>{
+          trackButtonClick("accountManagementPageLogout")
           this.confirmDialogController.open()
           this.confirmDialogController.open()
         })
         })
       }
       }
@@ -516,3 +512,7 @@ export struct AccountArrowCell{
     .height('54lpx')
     .height('54lpx')
   }
   }
 }
 }
+
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.Account_Management, TrackConstants.PageName.Account_Management)
+}

@@ -15,6 +15,7 @@ import common from '@ohos.app.ability.common';
 import dataPreferences from '@ohos.data.preferences';
 import dataPreferences from '@ohos.data.preferences';
 import { TitleBackComponent } from './TitleBackComponent';
 import { TitleBackComponent } from './TitleBackComponent';
 import { MyCustomDialog } from '../reusable/MyCustomDialog';
 import { MyCustomDialog } from '../reusable/MyCustomDialog';
+import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 
 
 @Component
 @Component
 export struct MineSettingComponent {
 export struct MineSettingComponent {
@@ -74,11 +75,6 @@ export struct MineSettingComponent {
   }
   }
 
 
   build() {
   build() {
-    // Navigation() {
-    //   //滑动区域
-    //   this.settingList()
-    // }.titleMode(NavigationTitleMode.Mini)
-    // .title('设置')
     Column(){
     Column(){
       TitleBackComponent({title:"设置"})
       TitleBackComponent({title:"设置"})
       this.settingList()
       this.settingList()
@@ -154,15 +150,19 @@ export struct MineSettingComponent {
             .selectedColor("#ED2800")
             .selectedColor("#ED2800")
             .onChange((isOn: boolean) => {
             .onChange((isOn: boolean) => {
               if(item.itemType=='push_switch'){
               if(item.itemType=='push_switch'){
+                trackButtonClick("settingPagePushSwitch")
                 //推送
                 //推送
                 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn)
               }else if(item.itemType=='wifi_switch'){
               }else if(item.itemType=='wifi_switch'){
+                trackButtonClick("settingPageOnlyWifiNetworkLoadPicture")
                 //wifi 图片
                 //wifi 图片
                 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn)
               }else if(item.itemType=='video_switch'){
               }else if(item.itemType=='video_switch'){
+                trackButtonClick("settingPageAutomaticallyPlayVideoOnWifiNetwork")
                 //wifi 视频
                 //wifi 视频
                 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn)
               }else if(item.itemType=='suspensionState_switch'){
               }else if(item.itemType=='suspensionState_switch'){
+                trackButtonClick("settingPagePlayerFloatingWindowSwitchClick")
                 //悬浮窗
                 //悬浮窗
                 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn)
               }
               }
@@ -214,13 +214,16 @@ export struct MineSettingComponent {
     .height('54lpx')
     .height('54lpx')
     .onClick(() => {
     .onClick(() => {
       if (item.itemType == 'account') {
       if (item.itemType == 'account') {
+        trackButtonClick("settingPageAccountManagement")
         let params: Params = {
         let params: Params = {
           pageID: 'AccountAndSecurityLayout'
           pageID: 'AccountAndSecurityLayout'
         }
         }
         WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
         WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
       } else if (item.itemType == 'private_setting') {
       } else if (item.itemType == 'private_setting') {
         WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
         WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
+        trackButtonClick("settingPagePrivacySettings")
       } else if (item.itemType == 'clear_cache') {
       } else if (item.itemType == 'clear_cache') {
+        trackButtonClick("settingPageClearCache")
         this.dialogController.open()
         this.dialogController.open()
       }
       }
     })
     })
@@ -264,3 +267,7 @@ export struct MineSettingComponent {
     this.preferences.on('change', observer);
     this.preferences.on('change', observer);
   }
   }
 }
 }
+
+function trackButtonClick(buttonName: string){
+  TrackingButton.click(buttonName, TrackConstants.PageName.Setting, TrackConstants.PageName.Setting)
+}

@@ -724,6 +724,31 @@ class MinePageDatasModel{
     return WDHttp.get<ResponseDTO<String>>(url)
     return WDHttp.get<ResponseDTO<String>>(url)
   };
   };
 
 
+
+  /**
+   * 预约消息 查询详情
+   * @returns
+   */
+  getAssertDetailData(relId:string,contentId:string,relType:string): Promise<String> {
+    return new Promise<String>((success, error) => {
+      this.fetchAssertDetailData(relId,contentId,relType).then((navResDTO: ResponseDTO<String>) => {
+        console.log(TAG,JSON.stringify(navResDTO))
+        if (!navResDTO || StringUtils.isEmpty(navResDTO.data)) {
+          success("0");
+          return
+        }
+        success("1");
+      }).catch((err: Error) => {
+        error(err)
+      })
+    })
+  }
+
+  fetchAssertDetailData(relId:string,contentId:string,relType:string) {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.DETAIL_PATH + `?relId=${relId}&contentId=${contentId}&relType=${relType}`
+    return WDHttp.get<ResponseDTO<String>>(url)
+  };
+
 }
 }
 
 
 const minePageDatasModel = MinePageDatasModel.getInstance()
 const minePageDatasModel = MinePageDatasModel.getInstance()

@@ -15,7 +15,7 @@
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
-    //    "wdComponent": "file:../../features/wdComponent"
+    "wdComponent": "file:../../features/wdComponent",
     "wdShare": "file:../../features/wdShare"
     "wdShare": "file:../../features/wdShare"
   }
   }
 }
 }

-import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } from 'wdComponent';
+import { LogoutViewModel, PermissionDesComponent } from 'wdComponent';
 import { BreakpointConstants } from 'wdConstant';
 import { BreakpointConstants } from 'wdConstant';
 
 
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
@@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { ProcessUtils } from 'wdRouter/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
+import { BottomNavigationComponent } from './view/BottomNavigationComponent';
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 

 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
-import { MultiPictureDetailPageComponent } from 'wdComponent';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { Params, Action } from 'wdBean';
 import { Params, Action } from 'wdBean';
 import { WindowModel } from 'wdKit/Index';
 import { WindowModel } from 'wdKit/Index';
+import { MultiPictureDetailPageComponent } from '../view/MultiPictureDetailPageComponent';
+
 const TAG = 'MultiPictureDetailPage';
 const TAG = 'MultiPictureDetailPage';
 
 
 /**
 /**

 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
-import { TopNavigationComponent } from './TopNavigationComponent';
-import { MinePageComponent } from './MinePageComponent';
-import { CompUtils } from '../../utils/CompUtils';
-import ChannelViewModel from '../../viewmodel/ChannelViewModel';
-import HomeChannelUtils, { AssignChannelParam } from 'wdRouter';
-import { VideoChannelPage } from './VideoChannelPage';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
+import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
+import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
+import { CompUtils, TopNavigationComponent } from 'wdComponent/Index';
+import { VideoChannelPage } from './VideoChannelPage';
+import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
 
 
 const TAG = 'BottomNavigationComponent';
 const TAG = 'BottomNavigationComponent';
 let storage = LocalStorage.getShared();
 let storage = LocalStorage.getShared();

@@ -8,23 +8,21 @@ import {
   postInteractAccentionOperateParams,
   postInteractAccentionOperateParams,
   Params
   Params
 } from 'wdBean';
 } from 'wdBean';
-import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import display from '@ohos.display';
 import display from '@ohos.display';
-import font from '@ohos.font';
-import { OperRowListView } from './view/OperRowListView';
-import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
-import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
-import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
-import { EmptyComponent } from './view/EmptyComponent';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
-import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { PageRepository } from '../repository/PageRepository';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { router } from '@kit.ArkUI';
 import { router } from '@kit.ArkUI';
-import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index';
 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index';
+import { EmptyComponent,
+  ImageDownloadComponent,
+  MultiPictureDetailItemComponent,
+  MultiPictureDetailViewModel,
+  OperRowListView,
+  PageRepository,
+  publishCommentModel,
+  viewBlogItemInsightIntentShare} from 'wdComponent/Index';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
 
 

@@ -4,9 +4,9 @@
  */
  */
 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index'
 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index'
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
-import { PageComponent } from './PageComponent';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
+import { PageComponent } from 'wdComponent/Index';
 
 
 const TAG = 'VideoChannelPage'
 const TAG = 'VideoChannelPage'