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

* 'main' of http://192.168.1.42/developOne/harmonyPool: (41 commits)
  desc:消息 圆点
  fix: 16931 功能缺陷-进入文化频道-点击视频没有跳转到视频播放页，实际跳转到文章详情页
  fix:17465 功能缺陷-【uat】 进入直播预告页，预约按钮，变成了关注按钮
  fix: 17212 人民号作品列表在作品数量较少时上滑无反应
  fix: 17458 功能缺陷-进入直播间，点击已预约按钮，没有变为预约
  视频频道点击底部或顶部tab刷新页面
  feat（广告稿件）：删除广告稿件
  fix: 点赞
  feat（广告稿件）：删除广告稿件
  fix: 调整
  评论-收藏
  遗漏图片
  修改点赞按钮样式与增加直播点赞数量累加逻辑,直播中lottie动画
  fix:bug[17204] 搜索结果>人民号，只有1个号主信息，不应展示更多
  fix:增加跳转登录页
  fix: 信息流卡片互动 debug
  fix(动态详情)：屏蔽重复点击事件
  fix: commentInfo.ets添加newstype
  fix: 17034 功能缺陷--评论卡，点击爱心后，用android 查看精品评论页，爱心没有加1
  fix:17316 已投票账号访问投票专题，页面展示错误
  ...

@@ -60,4 +60,6 @@ export { MpaasUtils } from './src/main/ets/mpaas/MpaasUtils'
 
 
 export { MpaasUpgradeCheck, UpgradeTipContent } from './src/main/ets/mpaas/MpaasUpgradeCheck'
 export { MpaasUpgradeCheck, UpgradeTipContent } from './src/main/ets/mpaas/MpaasUpgradeCheck'
 
 
-export { TingyunAPM } from './src/main/ets/tingyunAPM/TingyunAPM'
+export { TingyunAPM } from './src/main/ets/tingyunAPM/TingyunAPM'
+
+export { FastClickUtil } from './src/main/ets/utils/FastClickUtil';

+import systemDateTime from '@ohos.systemDateTime';
+
+/**
+ * 屏蔽快速点击事件，规定时间内只触发一次
+ */
+export class FastClickUtil {
+
+  static MIN_DELAY_TIME = 500
+
+  static minDelayBeforeTime = 0
+
+  static async  isMinDelayTime(): Promise<boolean> {
+    let systime = await systemDateTime.getCurrentTime();
+    return new Promise<boolean>((success, error) => {
+      let rtnvalue = systime - FastClickUtil.minDelayBeforeTime <= FastClickUtil.MIN_DELAY_TIME;
+      this.minDelayBeforeTime = systime;
+      success(rtnvalue);
+    })
+  }
+}
+

@@ -309,6 +309,25 @@ export class HttpUrlUtils {
    * 查询是否设置过密码checkSetPassword
    * 查询是否设置过密码checkSetPassword
    */
    */
   static readonly CHECK_SET_PASSWORD_PATH: string = "/api/rmrb-user-center/user/zh/c/ifSetPassword";
   static readonly CHECK_SET_PASSWORD_PATH: string = "/api/rmrb-user-center/user/zh/c/ifSetPassword";
+  /**
+   * 获取oss 配置
+   */
+  static readonly OSS_PARAMS_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/oss/configs";
+
+  /**
+   * 获取上传OSS token
+   */
+  static readonly STS_TOKEN_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/oss/stsToken";
+
+  /**
+   * 获取意见反馈类型
+   */
+  static readonly FEEDBACK_TYPE_PATH: string = "/api/rmrb-interact/interact/c/user/optionClassify/list";
+
+  /**
+   * 查询点赞、回复我的、系统消息的未读数量以及回复/评论人
+   */
+  static readonly MESSAGE_UN_READ_DATA_PATH: string = "/api/rmrb-inside-mail/zh/c/inside-mail/private/polymerizationInfo?createTime=";
 
 
   static getHost(): string {
   static getHost(): string {
     return HostManager.getHost();
     return HostManager.getHost();
@@ -717,4 +736,10 @@ export class HttpUrlUtils {
     return url;
     return url;
   }
   }
 
 
+  //获取消息未读接口
+  static getMessageUnReadDataUrl() {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.MESSAGE_UN_READ_DATA_PATH
+    return url
+  }
+
 }
 }

@@ -92,6 +92,8 @@ export function registerRouter() {
       return WDRouterPage.liveMorePage
       return WDRouterPage.liveMorePage
     } else if (action.params?.pageID == "ORDER_MORE_PAGE") {
     } else if (action.params?.pageID == "ORDER_MORE_PAGE") {
       return WDRouterPage.reserveMorePage
       return WDRouterPage.reserveMorePage
+    } else if (action.params?.pageID == "FeedBackActivity") {
+      return WDRouterPage.feedBackActivity
     }
     }
     return undefined
     return undefined
   })
   })

@@ -133,4 +133,7 @@ export class WDRouterPage {
   static columnPage = new WDRouterPage("phone", "ets/pages/column/ColumnPage");
   static columnPage = new WDRouterPage("phone", "ets/pages/column/ColumnPage");
   //展示头像
   //展示头像
   static showUserHeaderPage = new WDRouterPage("wdComponent", "ets/pages/ShowUserHeaderPage");
   static showUserHeaderPage = new WDRouterPage("wdComponent", "ets/pages/ShowUserHeaderPage");
+
+  //意见反馈
+  static feedBackActivity = new WDRouterPage("wdComponent", "ets/components/FeedBackActivity");
 }
 }

@@ -108,7 +108,11 @@ export class ProcessUtils {
         break;
         break;
       case ContentConstants.TYPE_TELETEXT:
       case ContentConstants.TYPE_TELETEXT:
       // 图文详情，跳转h5
       // 图文详情，跳转h5
-        ProcessUtils.gotoWeb(content);
+        if(content?.linkUrl){ //有 linkUrl 走专题页展示逻辑
+          ProcessUtils.gotoSpecialTopic(content)
+        }else{
+          ProcessUtils.gotoWeb(content);
+        }
         break;
         break;
       case ContentConstants.TYPE_LINK:
       case ContentConstants.TYPE_LINK:
         ProcessUtils.gotoDefaultWeb(content);
         ProcessUtils.gotoDefaultWeb(content);
@@ -441,4 +445,26 @@ export class ProcessUtils {
     let params = { 'creatorId': creatorId } as Record<string, string>;
     let params = { 'creatorId': creatorId } as Record<string, string>;
     WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
     WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
   }
   }
+
+  /**
+   * 意见反馈
+   */
+  public static gotoFeedBackActivity() {
+    let taskAction: Action = {
+      type: 'JUMP_INNER_NEW_PAGE',
+      params: {
+        pageID: 'FeedBackActivity'
+      } as Params,
+    };
+
+    WDRouterRule.jumpWithAction(taskAction)
+  }
+
+  /**
+   * 跳转到登录页
+   */
+  public static gotoLoginPage() {
+
+    WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+  }
 }
 }

@@ -39,14 +39,14 @@ class AppLoginAuthInfo {
 }
 }
 
 
 interface IDataJson {
 interface IDataJson {
-  jumpType:number
-  jumpUrl:string
-  newsId:string
-  newsObjectLevel:string
-  newsObjectType:number
-  newsRelId:string
-  newsTitle:string
-  pageId:string
+  jumpType: number
+  jumpUrl: string
+  newsId: string
+  newsObjectLevel: string
+  newsObjectType: number
+  newsRelId: string
+  newsTitle: string
+  pageId: string
 }
 }
 
 
 /**
 /**
@@ -159,59 +159,64 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
   content.objectType = '';
   content.objectType = '';
   content.linkUrl = encodeURI(urlParams.get('url') || '');
   content.linkUrl = encodeURI(urlParams.get('url') || '');
   switch (urlParams.get('type')) {
   switch (urlParams.get('type')) {
-      case 'video':
-        content.objectType = ContentConstants.TYPE_VOD
-        ProcessUtils.processPage(content)
-        break;
-      case 'live':
-        content.objectType = ContentConstants.TYPE_LIVE
-        ProcessUtils.processPage(content)
-        break;
-      case 'article':
-        content.objectType = ContentConstants.TYPE_TELETEXT
-        ProcessUtils.processPage(content)
-        break;
-      case 'picture':
-        content.objectType = ContentConstants.TYPE_NINE
-        ProcessUtils.processPage(content)
-        break;
-      case 'audio':
-        content.objectType = ContentConstants.TYPE_AUDIO
+    case 'video':
+      content.objectType = ContentConstants.TYPE_VOD
+      ProcessUtils.processPage(content)
+      break;
+    case 'live':
+      content.objectType = ContentConstants.TYPE_LIVE
+      ProcessUtils.processPage(content)
+      break;
+    case 'article':
+      content.objectType = ContentConstants.TYPE_TELETEXT
+      ProcessUtils.processPage(content)
+      break;
+    case 'picture':
+      content.objectType = ContentConstants.TYPE_NINE
+      ProcessUtils.processPage(content)
+      break;
+    case 'audio':
+      content.objectType = ContentConstants.TYPE_AUDIO
+      ProcessUtils.processPage(content)
+      break;
+    case 'h5':
+      if (urlParams.get('skipType') === '1') {
+        content.objectType = ContentConstants.TYPE_LINK
         ProcessUtils.processPage(content)
         ProcessUtils.processPage(content)
-        break;
-      case 'h5':
-        if (urlParams.get('skipType') === '1') {
-          content.objectType = ContentConstants.TYPE_LINK
-          ProcessUtils.processPage(content)
-        }
-        if (urlParams.get('skipType') === '4') {
-          content.objectType = ContentConstants.TYPE_LINK
-          ProcessUtils.jumpExternalWebPage(content.linkUrl)
-        }
-        break;
-      case 'topic':
-        if (urlParams.get('subType') === 'h5') {
-          content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
-          ProcessUtils.processPage(content)
-        }
-        if (urlParams.get('subType') === 'moring_evening_news') {
-          ProcessUtils.gotoMorningEveningPaper()
-        }
-        if (urlParams.get('subType') === 'electronic_newspapers') {
-          ProcessUtils.gotoENewsPaper()
-        }
-        break;
-      case 'dynamic':
-        content.objectType = ContentConstants.TYPE_FOURTEEN
+      }
+      if (urlParams.get('skipType') === '4') {
+        content.objectType = ContentConstants.TYPE_LINK
+        ProcessUtils.jumpExternalWebPage(content.linkUrl)
+      }
+      break;
+    case 'topic':
+      if (urlParams.get('subType') === 'h5') {
+        content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
         ProcessUtils.processPage(content)
         ProcessUtils.processPage(content)
-        break;
-      case 'owner_page':
-        let creatorId = urlParams.get('creatorId') || ''
-        ProcessUtils.gotoPeopleShipHomePage(creatorId)
-        break;
-      default:
-        break;
-    }
+      }
+      if (urlParams.get('subType') === 'moring_evening_news') {
+        ProcessUtils.gotoMorningEveningPaper()
+      }
+      if (urlParams.get('subType') === 'electronic_newspapers') {
+        ProcessUtils.gotoENewsPaper()
+      }
+      break;
+    case 'dynamic':
+      content.objectType = ContentConstants.TYPE_FOURTEEN
+      ProcessUtils.processPage(content)
+      break;
+    case 'owner_page':
+      let creatorId = urlParams.get('creatorId') || ''
+      ProcessUtils.gotoPeopleShipHomePage(creatorId)
+      break;
+    case 'app':
+      if (urlParams.get('subType') === 'login') {
+        ProcessUtils.gotoLoginPage()
+      }
+      break;
+    default:
+      break;
+  }
 
 
 }
 }
 
 

 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
-import { H5ReceiveDataJsonBean, postBatchAttentionStatusResult } from 'wdBean';
-import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
+import { WDHttp, HttpUrlUtils } from 'wdNetwork';
 
 
 const TAG = 'JsCallAppService'
 const TAG = 'JsCallAppService'
 
 
 
 
 export function handleJsCallAppService(data: Message, callback: (res: string) => void) {
 export function handleJsCallAppService(data: Message, callback: (res: string) => void) {
-  let url: string = HttpUrlUtils.getHost() + data?.data?.url
+  if (data?.data?.method === 'get') {
+    let queryString: string = ''
+    let parameters = data?.data?.parameters
+    if (parameters) {
+      queryString = Object.keys(parameters)
+        .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(parameters?.[key])}`)
+        .join('&');
+    }
 
 
-  let responseMap: ResponseDTO<postBatchAttentionStatusResult> = {} as ResponseDTO<postBatchAttentionStatusResult>
-
-  let h5ReceiveDataJson: H5ReceiveDataJsonBean<ResponseDTO<postBatchAttentionStatusResult>> = {
-    netError: '0',
-    responseMap
-  } as H5ReceiveDataJsonBean<ResponseDTO<postBatchAttentionStatusResult>>
+    let url: string = HttpUrlUtils.getHost() + data?.data?.url
+    if (queryString) {
+      url = url + `?${queryString}`
+    }
+    console.log('yzl', queryString, url)
+    WDHttp.get(url).then((res) => {
+      callback(JSON.stringify({
+        netError: '0',
+        responseMap: res
+      }))
+    })
+  }
+  if (data?.data?.method === 'post') {
+    let url: string = HttpUrlUtils.getHost() + data?.data?.url
 
 
-  // if (data?.data?.method === 'get') {
-  //   WDHttp.get<ResponseDTO<postBatchAttentionStatusResult>>(url, headers).then((res: ResponseDTO<postBatchAttentionStatusResult>) => {
-  //     callback(JSON.stringify(res))
-  //   })
-  // }
-  if (data?.data?.method === 'post' && data?.data?.url === '/api/rmrb-interact/interact/zh/c/batchAttention/status') {
-    WDHttp.post<ResponseDTO<postBatchAttentionStatusResult>>(url, data?.data?.parameters).then((res: ResponseDTO<postBatchAttentionStatusResult>) => {
-      h5ReceiveDataJson.responseMap = res
-      callback(JSON.stringify(h5ReceiveDataJson))
+    WDHttp.post(url, data?.data?.parameters).then((res) => {
+      callback(JSON.stringify({
+        netError: '0',
+        responseMap: res
+      }))
     })
     })
   }
   }
 }
 }

@@ -172,3 +172,6 @@ export { MasterDetailRes } from './src/main/ets/bean/user/MasterDetailRes';
 
 
 export { ReserveItemBean } from './src/main/ets/bean/live/ReserveItemBean';
 export { ReserveItemBean } from './src/main/ets/bean/live/ReserveItemBean';
 
 
+
+
+export { FeedbackTypeBean } from './src/main/ets/bean/detail/FeedbackTypeBean';

@@ -84,7 +84,7 @@ export class ContentDTO implements BaseDTO {
   openType: string = '';
   openType: string = '';
   extra: string = ''
   extra: string = ''
 
 
-  static clone(old:ContentDTO): ContentDTO {
+  static clone(old: ContentDTO): ContentDTO {
     let content = new ContentDTO();
     let content = new ContentDTO();
     content.appStyle = old.appStyle;
     content.appStyle = old.appStyle;
     content.cityCode = old.cityCode;
     content.cityCode = old.cityCode;

 export interface commentInfo {
 export interface commentInfo {
   commentTitle: string,
   commentTitle: string,
   newsTitle: string,
   newsTitle: string,
-  userName: string,
-  userHeaderUrl: string,
+  userId?: string,
+  userName?: string,
+  userHeaderUrl?: string,
   publishTime: number,
   publishTime: number,
   commentId: string,
   commentId: string,
   newsId: string,
   newsId: string,
   relId: string;
   relId: string;
   relType: string;
   relType: string;
-  userId: string;
+  newsType?: string,
+  objectType?: string,
 }
 }

+export interface FeedbackTypeBean {
+  classifyName: string;
+  id: number;
+  isselect: boolean;
+}

@@ -57,6 +57,8 @@ export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailCompo
 
 
 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
 
 
+export { FeedBackActivity } from "./src/main/ets/components/FeedBackActivity"
+
 export { AudioSuspensionModel } from "./src/main/ets/viewmodel/AudioSuspensionModel"
 export { AudioSuspensionModel } from "./src/main/ets/viewmodel/AudioSuspensionModel"
 
 
 export { BroadcastPageComponent } from "./src/main/ets/components/broadcast/BroadcastPageComponent"
 export { BroadcastPageComponent } from "./src/main/ets/components/broadcast/BroadcastPageComponent"
@@ -65,7 +67,7 @@ export { FirstTabTopSearchComponent } from "./src/main/ets/components/search/Fir
 
 
 export { ListHasNoMoreDataUI } from "./src/main/ets/components/reusable/ListHasNoMoreDataUI"
 export { ListHasNoMoreDataUI } from "./src/main/ets/components/reusable/ListHasNoMoreDataUI"
 
 
-export { LottieView } from './src/main/ets/lottie/LottieView'
+export { LottieView } from './src/main/ets/components/lottie/LottieView'
 
 
 export { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopicPageComponent'
 export { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopicPageComponent'
 
 

-import { CommonConstants, CompStyle } from 'wdConstant';
-import { ContentDTO } from 'wdBean';
+import { CompStyle } from 'wdConstant';
+import { CompDTO, ContentDTO } from 'wdBean';
 import { Card2Component } from './cardview/Card2Component';
 import { Card2Component } from './cardview/Card2Component';
 import { Card3Component } from './cardview/Card3Component';
 import { Card3Component } from './cardview/Card3Component';
 import { Card4Component } from './cardview/Card4Component';
 import { Card4Component } from './cardview/Card4Component';
@@ -24,13 +24,14 @@ import { Card21Component } from './cardview/Card21Component';
 @Component
 @Component
 export struct CardParser {
 export struct CardParser {
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
+  @State compDTO: CompDTO = {} as CompDTO
 
 
   build() {
   build() {
-    this.contentBuilder(this.contentDTO);
+    this.contentBuilder(this.contentDTO, this.compDTO);
   }
   }
 
 
   @Builder
   @Builder
-  contentBuilder(contentDTO: ContentDTO) {
+  contentBuilder(contentDTO: ContentDTO, compDTO: CompDTO) {
     if (contentDTO.appStyle === CompStyle.Card_02) {
     if (contentDTO.appStyle === CompStyle.Card_02) {
       Card2Component({ contentDTO })
       Card2Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_03) {
     } else if (contentDTO.appStyle === CompStyle.Card_03) {
@@ -38,7 +39,7 @@ export struct CardParser {
     } else if (contentDTO.appStyle === CompStyle.Card_04) {
     } else if (contentDTO.appStyle === CompStyle.Card_04) {
       Card4Component({ contentDTO })
       Card4Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_05) {
     } else if (contentDTO.appStyle === CompStyle.Card_05) {
-      Card5Component({ contentDTO })
+      Card5Component({ contentDTO, titleShowPolicy: compDTO.titleShowPolicy })
     } 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({ contentDTO })
       Card6Component({ contentDTO })
@@ -64,8 +65,7 @@ export struct CardParser {
       Card20Component({ contentDTO })
       Card20Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_21) {
     } else if (contentDTO.appStyle === CompStyle.Card_21) {
       Card21Component({ contentDTO })
       Card21Component({ contentDTO })
-    }
-    else {
+    } else {
       // todo:组件未实现 / Component Not Implemented
       // todo:组件未实现 / Component Not Implemented
       // Text(contentDTO.appStyle)
       // Text(contentDTO.appStyle)
       //   .width(CommonConstants.FULL_PARENT)
       //   .width(CommonConstants.FULL_PARENT)

-import { SPHelper,Logger,ToastUtils } from 'wdKit';
-import { ContentDetailDTO, Action, ContentDTO,batchLikeAndCollectResult } from 'wdBean';
+import { SPHelper, Logger, ToastUtils } from 'wdKit';
+import { ContentDetailDTO, Action, ContentDTO, batchLikeAndCollectResult } from 'wdBean';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { batchLikeAndCollectParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { batchLikeAndCollectParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { WDShare } from 'wdShare/Index';
 import { WDShare } from 'wdShare/Index';
-import {LikeComponent} from './view/LikeComponent'
+import { LikeComponent } from './view/LikeComponent'
+
 const TAG = 'CarderInteraction'
 const TAG = 'CarderInteraction'
+
 /**
 /**
  * 卡片 分享、评论、点赞公用组件
  * 卡片 分享、评论、点赞公用组件
  */
  */
@@ -15,9 +17,10 @@ const TAG = 'CarderInteraction'
 export struct CarderInteraction {
 export struct CarderInteraction {
   @Prop contentDTO: ContentDTO
   @Prop contentDTO: ContentDTO
   @State contentId: string = ''
   @State contentId: string = ''
-  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
-  @State newsStatusOfUser: batchLikeAndCollectResult = {} as batchLikeAndCollectResult// 点赞、收藏状态
+  @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @State newsStatusOfUser: batchLikeAndCollectResult = {} as batchLikeAndCollectResult // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
   @State likeBean: Record<string, string> = {}
+
   async aboutToAppear() {
   async aboutToAppear() {
     await this.getContentDetailData()
     await this.getContentDetailData()
     // 点赞需要数据
     // 点赞需要数据
@@ -28,51 +31,55 @@ export struct CarderInteraction {
     this.likeBean['userHeaderUrl'] = this.contentDetailData.userInfo?.headPhotoUrl + ''
     this.likeBean['userHeaderUrl'] = this.contentDetailData.userInfo?.headPhotoUrl + ''
     this.likeBean['channelId'] = this.contentDetailData.reLInfo?.channelId + ''
     this.likeBean['channelId'] = this.contentDetailData.reLInfo?.channelId + ''
   }
   }
-   build() {
-      Row(){
-        Row(){
-          Image($r('app.media.CarderInteraction_share'))
-            .width(18)
-            .height(18)
-          Text('分享')
-            .margin({left:4})
-            .fontSize(14)
-            .fontColor('#666666')
-        }
-        .justifyContent(FlexAlign.Center)
-        .onClick(()=>{
-          WDShare.shareContent(this.contentDetailData)
-        })
-        Row(){
-          Image($r('app.media.CarderInteraction_comment'))
-            .width(18)
-            .height(18)
-          Text('评论')
-            .margin({left:4})
-            .fontSize(14)
-            .fontColor('#666666')
-        }
-        .justifyContent(FlexAlign.Center)
-        .onClick(()=>{
-          ProcessUtils.processPage(this.contentDTO)
-        })
-        this.builderLike()
+
+  build() {
+    Row() {
+      Row() {
+        Image($r('app.media.CarderInteraction_share'))
+          .width(18)
+          .height(18)
+        Text('分享')
+          .margin({ left: 4 })
+          .fontSize(14)
+          .fontColor('#666666')
       }
       }
-     .width('100%')
-      .margin({top:11})
-     .padding({
-       left:21,
-       right:21
-     })
-     .justifyContent(FlexAlign.SpaceBetween)
-      .alignItems(VerticalAlign.Center)
-   }
+      .justifyContent(FlexAlign.Center)
+      .onClick(() => {
+        WDShare.shareContent(this.contentDetailData)
+      })
+
+      Row() {
+        Image($r('app.media.CarderInteraction_comment'))
+          .width(18)
+          .height(18)
+        Text('评论')
+          .margin({ left: 4 })
+          .fontSize(14)
+          .fontColor('#666666')
+      }
+      .justifyContent(FlexAlign.Center)
+      .onClick(() => {
+        ProcessUtils.processPage(this.contentDTO)
+      })
+
+      this.builderLike()
+    }
+    .width('100%')
+    .margin({ top: 11 })
+    .padding({
+      left: 21,
+      right: 21
+    })
+    .justifyContent(FlexAlign.SpaceBetween)
+    .alignItems(VerticalAlign.Center)
+  }
+
   /**
   /**
    * 点赞组件
    * 点赞组件
    */
    */
   @Builder
   @Builder
   builderLike() {
   builderLike() {
-    Row(){
+    Row() {
       if (this.likeBean?.contentId) {
       if (this.likeBean?.contentId) {
         LikeComponent({
         LikeComponent({
           data: this.likeBean,
           data: this.likeBean,
@@ -88,13 +95,13 @@ export struct CarderInteraction {
    * */
    * */
   private async getContentDetailData() {
   private async getContentDetailData() {
     try {
     try {
-      let data = await MultiPictureDetailViewModel.getDetailData(this.contentDTO.relId, this.contentDTO.objectId, this.contentDTO.relType)
+      let data = await MultiPictureDetailViewModel.getDetailData(this.contentDTO.relId, this.contentDTO.objectId,
+        this.contentDTO.relType)
       this.contentDetailData = data[0];
       this.contentDetailData = data[0];
-      console.log('动态详情',JSON.stringify(this.contentDetailData))
+      console.log('动态详情', JSON.stringify(this.contentDetailData))
     } catch (exception) {
     } catch (exception) {
-      console.log('请求失败',JSON.stringify(exception))
+      console.log('请求失败', JSON.stringify(exception))
     }
     }
   }
   }
-
 }
 }
 
 

@@ -32,12 +32,12 @@ import { LiveHorizontalCardComponent } from './view/LiveHorizontalCardComponent'
 @Component
 @Component
 export struct CompParser {
 export struct CompParser {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-  @State private pageModel: PageModel = new PageModel();
   @State compIndex: number = 0;
   @State compIndex: number = 0;
+  @State private pageModel: PageModel = new PageModel();
 
 
   build() {
   build() {
     Column() {
     Column() {
-      if (this.compDTO.name !="月度排行卡") {
+      if (this.compDTO.name != "月度排行卡") {
 
 
         this.componentBuilder(this.compDTO, this.compIndex);
         this.componentBuilder(this.compDTO, this.compIndex);
       }
       }
@@ -53,7 +53,8 @@ export struct CompParser {
     } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
     } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
       ZhCarouselLayout01({ compDTO: compDTO })
       ZhCarouselLayout01({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 && compDTO.imageScale === 2) {// && compDTO.name ==="横划卡"
+    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
+      compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
 
 
       LiveHorizontalCardComponent({ compDTO: compDTO })
       LiveHorizontalCardComponent({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -87,7 +88,7 @@ export struct CompParser {
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
       //头图卡 和comStyle 2相同，
       //头图卡 和comStyle 2相同，
-      Card5Component({ contentDTO: compDTO.operDataList[0] })
+      Card5Component({ contentDTO: compDTO.operDataList[0], titleShowPolicy: compDTO.titleShowPolicy })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
       // 大图卡
       // 大图卡
@@ -107,10 +108,9 @@ export struct CompParser {
       //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 16, right: 16 })
       //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
-      CardParser({ contentDTO: compDTO.operDataList[0] });
+      CardParser({ contentDTO: compDTO.operDataList[0], compDTO });
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
-    }
-    else {
+    } else {
       Text(compDTO.compStyle)
       Text(compDTO.compStyle)
         .width(CommonConstants.FULL_PARENT)
         .width(CommonConstants.FULL_PARENT)
         .padding(10)
         .padding(10)

-import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper, NumberFormatterUtils, DisplayUtils,
-  NetworkUtil  } from 'wdKit';
+import {
+  AccountManagerUtils,
+  Logger,
+  DateTimeUtils,
+  SPHelper,
+  NumberFormatterUtils,
+  DisplayUtils,
+  NetworkUtil,
+  FastClickUtil
+} from 'wdKit';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
-import { ContentDetailDTO,postBatchAttentionStatusParams,
+import {
+  ContentDetailDTO,
+  postBatchAttentionStatusParams,
   PhotoListBean,
   PhotoListBean,
   ContentDTO,
   ContentDTO,
   batchLikeAndCollectResult,
   batchLikeAndCollectResult,
   RmhInfoDTO,
   RmhInfoDTO,
-  InteractDataDTO, } from 'wdBean';
+  InteractDataDTO,
+} from 'wdBean';
 import media from '@ohos.multimedia.media';
 import media from '@ohos.multimedia.media';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
@@ -33,6 +44,7 @@ import { detailedSkeleton } from './skeleton/detailSkeleton';
 
 
 const TAG = 'DynamicDetailComponent'
 const TAG = 'DynamicDetailComponent'
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
+
 // @Preview
 // @Preview
 @Component
 @Component
 export struct DynamicDetailComponent {
 export struct DynamicDetailComponent {
@@ -40,418 +52,479 @@ export struct DynamicDetailComponent {
   private relId: string = ''
   private relId: string = ''
   private contentId: string = ''
   private contentId: string = ''
   private relType: string = ''
   private relType: string = ''
-
   //出参
   //出参
-  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   //UI
   //UI
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
-
   //点赞 收藏 评论 数量
   //点赞 收藏 评论 数量
-  @State interactDataDTO: InteractDataDTO = {likeNum:0} as InteractDataDTO
+  @State interactDataDTO: InteractDataDTO = { likeNum: 0 } as InteractDataDTO
   /**
   /**
    * 关注状态：默认未关注 点击去关注
    * 关注状态：默认未关注 点击去关注
    */
    */
-  @State  followStatus: String = '';
-
-  @State newsStatusOfUser: batchLikeAndCollectResult = {} as batchLikeAndCollectResult// 点赞、收藏状态
+  @State followStatus: String = '';
+  @State newsStatusOfUser: batchLikeAndCollectResult = {} as batchLikeAndCollectResult // 点赞、收藏状态
   //跳转
   //跳转
-  private  mJumpInfo: ContentDTO = new ContentDTO();
-
+  private mJumpInfo: ContentDTO = new ContentDTO();
   @State publishTime: string = ''
   @State publishTime: string = ''
   @State isNetConnected: boolean = true
   @State isNetConnected: boolean = true
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
-
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
 
 
-
   async aboutToAppear() {
   async aboutToAppear() {
     await this.getContentDetailData()
     await this.getContentDetailData()
   }
   }
+
   onPageHide() {
   onPageHide() {
 
 
   }
   }
 
 
   build() {
   build() {
-      Column(){
-        //logo、日期
-        Row() {
-          Image($r('app.media.ic_article_rmh'))
-            .width($r('app.float.margin_80'))
-            .height($r('app.float.margin_28'))
-            .margin({ left: $r('app.float.margin_16') })
-          Blank()
-          Text(this.publishTime)
-            .fontColor($r('app.color.color_B0B0B0'))
-            .fontSize($r('app.float.font_size_12'))
-            .lineHeight($r('app.float.margin_28'))
-            .margin({ right: $r('app.float.margin_16') })
-        }
-        .height($r('app.float.margin_48'))
+    Column() {
+      //logo、日期
+      Row() {
+        Image($r('app.media.ic_article_rmh'))
+          .width($r('app.float.margin_80'))
+          .height($r('app.float.margin_28'))
+          .margin({ left: $r('app.float.margin_16') })
+        Blank()
+        Text(this.publishTime)
+          .fontColor($r('app.color.color_B0B0B0'))
+          .fontSize($r('app.float.font_size_12'))
+          .lineHeight($r('app.float.margin_28'))
+          .margin({ right: $r('app.float.margin_16') })
+      }
+      .height($r('app.float.margin_48'))
+      .width('100%')
+      .alignItems(VerticalAlign.Bottom)
+      .padding({ bottom: 5 })
+
+      //分割线
+      Image($r('app.media.ic_news_detail_division'))
         .width('100%')
         .width('100%')
-        .alignItems(VerticalAlign.Bottom)
-        .padding({bottom:5})
-        //分割线
-        Image($r('app.media.ic_news_detail_division'))
-            .width('100%')
-            .height($r('app.float.margin_7'))
-            .padding({left: $r('app.float.margin_16'), right: $r('app.float.margin_16')} )
-        Stack({ alignContent: Alignment.Bottom }) {
-          if (!this.isNetConnected) {
-            EmptyComponent({
-              emptyType: 1,
-              emptyButton: true,
-              retry: () => {
-                this.getContentDetailData()
-              }
-            }).padding({ bottom: 200 })
+        .height($r('app.float.margin_7'))
+        .padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
+      Stack({ alignContent: Alignment.Bottom }) {
+        if (!this.isNetConnected) {
+          EmptyComponent({
+            emptyType: 1,
+            emptyButton: true,
+            retry: () => {
+              this.getContentDetailData()
+            }
+          }).padding({ bottom: 200 })
+        } else {
+          if (!this.isPageEnd) {
+            detailedSkeleton()
           } else {
           } else {
-            if (!this.isPageEnd) {
-              detailedSkeleton()
-            }else{
-              Scroll(this.scroller) {
-                Column() {
-                  //号主信息
-                  Row() {
-                    //头像
-                    Stack() {
-                      Image(this.contentDetailData.rmhInfo?.rmhHeadUrl)
-                        .alt(this.contentDetailData.rmhInfo?.userType=='1'?$r('app.media.default_head'):$r('app.media.icon_default_head_mater'))
-                        .width($r('app.float.margin_32'))
-                        .height($r('app.float.margin_32'))
-                        .objectFit(ImageFit.Cover)
-                        .borderRadius($r('app.float.margin_16'))
-                      Image(this.contentDetailData.rmhInfo?.honoraryIcon)
-                        .width($r('app.float.margin_48'))
-                        .height($r('app.float.margin_48'))
-                        .objectFit(ImageFit.Cover)
-                        .borderRadius($r('app.float.margin_24'))
-                      if(!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)){
-                        Stack() {
-                          Image(this.contentDetailData.rmhInfo?.authIcon)
-                            .width($r('app.float.vp_12'))
-                            .height($r('app.float.vp_12'))
-                            .objectFit(ImageFit.Cover)
-                        }
-                        .width($r('app.float.margin_48'))
-                        .height($r('app.float.margin_48'))
-                        .alignContent(Alignment.BottomEnd)
+            Scroll(this.scroller) {
+              Column() {
+                //号主信息
+                Row() {
+                  //头像
+                  Stack() {
+                    Image(this.contentDetailData.rmhInfo?.rmhHeadUrl)
+                      .alt(this.contentDetailData.rmhInfo?.userType == '1' ? $r('app.media.default_head') :
+                      $r('app.media.icon_default_head_mater'))
+                      .width($r('app.float.margin_32'))
+                      .height($r('app.float.margin_32'))
+                      .objectFit(ImageFit.Cover)
+                      .borderRadius($r('app.float.margin_16'))
+                    Image(this.contentDetailData.rmhInfo?.honoraryIcon)
+                      .width($r('app.float.margin_48'))
+                      .height($r('app.float.margin_48'))
+                      .objectFit(ImageFit.Cover)
+                      .borderRadius($r('app.float.margin_24'))
+                    if (!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)) {
+                      Stack() {
+                        Image(this.contentDetailData.rmhInfo?.authIcon)
+                          .width($r('app.float.vp_12'))
+                          .height($r('app.float.vp_12'))
+                          .objectFit(ImageFit.Cover)
                       }
                       }
+                      .width($r('app.float.margin_48'))
+                      .height($r('app.float.margin_48'))
+                      .alignContent(Alignment.BottomEnd)
                     }
                     }
-                    .width($r('app.float.margin_48'))
-                    .height($r('app.float.margin_48'))
-                    .alignContent(Alignment.Center)
-                    .onClick(() => {
-                      ProcessUtils.gotoPeopleShipHomePage(this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhId)
-                    })
-                    Column(){
-                      //昵称
-                      Text(this.contentDetailData.rmhInfo?.rmhName)
-                        .fontSize($r('app.float.font_size_14'))
-                        .fontColor($r('app.color.color_222222'))
-                        .fontWeight(FontWeight.Medium)
-                        .margin({ left: $r('app.float.margin_5') })
-                        .alignSelf(ItemAlign.Start)
-                      //简介
-                      Text(this.contentDetailData.rmhInfo?.rmhDesc)
-                        .fontSize($r('app.float.font_size_14'))
-                        .fontColor($r('app.color.color_B0B0B0'))
-                        .fontWeight(FontWeight.Medium)
-                        .maxLines(1)
-                        .textOverflow({ overflow: TextOverflow.Ellipsis })
-                        .margin({ left: $r('app.float.margin_5') })
-                        .alignSelf(ItemAlign.Start)
+                  }
+                  .width($r('app.float.margin_48'))
+                  .height($r('app.float.margin_48'))
+                  .alignContent(Alignment.Center)
+                  .onClick(async () => {
+                    let retvalue = await FastClickUtil.isMinDelayTime()
+                    if(retvalue){
+                      return
                     }
                     }
-                    .width('63%')
-                    .margin({right: $r('app.float.margin_6')})
-                    if(!StringUtils.isEmpty(this.followStatus)){
-                      if (this.followStatus == '0') {
-                        Row() {
-                          Blank().layoutWeight(1)
-                          Image($r('app.media.icon_add_attention'))
-                            .width($r('app.float.vp_12'))
-                            .height($r('app.float.vp_12'))
-                            .margin({right:2})
-                          Text('关注')
-                            .textAlign(TextAlign.Center)
-                            .fontSize($r('app.float.font_size_12'))
-                            .fontColor($r('app.color.color_fff'))
-                          Blank().layoutWeight(1)
+                    ProcessUtils.gotoPeopleShipHomePage(this.contentDetailData.rmhInfo == null ? "" :
+                    this.contentDetailData.rmhInfo.rmhId)
+                  })
+
+                  Column() {
+                    //昵称
+                    Text(this.contentDetailData.rmhInfo?.rmhName)
+                      .fontSize($r('app.float.font_size_14'))
+                      .fontColor($r('app.color.color_222222'))
+                      .fontWeight(FontWeight.Medium)
+                      .margin({ left: $r('app.float.margin_5') })
+                      .alignSelf(ItemAlign.Start)
+                    //简介
+                    Text(this.contentDetailData.rmhInfo?.rmhDesc)
+                      .fontSize($r('app.float.font_size_14'))
+                      .fontColor($r('app.color.color_B0B0B0'))
+                      .fontWeight(FontWeight.Medium)
+                      .maxLines(1)
+                      .textOverflow({ overflow: TextOverflow.Ellipsis })
+                      .margin({ left: $r('app.float.margin_5') })
+                      .alignSelf(ItemAlign.Start)
+                  }
+                  .width('63%')
+                  .margin({ right: $r('app.float.margin_6') })
+
+                  if (!StringUtils.isEmpty(this.followStatus)) {
+                    if (this.followStatus == '0') {
+                      Row() {
+                        Blank().layoutWeight(1)
+                        Image($r('app.media.icon_add_attention'))
+                          .width($r('app.float.vp_12'))
+                          .height($r('app.float.vp_12'))
+                          .margin({ right: 2 })
+                        Text('关注')
+                          .textAlign(TextAlign.Center)
+                          .fontSize($r('app.float.font_size_12'))
+                          .fontColor($r('app.color.color_fff'))
+                        Blank().layoutWeight(1)
+                      }
+                      .width($r('app.float.margin_54'))
+                      .height($r('app.float.margin_24'))
+                      .borderRadius($r('app.float.vp_3'))
+                      .backgroundColor($r('app.color.color_ED2800'))
+                      .onClick(async () => {
+                        let retvalue = await FastClickUtil.isMinDelayTime()
+                        if(retvalue){
+                          return
                         }
                         }
+                        this.handleAccention()
+                      })
+                    } else {
+                      Text('已关注')
                         .width($r('app.float.margin_54'))
                         .width($r('app.float.margin_54'))
                         .height($r('app.float.margin_24'))
                         .height($r('app.float.margin_24'))
+                        .borderWidth(1)
+                        .textAlign(TextAlign.Center)
+                        .fontSize($r('app.float.font_size_12'))
                         .borderRadius($r('app.float.vp_3'))
                         .borderRadius($r('app.float.vp_3'))
-                        .backgroundColor($r('app.color.color_ED2800'))
-                        .onClick(() => {
+                        .borderColor($r('app.color.color_CCCCCC_1A'))
+                        .backgroundColor($r('app.color.color_CCCCCC_1A'))
+                        .fontColor($r('app.color.color_CCCCCC'))
+                        .onClick(async () => {
+                          let retvalue = await FastClickUtil.isMinDelayTime()
+                          if(retvalue){
+                            return
+                          }
                           this.handleAccention()
                           this.handleAccention()
                         })
                         })
-                      } else {
-                        Text('已关注')
-                          .width($r('app.float.margin_54'))
-                          .height($r('app.float.margin_24'))
-                          .borderWidth(1)
-                          .textAlign(TextAlign.Center)
-                          .fontSize($r('app.float.font_size_12'))
-                          .borderRadius($r('app.float.vp_3'))
-                          .borderColor($r('app.color.color_CCCCCC_1A'))
-                          .backgroundColor($r('app.color.color_CCCCCC_1A'))
-                          .fontColor($r('app.color.color_CCCCCC'))
-                          .onClick(() => {
-                            this.handleAccention()
-                          })
-                      }
                     }
                     }
                   }
                   }
-                  .width('100%')
-                  .margin({ left: $r('app.float.margin_16')})
-                  //内容
-                  Text(StringUtils.isEmpty(this.contentDetailData.newsContent)
-                    ?StringUtils.isEmpty(this.contentDetailData.newsSummary)
-                      ?this.contentDetailData.newsTitle
-                      :this.contentDetailData.newsSummary
-                    :this.contentDetailData.newsContent)
-                    .fontColor($r('app.color.color_222222'))
-                    .fontSize($r('app.float.font_size_18'))
-                    .lineHeight($r('app.float.margin_25'))
-                    .margin({ top: $r('app.float.margin_6')
-                    ,left: $r('app.float.margin_16')
-                    ,right: $r('app.float.margin_16') })
-                    .alignSelf(ItemAlign.Start)
-                  if(this.contentDetailData.newsType+"" == ContentConstants.TYPE_FOURTEEN){
-                    //附件内容：图片/视频
-                    if(this.contentDetailData.photoList!= null && this.contentDetailData.photoList.length>0){
-                      // 图片-从无图到9图展示
-                      GridRow({
-                        gutter: { x: 2, y: 2 }
-                      }) {
-                        ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
-                          if (this.contentDetailData.photoList.length === 1) {
-                            if (this.getPicType(item) !== 3) {
-                              GridCol({
-                                span: this.getPicType(item) === 1 ? 12 : 8
-                              }){
-                                Stack({
-                                  alignContent: Alignment.BottomEnd
-                                }) {
-                                  if (this.getPicType(item) === 1) {
-                                    Image(item.picPath)
-                                      .width('100%')
-                                      .height(172)
-                                      .autoResize(true)
-                                      .borderRadius(this.caclImageRadius(index))
-                                  } else if (this.getPicType(item) === 2) {
-                                    Image(item.picPath)
-                                      .width('100%')
-                                      .height(305)
-                                      .autoResize(true)
-                                      .borderRadius(this.caclImageRadius(index))
-                                  }
-                                  Flex({ direction: FlexDirection.Row }) {
-                                    Image($r('app.media.icon_long_pic'))
-                                      .width(14)
-                                      .height(14)
-                                      .margin({right: 4})
-                                    Text('长图')
-                                      .fontSize(12)
-                                      .fontWeight(400)
-                                      .fontColor(0xffffff)
-                                      .fontFamily('PingFang SC')
-                                  }
-                                  .width(48)
-                                  .padding({bottom: 9})
+                }
+                .width('100%')
+                .margin({ left: $r('app.float.margin_16') })
 
 
-                                }
-                              }
-                              .onClick((event: ClickEvent) => {
-                                ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList,index)
-                              })
-                            } else {
-                              GridCol({
-                                span: { xs: 8 }
-                              }) {
-                                Image(item.picPath)
-                                  .width('100%')
-                                  .borderRadius(this.caclImageRadius(index))
-                                  .autoResize(true)
-                                  .opacity(!item.width && !item.height ? 0 : 1)
-                                  .onComplete(callback => {
-                                    item.width = callback?.width || 0;
-                                    item.height = callback?.height || 0;
-                                  })
-                              }
-                              .onClick((event: ClickEvent) => {
-                                ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList,index)
-                              })
-                            }
-                          } else if (this.contentDetailData.photoList.length === 4) {
+                //内容
+                Text(StringUtils.isEmpty(this.contentDetailData.newsContent)
+                  ? StringUtils.isEmpty(this.contentDetailData.newsSummary)
+                    ? this.contentDetailData.newsTitle
+                    : this.contentDetailData.newsSummary
+                  : this.contentDetailData.newsContent)
+                  .fontColor($r('app.color.color_222222'))
+                  .fontSize($r('app.float.font_size_18'))
+                  .lineHeight($r('app.float.margin_25'))
+                  .margin({
+                    top: $r('app.float.margin_6')
+                  , left: $r('app.float.margin_16')
+                  , right: $r('app.float.margin_16')
+                  })
+                  .alignSelf(ItemAlign.Start)
+                if (this.contentDetailData.newsType + "" == ContentConstants.TYPE_FOURTEEN) {
+                  //附件内容：图片/视频
+                  if (this.contentDetailData.photoList != null && this.contentDetailData.photoList.length > 0) {
+                    // 图片-从无图到9图展示
+                    GridRow({
+                      gutter: { x: 2, y: 2 }
+                    }) {
+                      ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
+                        if (this.contentDetailData.photoList.length === 1) {
+                          if (this.getPicType(item) !== 3) {
                             GridCol({
                             GridCol({
-                              span: { xs: 4 }
+                              span: this.getPicType(item) === 1 ? 12 : 8
                             }) {
                             }) {
-                              Image(item.picPath)
-                                .aspectRatio(1)
-                                .borderRadius(this.caclImageRadius(index))
+                              Stack({
+                                alignContent: Alignment.BottomEnd
+                              }) {
+                                if (this.getPicType(item) === 1) {
+                                  Image(item.picPath)
+                                    .width('100%')
+                                    .height(172)
+                                    .autoResize(true)
+                                    .borderRadius(this.caclImageRadius(index))
+                                } else if (this.getPicType(item) === 2) {
+                                  Image(item.picPath)
+                                    .width('100%')
+                                    .height(305)
+                                    .autoResize(true)
+                                    .borderRadius(this.caclImageRadius(index))
+                                }
+                                Flex({ direction: FlexDirection.Row }) {
+                                  Image($r('app.media.icon_long_pic'))
+                                    .width(14)
+                                    .height(14)
+                                    .margin({ right: 4 })
+                                  Text('长图')
+                                    .fontSize(12)
+                                    .fontWeight(400)
+                                    .fontColor(0xffffff)
+                                    .fontFamily('PingFang SC')
+                                }
+                                .width(48)
+                                .padding({ bottom: 9 })
+
+                              }
                             }
                             }
-                            .onClick((event: ClickEvent) => {
-                              ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList,index)
+                            .onClick(async (event: ClickEvent) => {
+                              let retvalue = await FastClickUtil.isMinDelayTime()
+                              if(retvalue){
+                                return
+                              }
+                              ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
                             })
                             })
                           } else {
                           } else {
                             GridCol({
                             GridCol({
-                              span: { sm: 4, lg: 3 }
+                              span: { xs: 8 }
                             }) {
                             }) {
                               Image(item.picPath)
                               Image(item.picPath)
-                                .aspectRatio(1)
+                                .width('100%')
                                 .borderRadius(this.caclImageRadius(index))
                                 .borderRadius(this.caclImageRadius(index))
+                                .autoResize(true)
+                                .opacity(!item.width && !item.height ? 0 : 1)
+                                .onComplete(callback => {
+                                  item.width = callback?.width || 0;
+                                  item.height = callback?.height || 0;
+                                })
                             }
                             }
-                            .onClick((event: ClickEvent) => {
-                              ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList,index)
+                            .onClick(async (event: ClickEvent) => {
+                              let retvalue = await FastClickUtil.isMinDelayTime()
+                              if(retvalue){
+                                return
+                              }
+                              ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
                             })
                             })
                           }
                           }
-                        })
-                      }
-                      .margin({ left: $r('app.float.margin_16'),right: $r('app.float.margin_16'),top: $r('app.float.margin_8')})
-                    }
-                  }else{
-                    if(this.contentDetailData.videoInfo!= null && this.contentDetailData.videoInfo.length>0){
-                      GridRow() {
-                        if (this.contentDetailData.videoInfo[0].videoLandScape === 1) {
-                          // 横屏
+                        } else if (this.contentDetailData.photoList.length === 4) {
                           GridCol({
                           GridCol({
-                            span: { xs: 12 }
+                            span: { xs: 4 }
                           }) {
                           }) {
-                            Stack() {
-                              Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
-                              this.contentDetailData.fullColumnImgUrls[0].url:
-                              this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                                .width(DisplayUtils.getDeviceWidth()- 32)
-                                .height((DisplayUtils.getDeviceWidth()-32)* 9 / 16)
-                                .borderRadius($r('app.float.image_border_radius'))
-                              CardMediaInfo({ contentDTO: this.mJumpInfo })
-                            }
-                            .align(Alignment.BottomEnd)
+                            Image(item.picPath)
+                              .aspectRatio(1)
+                              .borderRadius(this.caclImageRadius(index))
                           }
                           }
+                          .onClick(async (event: ClickEvent) => {
+                            let retvalue = await FastClickUtil.isMinDelayTime()
+                            if(retvalue){
+                              return
+                            }
+                            ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
+                          })
                         } else {
                         } else {
-                          // 竖图显示，宽度占50%，高度自适应
                           GridCol({
                           GridCol({
-                            span: { xs: 6 }
+                            span: { sm: 4, lg: 3 }
                           }) {
                           }) {
-                            Stack() {
-                              Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
-                              this.contentDetailData.fullColumnImgUrls[0].url:
-                              this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                                .width(DisplayUtils.getDeviceWidth()/2)
-                                .height(DisplayUtils.getDeviceWidth()/2* 4 / 3)
-                                .borderRadius($r('app.float.image_border_radius'))
-                              CardMediaInfo({ contentDTO: this.mJumpInfo })
-                            }
-                            .align(Alignment.BottomEnd)
+                            Image(item.picPath)
+                              .aspectRatio(1)
+                              .borderRadius(this.caclImageRadius(index))
                           }
                           }
+                          .onClick(async (event: ClickEvent) => {
+                            let retvalue = await FastClickUtil.isMinDelayTime()
+                            if(retvalue){
+                              return
+                            }
+                            ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList, index)
+                          })
                         }
                         }
-                      }
-                      .padding({ left: this.contentDetailData.videoInfo[0].videoLandScape === 1?0: 25,top: $r('app.float.margin_8')})
-                      .onClick((event: ClickEvent) => {
-                        ProcessUtils.processPage(this.mJumpInfo)
                       })
                       })
                     }
                     }
+                    .margin({
+                      left: $r('app.float.margin_16'),
+                      right: $r('app.float.margin_16'),
+                      top: $r('app.float.margin_8')
+                    })
                   }
                   }
-                  //特别声明
-                  Text("特别声明：本文为人民日报新媒体平台“人民号”作者上传并发布，仅代表作者观点。人民日报仅提供信息发布平台。")
-                    .fontColor($r('app.color.color_CCCCCC'))
-                    .fontSize($r('app.float.font_size_12'))
-                    .lineHeight($r('app.float.margin_16'))
-                    .margin({ top: $r('app.float.margin_16')
-                    ,left: $r('app.float.vp_12')
-                    ,right: $r('app.float.vp_12') })
-                  //微信/朋友圈/微博
-                  // Row(){
-                  //   Image($r('app.media.xxhdpi_pic_wechat'))
-                  //     .width($r('app.float.margin_116'))
-                  //     .height($r('app.float.margin_36'))
-                  //     .objectFit(ImageFit.Cover)
-                  //   Image($r('app.media.xxhdpi_pic_pyq'))
-                  //     .width($r('app.float.margin_116'))
-                  //     .height($r('app.float.margin_36'))
-                  //     .margin({ left: $r('app.float.margin_4_negative')})
-                  //     .objectFit(ImageFit.Cover)
-                  //   Image($r('app.media.xxhdpi_pic_wb'))
-                  //     .width($r('app.float.margin_116'))
-                  //     .height($r('app.float.margin_36'))
-                  //     .margin({ left: $r('app.float.margin_4_negative')})
-                  //     .objectFit(ImageFit.Cover)
-                  // }
-                  // .margin({ top: $r('app.float.margin_24')})
-                  //点赞
-                  Row(){
-                    Blank().layoutWeight(1)
-                    Image(this.newsStatusOfUser?.likeStatus == '1'?
-                    $r('app.media.icon_like_selected_redheart')
-                      :$r('app.media.icon_like_unselect_grey_redheart'))
-                      .width($r('app.float.margin_36'))
-                      .height($r('app.float.margin_36'))
-                      .objectFit(ImageFit.Cover)
-                      .margin({ left: $r('app.float.margin_6_negative'),right: $r('app.float.margin_6_negative')})
-                    if(this.interactDataDTO?.likeNum != 0){
-                      Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
-                        .fontColor($r('app.color.color_999999'))
-                        .fontSize($r('app.float.font_size_16'))
-                        .lineHeight($r('app.float.margin_20'))
-                        .margin({ left: $r('app.float.margin_2')})
+                } else {
+                  if (this.contentDetailData.videoInfo != null && this.contentDetailData.videoInfo.length > 0) {
+                    GridRow() {
+                      if (this.contentDetailData.videoInfo[0].videoLandScape === 1) {
+                        // 横屏
+                        GridCol({
+                          span: { xs: 12 }
+                        }) {
+                          Stack() {
+                            Image(this.contentDetailData.fullColumnImgUrls != null &&
+                              this.contentDetailData.fullColumnImgUrls.length > 0 &&
+                              !StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url) ?
+                            this.contentDetailData.fullColumnImgUrls[0].url :
+                            this.contentDetailData.videoInfo[0].firstFrameImageUri)
+                              .width(DisplayUtils.getDeviceWidth() - 32)
+                              .height((DisplayUtils.getDeviceWidth() - 32) * 9 / 16)
+                              .borderRadius($r('app.float.image_border_radius'))
+                            CardMediaInfo({ contentDTO: this.mJumpInfo })
+                          }
+                          .align(Alignment.BottomEnd)
+                        }
+                      } else {
+                        // 竖图显示，宽度占50%，高度自适应
+                        GridCol({
+                          span: { xs: 6 }
+                        }) {
+                          Stack() {
+                            Image(this.contentDetailData.fullColumnImgUrls != null &&
+                              this.contentDetailData.fullColumnImgUrls.length > 0 &&
+                              !StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url) ?
+                            this.contentDetailData.fullColumnImgUrls[0].url :
+                            this.contentDetailData.videoInfo[0].firstFrameImageUri)
+                              .width(DisplayUtils.getDeviceWidth() / 2)
+                              .height(DisplayUtils.getDeviceWidth() / 2 * 4 / 3)
+                              .borderRadius($r('app.float.image_border_radius'))
+                            CardMediaInfo({ contentDTO: this.mJumpInfo })
+                          }
+                          .align(Alignment.BottomEnd)
+                        }
+                      }
                     }
                     }
-                    Blank().layoutWeight(1)
+                    .padding({
+                      left: this.contentDetailData.videoInfo[0].videoLandScape === 1 ? 0 : 25,
+                      top: $r('app.float.margin_8')
+                    })
+                    .onClick(async (event: ClickEvent) => {
+                      let retvalue = await FastClickUtil.isMinDelayTime()
+                      if(retvalue){
+                        return
+                      }
+                      ProcessUtils.processPage(this.mJumpInfo)
+                    })
                   }
                   }
-                  .width($r('app.float.margin_154'))
-                  .height($r('app.float.margin_40'))
-                  .margin({top:$r('app.float.margin_16')})
-                  .borderWidth($r('app.float.margin_1'))
-                  .borderColor($r('app.color.color_EDEDED'))
-                  .borderRadius($r('app.float.margin_20'))
-                  .onClick((event: ClickEvent) => {
-                    //点赞操作
-                    this.toggleLikeStatus()
+                }
+                //特别声明
+                Text("特别声明：本文为人民日报新媒体平台“人民号”作者上传并发布，仅代表作者观点。人民日报仅提供信息发布平台。")
+                  .fontColor($r('app.color.color_CCCCCC'))
+                  .fontSize($r('app.float.font_size_12'))
+                  .lineHeight($r('app.float.margin_16'))
+                  .margin({
+                    top: $r('app.float.margin_16')
+                  , left: $r('app.float.vp_12')
+                  , right: $r('app.float.vp_12')
                   })
                   })
-                  // 评论
-                  if (this.contentDetailData?.openComment) {
-                    Divider().strokeWidth(6).color('#f5f5f5').margin({top:$r('app.float.margin_24')})
-                    CommentComponent({
-                      publishCommentModel: {
-                        targetId: String(this.contentDetailData?.newsId || ''),
-                        targetRelId: this.contentDetailData?.reLInfo?.relId,
-                        targetTitle: this.contentDetailData?.newsTitle,
-                        targetRelType: this.contentDetailData?.reLInfo?.relType,
-                        targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
-                        keyArticle: String(this.contentDetailData?.keyArticle),
-                        targetType: String(this.contentDetailData?.newsType),
-                      } as publishCommentModel
-                    })
+                //微信/朋友圈/微博
+                // Row(){
+                //   Image($r('app.media.xxhdpi_pic_wechat'))
+                //     .width($r('app.float.margin_116'))
+                //     .height($r('app.float.margin_36'))
+                //     .objectFit(ImageFit.Cover)
+                //   Image($r('app.media.xxhdpi_pic_pyq'))
+                //     .width($r('app.float.margin_116'))
+                //     .height($r('app.float.margin_36'))
+                //     .margin({ left: $r('app.float.margin_4_negative')})
+                //     .objectFit(ImageFit.Cover)
+                //   Image($r('app.media.xxhdpi_pic_wb'))
+                //     .width($r('app.float.margin_116'))
+                //     .height($r('app.float.margin_36'))
+                //     .margin({ left: $r('app.float.margin_4_negative')})
+                //     .objectFit(ImageFit.Cover)
+                // }
+                // .margin({ top: $r('app.float.margin_24')})
+                //点赞
+                Row() {
+                  Blank().layoutWeight(1)
+                  Image(this.newsStatusOfUser?.likeStatus == '1' ?
+                  $r('app.media.icon_like_selected_redheart')
+                    : $r('app.media.icon_like_unselect_grey_redheart'))
+                    .width($r('app.float.margin_36'))
+                    .height($r('app.float.margin_36'))
+                    .objectFit(ImageFit.Cover)
+                    .margin({ left: $r('app.float.margin_6_negative'), right: $r('app.float.margin_6_negative') })
+                  if (this.interactDataDTO?.likeNum != 0) {
+                    Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
+                      .fontColor($r('app.color.color_999999'))
+                      .fontSize($r('app.float.font_size_16'))
+                      .lineHeight($r('app.float.margin_20'))
+                      .margin({ left: $r('app.float.margin_2') })
                   }
                   }
                   Blank().layoutWeight(1)
                   Blank().layoutWeight(1)
                 }
                 }
+                .width($r('app.float.margin_154'))
+                .height($r('app.float.margin_40'))
+                .margin({ top: $r('app.float.margin_16') })
+                .borderWidth($r('app.float.margin_1'))
+                .borderColor($r('app.color.color_EDEDED'))
+                .borderRadius($r('app.float.margin_20'))
+                .onClick(async (event: ClickEvent) => {
+                  let retvalue = await FastClickUtil.isMinDelayTime()
+                  if(retvalue){
+                    return
+                  }
+                  //点赞操作
+                  this.toggleLikeStatus()
+                })
+
+                // 评论
+                if (this.contentDetailData?.openComment) {
+                  Divider().strokeWidth(6).color('#f5f5f5').margin({ top: $r('app.float.margin_24') })
+                  CommentComponent({
+                    publishCommentModel: {
+                      targetId: String(this.contentDetailData?.newsId || ''),
+                      targetRelId: this.contentDetailData?.reLInfo?.relId,
+                      targetTitle: this.contentDetailData?.newsTitle,
+                      targetRelType: this.contentDetailData?.reLInfo?.relType,
+                      targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
+                      keyArticle: String(this.contentDetailData?.keyArticle),
+                      targetType: String(this.contentDetailData?.newsType),
+                    } as publishCommentModel
+                  })
+                }
+                Blank().layoutWeight(1)
               }
               }
-              .width(CommonConstants.FULL_WIDTH)
-              .height(CommonConstants.FULL_HEIGHT)
-              .padding({ bottom: 76 })
-              .scrollBar(BarState.Off)
-              .alignSelf(ItemAlign.Start)
             }
             }
+            .width(CommonConstants.FULL_WIDTH)
+            .height(CommonConstants.FULL_HEIGHT)
+            .padding({ bottom: 76 })
+            .scrollBar(BarState.Off)
+            .alignSelf(ItemAlign.Start)
           }
           }
-          //底部交互区
-            OperRowListView({
-              contentDetailData: this.contentDetailData,
-              publishCommentModel: this.publishCommentModel,
-              operationButtonList: ['comment', 'collect', 'share'],
-              styleType: 1,
-            })
-
         }
         }
+        //底部交互区
+        OperRowListView({
+          contentDetailData: this.contentDetailData,
+          publishCommentModel: this.publishCommentModel,
+          operationButtonList: ['comment', 'collect', 'share'],
+          styleType: 1,
+        })
+
       }
       }
-      .alignSelf(ItemAlign.Start)
-      .backgroundColor('#FFFFFFFF')
-      .width('100%')
-      .height('100%')
+    }
+    .alignSelf(ItemAlign.Start)
+    .backgroundColor('#FFFFFFFF')
+    .width('100%')
+    .height('100%')
   }
   }
+
   /**
   /**
    * 请求（动态）详情页数据
    * 请求（动态）详情页数据
    * */
    * */
   private async getContentDetailData() {
   private async getContentDetailData() {
     this.isNetConnected = NetworkUtil.isNetConnected()
     this.isNetConnected = NetworkUtil.isNetConnected()
+    this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
     try {
     try {
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
       this.isPageEnd = true;
       this.isPageEnd = true;
@@ -460,9 +533,9 @@ export struct DynamicDetailComponent {
         DateTimeUtils.parseDate(this.contentDetailData?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
         DateTimeUtils.parseDate(this.contentDetailData?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
       let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
       this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
-      console.log('动态详情',JSON.stringify(this.contentDetailData))
+      console.log('动态详情', JSON.stringify(this.contentDetailData))
     } catch (exception) {
     } catch (exception) {
-    console.log('请求失败',JSON.stringify(exception))
+      console.log('请求失败', JSON.stringify(exception))
       this.isPageEnd = true;
       this.isPageEnd = true;
     }
     }
     this.getBatchAttentionStatus()
     this.getBatchAttentionStatus()
@@ -471,10 +544,11 @@ export struct DynamicDetailComponent {
     this.interactDataV2()
     this.interactDataV2()
   }
   }
 
 
-
   private async interactDataV2() {
   private async interactDataV2() {
     this.interactDataDTO = await MultiPictureDetailViewModel.interactDataV2(
     this.interactDataDTO = await MultiPictureDetailViewModel.interactDataV2(
-      this.contentDetailData?.newsId+'',this.contentDetailData?.newsType+'',this.contentDetailData.reLInfo == null ?'':this.contentDetailData.reLInfo?.relId,this.contentDetailData.rmhPlatform)
+      this.contentDetailData?.newsId + '', this.contentDetailData?.newsType + '',
+      this.contentDetailData.reLInfo == null ? '' : this.contentDetailData.reLInfo?.relId,
+      this.contentDetailData.rmhPlatform)
   }
   }
 
 
   // 已登录->查询用户对作品点赞、收藏状态
   // 已登录->查询用户对作品点赞、收藏状态
@@ -514,30 +588,31 @@ export struct DynamicDetailComponent {
       return
       return
     }
     }
     try {
     try {
-        const params: postBatchAttentionStatusParams = {
-          creatorIds: [{ creatorId: this.contentDetailData?.rmhInfo?.rmhId ?? '' }]
-        }
-        let data = await MultiPictureDetailViewModel.getBatchAttentionStatus(params)
-        this.followStatus = data[0]?.status;
-        Logger.info(TAG, `followStatus：${JSON.stringify(this.followStatus)}`)
-      } catch (exception) {
-        this.followStatus = '0';
+      const params: postBatchAttentionStatusParams = {
+        creatorIds: [{ creatorId: this.contentDetailData?.rmhInfo?.rmhId ?? '' }]
       }
       }
+      let data = await MultiPictureDetailViewModel.getBatchAttentionStatus(params)
+      this.followStatus = data[0]?.status;
+      Logger.info(TAG, `followStatus：${JSON.stringify(this.followStatus)}`)
+    } catch (exception) {
+      this.followStatus = '0';
+    }
   }
   }
 
 
   //创建跳转信息
   //创建跳转信息
-  makeJumpInfo(){
+  makeJumpInfo() {
     this.mJumpInfo.pageId = 'dynamicDetailPage'
     this.mJumpInfo.pageId = 'dynamicDetailPage'
-    this.mJumpInfo.objectId = this.contentDetailData.newsId+""
-    this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType+""
-    this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId+""
-    this.mJumpInfo.objectType = (this.contentDetailData.newsType+"") == ContentConstants.TYPE_FOURTEEN?this.contentDetailData.newsType+"":ContentConstants.TYPE_VOD
-    if(this.contentDetailData.videoInfo!= null && this.contentDetailData.videoInfo.length>0){
+    this.mJumpInfo.objectId = this.contentDetailData.newsId + ""
+    this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType + ""
+    this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId + ""
+    this.mJumpInfo.objectType =
+      (this.contentDetailData.newsType + "") == ContentConstants.TYPE_FOURTEEN ? this.contentDetailData.newsType + "" :
+      ContentConstants.TYPE_VOD
+    if (this.contentDetailData.videoInfo != null && this.contentDetailData.videoInfo.length > 0) {
       this.mJumpInfo.videoInfo = this.contentDetailData.videoInfo[0]
       this.mJumpInfo.videoInfo = this.contentDetailData.videoInfo[0]
     }
     }
   }
   }
 
 
-
   caclImageRadius(index: number) {
   caclImageRadius(index: number) {
     let radius: radiusType = {
     let radius: radiusType = {
       topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
       topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
@@ -561,11 +636,11 @@ export struct DynamicDetailComponent {
     return radius
     return radius
   }
   }
 
 
-  getPicType(item: PhotoListBean){
+  getPicType(item: PhotoListBean) {
     if (item.width && item.width) {
     if (item.width && item.width) {
-      if (item.width / item.height > 343/172) {
+      if (item.width / item.height > 343 / 172) {
         return 1; //横长图
         return 1; //横长图
-      } else if (item.height / item.width > 305/228) {
+      } else if (item.height / item.width > 305 / 228) {
         return 2; //竖长图
         return 2; //竖长图
       } else {
       } else {
         return 3
         return 3
@@ -590,7 +665,7 @@ export struct DynamicDetailComponent {
       attentionUserType: this.contentDetailData?.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
       attentionUserType: this.contentDetailData?.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
       attentionUserId: this.contentDetailData?.rmhInfo?.userId || '', // 被关注用户号主id
       attentionUserId: this.contentDetailData?.rmhInfo?.userId || '', // 被关注用户号主id
       attentionCreatorId: this.contentDetailData?.rmhInfo?.rmhId || '', // 被关注用户号主id
       attentionCreatorId: this.contentDetailData?.rmhInfo?.rmhId || '', // 被关注用户号主id
-      status: this.followStatus == '0'? 1:0,
+      status: this.followStatus == '0' ? 1 : 0,
     }
     }
     ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
     ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
       console.log('关注号主==', JSON.stringify(res.data))
       console.log('关注号主==', JSON.stringify(res.data))

@@ -9,7 +9,7 @@ import font from '@ohos.font';
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
 import { newsSkeleton } from './skeleton/newsSkeleton';
 import { newsSkeleton } from './skeleton/newsSkeleton';
-import { Logger, ToastUtils } from 'wdKit/Index';
+import { Logger, ToastUtils, NetworkUtil } from 'wdKit/Index';
 
 
 @Component
 @Component
 export struct ENewspaperPageComponent {
 export struct ENewspaperPageComponent {
@@ -82,6 +82,12 @@ export struct ENewspaperPageComponent {
     this.screenWidth = this.displayTool.width
     this.screenWidth = this.displayTool.width
     this.picWidth = this.screenWidth - vp2px(52)
     this.picWidth = this.screenWidth - vp2px(52)
     this.picHeight = this.picWidth * 566 / 378
     this.picHeight = this.picWidth * 566 / 378
+    // 默认日期
+    const date = new Date()
+    const month = date.getMonth() + 1
+    const day = date.getDate()
+    this.calendarDate =
+      `${date.getFullYear()}-${month > 9 ? month : '0' + month}-${day > 9 ? day : '0' + day}`
     //注册字体
     //注册字体
     font.registerFont({
     font.registerFont({
       familyName: 'BebasNeueBold',
       familyName: 'BebasNeueBold',
@@ -135,12 +141,12 @@ export struct ENewspaperPageComponent {
           })
           })
           .id('e_newspaper_date')
           .id('e_newspaper_date')
           .onClick(() => {
           .onClick(() => {
-            this.calendarDialogShow = !this.calendarDialogShow
-            if (this.calendarDialogShow) {
-              this.calendarDialogController.open()
-            } else {
-              this.calendarDialogController.close()
-            }
+              this.calendarDialogShow = !this.calendarDialogShow
+              if (this.calendarDialogShow) {
+                this.calendarDialogController.open()
+              } else {
+                this.calendarDialogController.close()
+              }
           })
           })
 
 
           Image($r('app.media.icon_share'))
           Image($r('app.media.icon_share'))
@@ -260,11 +266,15 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_page_num')
         .id('e_newspaper_page_num')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
-          this.pageDialogShow = !this.pageDialogShow
-          if (this.pageDialogShow) {
-            this.pageDialogController.open()
-          } else {
-            this.pageDialogController.close()
+          if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
+            this.pageDialogShow = !this.pageDialogShow
+            if (this.pageDialogShow) {
+              this.pageDialogController.open()
+            } else {
+              this.pageDialogController.close()
+            }
+          }else {
+            ToastUtils.showToast('暂无数据', 1000)
           }
           }
         })
         })
 
 
@@ -291,7 +301,11 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_read')
         .id('e_newspaper_read')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
-          this.isOpenListDialog = true
+          if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
+            this.isOpenListDialog = true
+          }else {
+            ToastUtils.showToast('暂无数据', 1000)
+          }
         })
         })
       }
       }
       .width('100%')
       .width('100%')
@@ -322,8 +336,12 @@ export struct ENewspaperPageComponent {
 
 
   private async getNewspaperList() {
   private async getNewspaperList() {
     try {
     try {
-      let listBean = await NewspaperViewModel.getNewspaperList(this.calendarDate, this.picWidth + 'x' + this.picHeight)
-      this.newspaperListBean = listBean;
+      if (NetworkUtil.isNetConnected()) {
+        let listBean = await NewspaperViewModel.getNewspaperList(this.calendarDate, this.picWidth + 'x' + this.picHeight)
+        this.newspaperListBean = listBean;
+      } else {
+        ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+      }
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }

+import { FeedbackTypeBean } from 'wdBean/Index';
+import { NetworkUtil } from 'wdKit/Index';
+import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
+import { CustomTitleUI } from './reusable/CustomTitleUI'
+import { ArrayList } from '@kit.ArkTS';
+
+const TAG = 'FeedBackActivity'
+// 意见反馈页面
+@Entry
+@Component
+export struct FeedBackActivity {
+  //UI
+  scroller: Scroller = new Scroller();
+
+  @State isNetConnected: boolean = true
+
+  @State feedbackTypeBeans: FeedbackTypeBean[] = [] as FeedbackTypeBean[]
+
+  async aboutToAppear() {
+    await this.getContentDetailData()
+  }
+
+  build() {
+    Column() {
+      //标题栏目
+      CustomTitleUI({ titleName: "意见反馈" })
+      Stack({ alignContent: Alignment.Bottom }) {
+        Scroll(this.scroller) {
+          Column() {
+            Text('请选择问题类型')
+              .fontColor($r('app.color.color_222222'))
+              .fontSize($r('app.float.font_size_16'))
+              .fontWeight(FontWeight.Bold)
+              .margin({ left: $r('app.float.vp_15'), top: $r('app.float.vp_14') })
+            GridRow({
+              gutter: { x: 2, y: 2 }
+            }) {
+              ForEach(this.feedbackTypeBeans, (item: FeedbackTypeBean, index: number) => {
+                GridCol({
+                  span: 12
+                }) {
+                  Row(){
+                    Toggle({ type: ToggleType.Checkbox, isOn: false })
+                    Text(item.classifyName)
+                      .fontColor($r('app.color.color_222222'))
+                      .fontSize($r('app.float.font_size_14'))
+                      .fontWeight(FontWeight.Bold)
+                      .margin({ left: $r('app.float.vp_4') })
+                  }
+                  .width(115)
+                  .height(22)
+                  .backgroundColor($r('app.color.color_fff'))
+                }
+              })
+            }
+
+            Blank()
+              .height(0.5)
+              .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12'), right: $r('app.float.vp_16') })
+              .backgroundColor($r('app.color.color_EDEDED'))
+            Text('描述您的问题')
+              .fontColor($r('app.color.color_222222'))
+              .fontSize($r('app.float.font_size_16'))
+              .fontWeight(FontWeight.Bold)
+              .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12') })
+            Stack() {
+              TextInput({ placeholder: '您的宝贵意见是我们前行的动力' })
+              GridRow({
+                gutter: { x: 2, y: 2 }
+              }) {
+                ForEach(this.feedbackTypeBeans, (item: FeedbackTypeBean, index: number) => {
+                  GridCol({
+                    span: 12
+                  }) {
+                  }
+                })
+              }
+
+              Text('0/500')
+            }
+            .height(200)
+            .width('100%')
+            .margin({ left: $r('app.float.vp_16'), top: $r('app.float.vp_12'), right: $r('app.float.vp_16') })
+            .backgroundColor($r('app.color.color_F5F5F5'))
+            .borderRadius(4)
+
+            Text('期待您留下联系方式，我们将提供更好的服务')
+              .fontColor($r('app.color.color_222222'))
+              .fontSize($r('app.float.font_size_14'))
+              .fontWeight(FontWeight.Bold)
+              .margin({ left: $r('app.float.vp_16'), top: $r('app.float.margin_24') })
+            Row() {
+              Text('电话或者邮箱')
+                .fontColor($r('app.color.color_222222'))
+                .fontSize($r('app.float.font_size_14'))
+                .fontWeight(FontWeight.Bold)
+                .margin({ left: $r('app.float.vp_12') })
+              TextInput({ placeholder: '请输入电话或者邮箱' })
+            }
+            .height(44)
+            .margin({ left: $r('app.float.vp_16'), right: $r('app.float.vp_12'), top: $r('app.float.margin_16') })
+            .backgroundColor($r('app.color.color_F5F5F5'))
+            .borderRadius(4)
+          }
+        }
+
+        Text($r('app.string.submit'))
+          .height(44)
+          .fontColor($r('app.color.color_9E9E9E_40'))
+          .fontSize($r('app.float.font_size_18'))
+          .margin({ left: $r('app.float.vp_16'), right: $r('app.float.vp_16'), top: $r('app.float.vp_15') })
+          .backgroundColor($r('app.color.color_ED2800_99'))
+          .borderRadius(4)
+      }
+    }
+  }
+  /**
+   * 请求接口数据
+   * */
+  private async getContentDetailData() {
+    this.isNetConnected = NetworkUtil.isNetConnected()
+    try {
+      this.feedbackTypeBeans = await MultiPictureDetailViewModel.getFeedbackTypeList()
+
+    } catch (exception) {
+      console.log('请求失败',JSON.stringify(exception))
+    }
+  }
+}

@@ -40,7 +40,7 @@ const TAG: string = 'ImageAndTextPageComponent'
 export struct ImageAndTextPageComponent {
 export struct ImageAndTextPageComponent {
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
   action: Action = {} as Action
   action: Action = {} as Action
-  @State contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
+  @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @State recommendList: ContentDTO[] = []
   @State recommendList: ContentDTO[] = []
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
@@ -52,11 +52,12 @@ export struct ImageAndTextPageComponent {
   @State isNetConnected: boolean = true
   @State isNetConnected: boolean = true
   @State info: Area | null = null
   @State info: Area | null = null
   @State likeNum: number = 0
   @State likeNum: number = 0
+
   build() {
   build() {
     Column() {
     Column() {
       // 发布时间
       // 发布时间
       Row() {
       Row() {
-        Image(this.contentDetailData[0]?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
+        Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
           .width(80)
           .width(80)
           .height(28)
           .height(28)
         Text(this.publishTime)
         Text(this.publishTime)
@@ -83,26 +84,26 @@ export struct ImageAndTextPageComponent {
         Scroll(this.scroller) {
         Scroll(this.scroller) {
           Column() {
           Column() {
             ImageAndTextWebComponent({
             ImageAndTextWebComponent({
-              contentDetailData: this.contentDetailData,
+              contentDetailData: [this.contentDetailData],
               action: this.action,
               action: this.action,
               isPageEnd: $isPageEnd
               isPageEnd: $isPageEnd
             })
             })
-              .padding({bottom:10})
+              .padding({ bottom: 10 })
             Column() {
             Column() {
               // 点赞
               // 点赞
-              if (this.contentDetailData[0]?.openLikes && this.contentDetailData[0]?.likesStyle !== 4) {
+              if (this.contentDetailData?.openLikes && this.contentDetailData?.likesStyle !== 4) {
                 Row() {
                 Row() {
                   Row() {
                   Row() {
                     if (this.newsStatusOfUser?.likeStatus === '1') {
                     if (this.newsStatusOfUser?.likeStatus === '1') {
-                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.ic_like_check') :
-                        (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer_active') :
+                      Image(this.contentDetailData?.likesStyle === 1 ? $r('app.media.ic_like_check') :
+                        (this.contentDetailData?.likesStyle === 2 ? $r('app.media.icon_prayer_active') :
                         $r('app.media.icon_candle_active')))
                         $r('app.media.icon_candle_active')))
                         .width(24)
                         .width(24)
                         .height(24)
                         .height(24)
                         .margin({ right: 5 })
                         .margin({ right: 5 })
                     } else {
                     } else {
-                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.icon_like') :
-                        (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer') :
+                      Image(this.contentDetailData?.likesStyle === 1 ? $r('app.media.icon_like') :
+                        (this.contentDetailData?.likesStyle === 2 ? $r('app.media.icon_prayer') :
                         $r('app.media.icon_candle')))
                         $r('app.media.icon_candle')))
                         .width(24)
                         .width(24)
                         .height(24)
                         .height(24)
@@ -129,7 +130,7 @@ export struct ImageAndTextPageComponent {
                   })
                   })
 
 
                 }.width(CommonConstants.FULL_WIDTH)
                 }.width(CommonConstants.FULL_WIDTH)
-                .padding({top:14,bottom:24})
+                .padding({ top: 14, bottom: 24 })
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
               }
               }
               if (this.recommendList.length > 0) {
               if (this.recommendList.length > 0) {
@@ -137,7 +138,7 @@ export struct ImageAndTextPageComponent {
                 RecommendList({ recommendList: this.recommendList })
                 RecommendList({ recommendList: this.recommendList })
               }
               }
               // 评论
               // 评论
-              if (this.contentDetailData[0]?.openComment) {
+              if (this.contentDetailData?.openComment) {
                 Divider().strokeWidth(6).color('#f5f5f5')
                 Divider().strokeWidth(6).color('#f5f5f5')
                 CommentComponent({
                 CommentComponent({
                   publishCommentModel: this.publishCommentModel
                   publishCommentModel: this.publishCommentModel
@@ -173,7 +174,7 @@ export struct ImageAndTextPageComponent {
         //底部交互区
         //底部交互区
         if (this.operationButtonList.length) {
         if (this.operationButtonList.length) {
           OperRowListView({
           OperRowListView({
-            contentDetailData: this.contentDetailData[0],
+            contentDetailData: this.contentDetailData,
             publishCommentModel: this.publishCommentModel,
             publishCommentModel: this.publishCommentModel,
             operationButtonList: this.operationButtonList,
             operationButtonList: this.operationButtonList,
             styleType: 1,
             styleType: 1,
@@ -207,29 +208,29 @@ export struct ImageAndTextPageComponent {
       }
       }
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
       if (detailBeans && detailBeans.length > 0) {
-        this.contentDetailData = detailBeans;
+        this.contentDetailData = detailBeans[0];
         let dateTime =
         let dateTime =
-          DateTimeUtils.parseDate(this.contentDetailData[0]?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
+          DateTimeUtils.parseDate(this.contentDetailData?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
         let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
         let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
         this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
         this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
-        if (this.contentDetailData[0]?.recommendShow === 1) {
+        if (this.contentDetailData?.recommendShow === 1) {
           this.getRecommend()
           this.getRecommend()
         }
         }
-        if (this.contentDetailData[0]?.openLikes === 1) {
+        if (this.contentDetailData?.openLikes === 1) {
           this.getInteractDataStatus()
           this.getInteractDataStatus()
           this.queryContentInteractCount()
           this.queryContentInteractCount()
         }
         }
-        if (this.contentDetailData[0]?.openComment) {
-          this.publishCommentModel.targetId = String(this.contentDetailData[0]?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData[0]?.reLInfo?.relId)
-          this.publishCommentModel.targetTitle = this.contentDetailData[0]?.newsTitle
-          this.publishCommentModel.targetRelType = String(this.contentDetailData[0]?.reLInfo?.relType)
-          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData[0]?.reLInfo?.relObjectId)
-          this.publishCommentModel.keyArticle = String(this.contentDetailData[0]?.keyArticle)
-          this.publishCommentModel.targetType = String(this.contentDetailData[0]?.newsType)
+        if (this.contentDetailData?.openComment) {
+          this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
         }
         }
-        if (this.contentDetailData[0]?.openAudio && this.contentDetailData[0]?.audioList?.length &&
-        this.contentDetailData[0]?.audioList[0].audioUrl) {
+        if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
+        this.contentDetailData?.audioList[0].audioUrl) {
           this.operationButtonList = ['comment', 'collect', 'listen', 'share']
           this.operationButtonList = ['comment', 'collect', 'listen', 'share']
         } else {
         } else {
           this.operationButtonList = ['comment', 'collect', 'share']
           this.operationButtonList = ['comment', 'collect', 'share']
@@ -242,11 +243,11 @@ export struct ImageAndTextPageComponent {
     let params: postRecommendListParams = {
     let params: postRecommendListParams = {
       imei: HttpUtils.getImei(),
       imei: HttpUtils.getImei(),
       userId: HttpUtils.getUserId(),
       userId: HttpUtils.getUserId(),
-      contentId: String(this.contentDetailData[0]?.newsId),
-      recType: Number(this.contentDetailData[0]?.reLInfo?.relType),
-      contentType: this.contentDetailData[0]?.newsType,
-      relId: this.contentDetailData[0]?.reLInfo?.relId,
-      channelId: String(this.contentDetailData[0]?.reLInfo?.channelId)
+      contentId: String(this.contentDetailData?.newsId),
+      recType: Number(this.contentDetailData?.reLInfo?.relType),
+      contentType: this.contentDetailData?.newsType,
+      relId: this.contentDetailData?.reLInfo?.relId,
+      channelId: String(this.contentDetailData?.reLInfo?.channelId)
     }
     }
     let recommendList = await DetailViewModel.postRecommendList(params)
     let recommendList = await DetailViewModel.postRecommendList(params)
     this.recommendList = recommendList;
     this.recommendList = recommendList;
@@ -258,8 +259,8 @@ export struct ImageAndTextPageComponent {
       const params: batchLikeAndCollectParams = {
       const params: batchLikeAndCollectParams = {
         contentList: [
         contentList: [
           {
           {
-            contentId: this.contentDetailData[0]?.newsId + '',
-            contentType: this.contentDetailData[0]?.newsType + '',
+            contentId: this.contentDetailData?.newsId + '',
+            contentType: this.contentDetailData?.newsType + '',
           }
           }
         ]
         ]
       }
       }
@@ -284,8 +285,8 @@ export struct ImageAndTextPageComponent {
     }
     }
     const params: postExecuteLikeParams = {
     const params: postExecuteLikeParams = {
       status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
       status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
-      contentId: this.contentDetailData[0]?.newsId + '',
-      contentType: this.contentDetailData[0]?.newsType + '',
+      contentId: this.contentDetailData?.newsId + '',
+      contentType: this.contentDetailData?.newsType + '',
     }
     }
     PageRepository.postExecuteLike(params).then(res => {
     PageRepository.postExecuteLike(params).then(res => {
       console.log(TAG, '点赞、取消点赞', 'toggleLikeStatus==',)
       console.log(TAG, '点赞、取消点赞', 'toggleLikeStatus==',)
@@ -304,8 +305,8 @@ export struct ImageAndTextPageComponent {
     console.error(TAG, 'contentDetailData2222', JSON.stringify(this.contentDetailData))
     console.error(TAG, 'contentDetailData2222', JSON.stringify(this.contentDetailData))
     const params: contentListParams = {
     const params: contentListParams = {
       contentList: [{
       contentList: [{
-        contentId: this.contentDetailData[0]?.newsId + '',
-        contentType: this.contentDetailData[0]?.newsType,
+        contentId: this.contentDetailData?.newsId + '',
+        contentType: this.contentDetailData?.newsType,
       }]
       }]
     }
     }
     PageRepository.getContentInteract(params).then(res => {
     PageRepository.getContentInteract(params).then(res => {

@@ -114,7 +114,7 @@ export struct SingleColumn999Component {
   build() {
   build() {
     // if (this.compDTO && this.compDTO?.operDataList?.length > 0) {
     // if (this.compDTO && this.compDTO?.operDataList?.length > 0) {
     if (this.compListItem && this.compListItem?.operDataList?.length > 0) {
     if (this.compListItem && this.compListItem?.operDataList?.length > 0) {
-      List({ space: 2, initialIndex: 0 }) {
+      List({ initialIndex: 0 }) {
         // ListItemGroup({
         // ListItemGroup({
         //   // footer: this.itemFooter("")
         //   // footer: this.itemFooter("")
         // }) {
         // }) {

-import { NetworkUtil, Logger, NetworkType, SPHelper, WindowModel, StringUtils} from 'wdKit';
+import { NetworkUtil, Logger, NetworkType, SPHelper, WindowModel, StringUtils } from 'wdKit';
 import { ResponseDTO } from 'wdNetwork';
 import { ResponseDTO } from 'wdNetwork';
 import {
 import {
   ContentDetailDTO,
   ContentDetailDTO,
@@ -35,7 +35,7 @@ export struct MultiPictureDetailPageComponent {
   private picWidth: number = 0
   private picWidth: number = 0
   @State picHeight: number = 0
   @State picHeight: number = 0
   @State titleHeight: number = 0
   @State titleHeight: number = 0
-  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   private swiperControllerItem: SwiperController = new SwiperController()
   private swiperControllerItem: SwiperController = new SwiperController()
@@ -49,8 +49,8 @@ export struct MultiPictureDetailPageComponent {
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') as number;
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') as number;
   @State windowHeight: number = AppStorage.get<number>('windowHeight') as number;
   @State windowHeight: number = AppStorage.get<number>('windowHeight') as number;
-  @State currentOffset:number = 0
-  @State duration:number = 0
+  @State currentOffset: number = 0
+  @State duration: number = 0
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -83,7 +83,6 @@ export struct MultiPictureDetailPageComponent {
     }
     }
   }
   }
 
 
-
   aboutToDisappear() {
   aboutToDisappear() {
 
 
   }
   }
@@ -101,10 +100,10 @@ export struct MultiPictureDetailPageComponent {
   @Builder
   @Builder
   init() {
   init() {
     if (this.contentDetailData.rmhPlatform == 1) {
     if (this.contentDetailData.rmhPlatform == 1) {
-      if(!this.showDownload) {
+      if (!this.showDownload) {
         Row() {
         Row() {
           Row({ space: 8 }) {
           Row({ space: 8 }) {
-            if (this.getImgUrl()){
+            if (this.getImgUrl()) {
               Row() {
               Row() {
                 Stack() {
                 Stack() {
                   Image(this.getImgUrl())
                   Image(this.getImgUrl())
@@ -115,7 +114,7 @@ export struct MultiPictureDetailPageComponent {
                     .height(36)
                     .height(36)
                     .objectFit(ImageFit.Fill)
                     .objectFit(ImageFit.Fill)
                     .interpolation(ImageInterpolation.High)
                     .interpolation(ImageInterpolation.High)
-                  if(!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)){
+                  if (!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)) {
                     Stack() {
                     Stack() {
                       Image(this.contentDetailData.rmhInfo?.authIcon)
                       Image(this.contentDetailData.rmhInfo?.authIcon)
                         .width($r('app.float.vp_13'))
                         .width($r('app.float.vp_13'))
@@ -219,7 +218,7 @@ export struct MultiPictureDetailPageComponent {
         .width('100%')
         .width('100%')
         .height(44)
         .height(44)
         .zIndex(10)
         .zIndex(10)
-        .margin({top:`${this.topSafeHeight + 12}px`})
+        .margin({ top: `${this.topSafeHeight + 12}px` })
         .alignRules({
         .alignRules({
           top: { anchor: "__container__", align: VerticalAlign.Top },
           top: { anchor: "__container__", align: VerticalAlign.Top },
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
@@ -249,15 +248,15 @@ export struct MultiPictureDetailPageComponent {
             this.currentOffset = Math.abs(extraInfo.currentOffset)
             this.currentOffset = Math.abs(extraInfo.currentOffset)
           })
           })
           .onTouch((event: TouchEvent) => {
           .onTouch((event: TouchEvent) => {
-              if(this.duration === 0) {
-                this.duration = 500
-              }
-              if(event.type === 1) {
-                // if(this.currentOffset > px2vp((this.windowHeight - item.height)/2 - 100)) {
-                if(this.currentOffset > 160) {
-                  router.back()
-                }
+            if (this.duration === 0) {
+              this.duration = 500
+            }
+            if (event.type === 1) {
+              // if(this.currentOffset > px2vp((this.windowHeight - item.height)/2 - 100)) {
+              if (this.currentOffset > 160) {
+                router.back()
               }
               }
+            }
           })
           })
         })
         })
       }
       }
@@ -296,9 +295,9 @@ export struct MultiPictureDetailPageComponent {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         })
     }
     }
-    Column(){
-      if(!this.showDownload) {
-        Column(){
+    Column() {
+      if (!this.showDownload) {
+        Column() {
           Row() {
           Row() {
             Scroll(this.scroller) {
             Scroll(this.scroller) {
               Row() {
               Row() {
@@ -306,7 +305,7 @@ export struct MultiPictureDetailPageComponent {
                   direction: FlexDirection.Column,
                   direction: FlexDirection.Column,
                   justifyContent: FlexAlign.Start
                   justifyContent: FlexAlign.Start
                 }) {
                 }) {
-                  if(this.contentDetailData?.photoList?.length) {
+                  if (this.contentDetailData?.photoList?.length) {
                     Text() {
                     Text() {
                       Span(`${this.swiperIndex + 1}`)
                       Span(`${this.swiperIndex + 1}`)
                         .fontSize(24)
                         .fontSize(24)
@@ -322,7 +321,7 @@ export struct MultiPictureDetailPageComponent {
                     .fontColor(Color.White)
                     .fontColor(Color.White)
                     .margin(4)
                     .margin(4)
                   }
                   }
-                  if(this.contentDetailData.newsTitle) {
+                  if (this.contentDetailData.newsTitle) {
                     Text(`${this.contentDetailData.newsTitle}`)
                     Text(`${this.contentDetailData.newsTitle}`)
                       .fontColor(Color.White)
                       .fontColor(Color.White)
                       .fontSize(16)
                       .fontSize(16)
@@ -336,7 +335,7 @@ export struct MultiPictureDetailPageComponent {
                         right: 0
                         right: 0
                       })
                       })
                   }
                   }
-                  if(this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {
+                  if (this.contentDetailData.photoList?.[this.swiperIndex].picDesc) {
                     Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`)
                     Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`)
                       .fontColor(Color.White)
                       .fontColor(Color.White)
                       .fontSize(14)
                       .fontSize(14)
@@ -361,6 +360,7 @@ export struct MultiPictureDetailPageComponent {
             .height(px2vp(this.titleHeight))
             .height(px2vp(this.titleHeight))
             .align(Alignment.Bottom)
             .align(Alignment.Bottom)
           }
           }
+
           OperRowListView({
           OperRowListView({
             contentDetailData: this.contentDetailData,
             contentDetailData: this.contentDetailData,
             publishCommentModel: this.publishCommentModel,
             publishCommentModel: this.publishCommentModel,
@@ -372,14 +372,14 @@ export struct MultiPictureDetailPageComponent {
           TransitionEffect.translate({ x: 0, y: `-${this.bottomSafeHeight}px` })
           TransitionEffect.translate({ x: 0, y: `-${this.bottomSafeHeight}px` })
         ))
         ))
       }
       }
-      if(this.showDownload) {
-        Column(){
+      if (this.showDownload) {
+        Column() {
           Row() {
           Row() {
             Flex({
             Flex({
               direction: FlexDirection.Row,
               direction: FlexDirection.Row,
               justifyContent: FlexAlign.SpaceBetween
               justifyContent: FlexAlign.SpaceBetween
             }) {
             }) {
-              if(this.contentDetailData?.photoList?.length) {
+              if (this.contentDetailData?.photoList?.length) {
                 Text() {
                 Text() {
                   Span(`${this.swiperIndex + 1}`)
                   Span(`${this.swiperIndex + 1}`)
                     .fontSize(24)
                     .fontSize(24)
@@ -396,7 +396,7 @@ export struct MultiPictureDetailPageComponent {
                 .margin(4)
                 .margin(4)
               }
               }
 
 
-              if(this.contentDetailData.photoList?.[this.swiperIndex].picPath) {
+              if (this.contentDetailData.photoList?.[this.swiperIndex].picPath) {
                 ImageDownloadComponent({ url: this.contentDetailData.photoList?.[this.swiperIndex].picPath })
                 ImageDownloadComponent({ url: this.contentDetailData.photoList?.[this.swiperIndex].picPath })
                   .margin({
                   .margin({
                     top: 8,
                     top: 8,

@@ -18,7 +18,7 @@ export struct SpacialTopicPageComponent {
   action: Action = {} as Action
   action: Action = {} as Action
   @State webUrl: string = '';
   @State webUrl: string = '';
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
-  @State contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
+  @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private webPrepared = false;
   private webPrepared = false;
   private dataPrepared = false;
   private dataPrepared = false;
@@ -63,15 +63,15 @@ export struct SpacialTopicPageComponent {
       }
       }
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
       if (detailBeans && detailBeans.length > 0) {
-        this.contentDetailData = detailBeans;
+        this.contentDetailData = detailBeans[0];
         // if (this.contentDetailData[0]?.openComment) {
         // if (this.contentDetailData[0]?.openComment) {
-          this.publishCommentModel.targetId = String(this.contentDetailData[0]?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData[0]?.reLInfo?.relId)
-          this.publishCommentModel.targetTitle = this.contentDetailData[0]?.newsTitle
-          this.publishCommentModel.targetRelType = String(this.contentDetailData[0]?.reLInfo?.relType)
-          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData[0]?.reLInfo?.relObjectId)
-          this.publishCommentModel.keyArticle = String(this.contentDetailData[0]?.keyArticle)
-          this.publishCommentModel.targetType = String(this.contentDetailData[0]?.newsType)
+        this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+        this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+        this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+        this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+        this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+        this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+        this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
         // }
         // }
         this.trySendData2H5()
         this.trySendData2H5()
       }
       }
@@ -92,17 +92,17 @@ export struct SpacialTopicPageComponent {
         }
         }
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
         .height(CommonConstants.FULL_HEIGHT)
-        .padding({bottom:75})
+        .padding({ bottom: 75 })
 
 
         if (!this.isPageEnd) {
         if (!this.isPageEnd) {
           detailedSkeleton()
           detailedSkeleton()
         }
         }
         //底部交互区
         //底部交互区
-          OperRowListView({
-            contentDetailData: this.contentDetailData[0],
-            publishCommentModel: this.publishCommentModel,
-            operationButtonList: this.operationButtonList,
-          })
+        OperRowListView({
+          contentDetailData: this.contentDetailData,
+          publishCommentModel: this.publishCommentModel,
+          operationButtonList: this.operationButtonList,
+        })
       }
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }
   }

 import { RMCalendarBean } from './RMCalendarBean'
 import { RMCalendarBean } from './RMCalendarBean'
 import { RMCalenderCell } from './RMCalendarCell'
 import { RMCalenderCell } from './RMCalendarCell'
+import { ToastUtils, NetworkUtil } from 'wdKit/Index';
 
 
 @Component
 @Component
 export struct RMCalendar {
 export struct RMCalendar {
@@ -166,6 +167,9 @@ export struct RMCalendar {
    * 下一个月
    * 下一个月
    */
    */
   private nextMonth() {
   private nextMonth() {
+    if (!NetworkUtil.isNetConnected()) {
+      ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+    }
     // this.dates.slice(0, this.dates.length)
     // this.dates.slice(0, this.dates.length)
     this.dates = []
     this.dates = []
     const beforDate = new Date(this.selectDay.getFullYear(), this.selectDay.getMonth())
     const beforDate = new Date(this.selectDay.getFullYear(), this.selectDay.getMonth())
@@ -180,6 +184,9 @@ export struct RMCalendar {
    * 上一个月
    * 上一个月
    */
    */
   private preMonth() {
   private preMonth() {
+    if (!NetworkUtil.isNetConnected()) {
+      ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+    }
     // this.dates.slice(0, this.dates.length)
     // this.dates.slice(0, this.dates.length)
     this.dates = []
     this.dates = []
     const beforDate = new Date(this.selectDay.getFullYear(), this.selectDay.getMonth())
     const beforDate = new Date(this.selectDay.getFullYear(), this.selectDay.getMonth())

 /**
 /**
  * 这里是人民号动态中的顶部信息：人民号logo,名字，描述，关注等
  * 这里是人民号动态中的顶部信息：人民号logo,名字，描述，关注等
  */
  */
+import {
+  ContentDetailRequest,
+  postInteractAccentionOperateParams
+} from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { RmhInfoDTO } from 'wdBean'
 import { RmhInfoDTO } from 'wdBean'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { DateTimeUtils, SPHelper } from 'wdKit';
+import { DateTimeUtils, SPHelper, Logger, ToastUtils } from 'wdKit';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import router from '@ohos.router'
 import router from '@ohos.router'
+import { postBatchAttentionStatusParams } from 'wdBean/Index';
+import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel'
 
 
 @Component
 @Component
 export struct RmhTitle {
 export struct RmhTitle {
   @Prop rmhInfo: RmhInfoDTO
   @Prop rmhInfo: RmhInfoDTO
   @Prop publishTime: string | undefined
   @Prop publishTime: string | undefined
+  /**
+   * 是否需要隐藏发布时间超过2天的时间展示，默认不隐藏
+   */
   @Prop hideTime: boolean
   @Prop hideTime: boolean
+  /**
+   * 默认未关注 点击去关注
+   */
+  @State followStatus: string = '0';
 
 
-  async appointReq() {
+  /**
+   * 关注号主
+   */
+  async handleAccention() {
     // 未登录，跳转登录
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (!user_id) {
     if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
+
+    const params2: postInteractAccentionOperateParams = {
+      attentionUserType: this.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
+      attentionUserId: this.rmhInfo?.userId || '', // 被关注用户号主id
+      attentionCreatorId: this.rmhInfo?.rmhId || '', // 被关注用户号主id
+      status: this.followStatus == '0' ? 1 : 0,
+    }
+    ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
+      console.log('rmhTitle-data', JSON.stringify(res.data))
+      if (this.followStatus == '1') {
+        this.followStatus = '0'
+      } else {
+        this.followStatus = '1'
+        // 弹窗样式与何时调用待确认
+        ContentDetailRequest.postPointLevelOperate({ operateType: 6 }).then((res) => {
+          console.log('关注号主获取积分==', JSON.stringify(res.data))
+          if (res.data?.showToast) {
+            ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
+          }
+        })
+      }
+    })
+  }
+  /**
+   * 查询当前登录用户是否关注作品号主
+   * */
+  async getBatchAttentionStatus() {
+    try {
+      const params: postBatchAttentionStatusParams = {
+        creatorIds: [{ creatorId: this.rmhInfo?.rmhId ?? '' }]
+      }
+      let data = await MultiPictureDetailViewModel.getBatchAttentionStatus(params)
+      this.followStatus = data[0]?.status;
+      Logger.info(`rmhTitle-followStatus：${JSON.stringify(this.followStatus)}`)
+    } catch (exception) {
+      Logger.info(`rmhTitle-followStatus：${JSON.stringify(exception)}`)
+    }
   }
   }
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
+    this.getBatchAttentionStatus()
+
     let page = router.getState();
     let page = router.getState();
     if (page.path.includes('/page/PeopleShipHomePage') || page.path.includes('/pages/MainPage')) {
     if (page.path.includes('/page/PeopleShipHomePage') || page.path.includes('/pages/MainPage')) {
       this.hideTime = true;
       this.hideTime = true;
@@ -88,17 +143,20 @@ export struct RmhTitle {
       Blank()
       Blank()
       if (this.rmhInfo.cnIsAttention) {
       if (this.rmhInfo.cnIsAttention) {
         Row() {
         Row() {
-          Image($r('app.media.rmh_follow'))
-            .width(16)
-            .height(16)
-          Text('关注')
+          if (Number(this.followStatus) === 0) {
+            Image($r('app.media.rmh_follow'))
+              .width(16)
+              .height(16)
+          }
+
+          Text(Number(this.followStatus) === 0 ? '关注' : '已关注')
             .fontSize($r('app.float.font_size_13'))
             .fontSize($r('app.float.font_size_13'))
             .fontColor($r('app.color.color_ED2800'))
             .fontColor($r('app.color.color_ED2800'))
         }
         }
         .flexShrink(0)
         .flexShrink(0)
         .alignSelf(ItemAlign.Center)
         .alignSelf(ItemAlign.Center)
         .onClick(() => {
         .onClick(() => {
-          this.appointReq();
+          this.handleAccention();
         })
         })
       }
       }
     }
     }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
-import { Logger } from 'wdKit/Index';
+import { DateTimeUtils, Logger } from 'wdKit/Index';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -59,9 +59,9 @@ export struct CardAdvBottom {
           break;
           break;
         }
         }
       }
       }
-      Logger.error("ZZZXXXXX","currentIndex====>"+currentIndex);
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       }
       }
     }
     }
   }
   }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
-import { Logger } from 'wdKit/Index';
+import { DateTimeUtils, Logger } from 'wdKit/Index';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -71,10 +71,9 @@ export struct CardAdvTop {
           break;
           break;
         }
         }
       }
       }
-
-      Logger.error("ZZZXXXXX","currentIndex====>"+currentIndex);
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       }
       }
     }
     }
   }
   }

@@ -48,8 +48,9 @@ export struct Card10Component {
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)
           })
           })
-
-        Notes({ objectType: 5 }).margin({ left: 5, bottom: 5 })
+        if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: 5 }).margin({ left: 5, bottom: 5 })
+        }
       }.alignContent(Alignment.BottomStart)
       }.alignContent(Alignment.BottomStart)
 
 
       // 专题列表--后端返回三个，
       // 专题列表--后端返回三个，
@@ -106,7 +107,7 @@ export struct Card10Component {
             .fontColor($r('app.color.color_222222'))
             .fontColor($r('app.color.color_222222'))
             .maxLines(2)
             .maxLines(2)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .textOverflow({ overflow: TextOverflow.Ellipsis })
-            .textIndent(item.objectType == '5' ? 40 : 0)
+            .textIndent(item.objectType == '5' ? 38 : 0)
         }.alignContent(Alignment.TopStart)
         }.alignContent(Alignment.TopStart)
 
 
         CardSourceInfo(
         CardSourceInfo(

@@ -102,6 +102,9 @@ struct createImg {
             CardMediaInfo({ contentDTO: this.contentDTO })
             CardMediaInfo({ contentDTO: this.contentDTO })
           }
           }
           .align(Alignment.BottomEnd)
           .align(Alignment.BottomEnd)
+          .onClick((event: ClickEvent) => {
+            ProcessUtils.gotoVod(this.contentDTO)
+          })
         }
         }
       }
       }
     }
     }

@@ -40,7 +40,7 @@ export struct Card2Component {
             .maxLines(2)
             .maxLines(2)
             .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
             .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
             .align(Alignment.Start)
             .align(Alignment.Start)
-            .textIndent(this.contentDTO.objectType == '5' ? 40 : 0)
+            .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
         }
         }
         .alignContent(Alignment.TopStart)
         .alignContent(Alignment.TopStart)
 
 

@@ -12,7 +12,7 @@ const TAG: string = 'Card5Component';
 @Component
 @Component
 export struct Card5Component {
 export struct Card5Component {
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
-  @State titleShowPolicy: number | string = 1
+  @Prop titleShowPolicy: number | string
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
   @State clicked: boolean = false;
 
 
@@ -22,12 +22,13 @@ export struct Card5Component {
 
 
   build() {
   build() {
     Stack() {
     Stack() {
+
       Image(this.loadImg ? this.contentDTO.coverUrl : '')
       Image(this.loadImg ? this.contentDTO.coverUrl : '')
         .backgroundColor(0xf5f5f5)
         .backgroundColor(0xf5f5f5)
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .autoResize(true)
         .autoResize(true)
         .borderRadius($r('app.float.image_border_radius'))
         .borderRadius($r('app.float.image_border_radius'))
-      // if ((this.titleShowPolicy === 1 || this.contentDTO.titleShow === 1) && this.contentDTO.newsTitle) {
+      if (this.titleShowPolicy === 1) {
         Row()
         Row()
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .height(59)
           .height(59)
@@ -41,20 +42,21 @@ export struct Card5Component {
             if (this.contentDTO.objectType == '5') {
             if (this.contentDTO.objectType == '5') {
               Notes({ objectType: this.contentDTO.objectType })
               Notes({ objectType: this.contentDTO.objectType })
             }
             }
+
             Text(this.contentDTO.newsTitle)
             Text(this.contentDTO.newsTitle)
-              .width(CommonConstants.FULL_WIDTH)// .height(CommonConstants.FULL_HEIGHT)
+              .width(CommonConstants.FULL_WIDTH)
               .fontColor(Color.White)
               .fontColor(Color.White)
               .fontSize($r('app.float.normal_text_size'))
               .fontSize($r('app.float.normal_text_size'))
               .fontWeight(FontWeight.Bold)
               .fontWeight(FontWeight.Bold)
               .maxLines(2)
               .maxLines(2)
               .align(Alignment.TopStart)
               .align(Alignment.TopStart)
-              .textIndent(this.contentDTO.objectType == '5' ? 40 : 0)
+              .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
           }.alignContent(Alignment.TopStart)
           }.alignContent(Alignment.TopStart)
         }
         }
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
-        // .height(40)
         .margin({ left: 12, bottom: 10, right: 12 })
         .margin({ left: 12, bottom: 10, right: 12 })
-      // }
+
+      }
     }
     }
     .alignContent(Alignment.Bottom)
     .alignContent(Alignment.Bottom)
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)

@@ -49,7 +49,7 @@ export struct Card6Component {
               .maxLines(3)
               .maxLines(3)
               .alignSelf(ItemAlign.Start)
               .alignSelf(ItemAlign.Start)
               .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
               .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-              .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 60 :
+              .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
                 (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
                 (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
                   this.contentDTO.objectType == '5' ? 30 : 0)
                   this.contentDTO.objectType == '5' ? 30 : 0)
           }.alignContent(Alignment.TopStart)
           }.alignContent(Alignment.TopStart)

@@ -43,8 +43,11 @@ export struct Card9Component {
             topRight: $r('app.float.image_border_radius')
             topRight: $r('app.float.image_border_radius')
           })
           })
 
 
-        Notes({ objectType: 5 })
-          .margin({ left: 5, bottom: 5 })
+        if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: 5 })
+            .margin({ left: 5, bottom: 5 })
+        }
+
       }.alignContent(Alignment.BottomStart)
       }.alignContent(Alignment.BottomStart)
 
 
       // 时间线--后端返回三个，
       // 时间线--后端返回三个，

@@ -13,10 +13,10 @@ export struct Notes {
   build() {
   build() {
     if (this.returnTypeTitleFn()) {
     if (this.returnTypeTitleFn()) {
       Text(this.returnTypeTitleFn())
       Text(this.returnTypeTitleFn())
-        .fontSize($r('app.float.font_size_12'))
+        .fontSize($r('app.float.font_size_11'))
         .padding({
         .padding({
-          left: 5,
-          right: 5,
+          left: 4,
+          right: 4,
           top: 3,
           top: 3,
           bottom: 3
           bottom: 3
         })
         })

 import { CompDTO, ContentDTO, } from 'wdBean';
 import { CompDTO, ContentDTO, } from 'wdBean';
-import { BreakpointConstants, CommonConstants, DurationEnum } from 'wdConstant';
+import { BreakpointConstants, CommonConstants } from 'wdConstant';
 import { BreakPointType, Logger } from 'wdKit';
 import { BreakPointType, Logger } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { EmptyComponent } from '../view/EmptyComponent';
 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';
 
 
 const TAG = 'Zh_Carousel_Layout-01';
 const TAG = 'Zh_Carousel_Layout-01';
 
 
@@ -40,19 +41,21 @@ class MyDataSource implements IDataSource {
 
 
 @Component
 @Component
 export struct ZhCarouselLayout01 {
 export struct ZhCarouselLayout01 {
-  @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_XS;
+  @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string =
+    BreakpointConstants.BREAKPOINT_XS;
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-  private data: MyDataSource = new MyDataSource([])
   @State firstWd: number = 0
   @State firstWd: number = 0
   @State SecondWd: number = 0
   @State SecondWd: number = 0
   @State swiperIndex: number = 0
   @State swiperIndex: number = 0
+  private data: MyDataSource = new MyDataSource([])
 
 
   watchCurrentBreakpoint() {
   watchCurrentBreakpoint() {
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
     Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    Logger.info(TAG, `aboutToAppear, beanList:${this.compDTO?.operDataList?.length}, currentBreakpoint:${this.currentBreakpoint}`);
+    Logger.info(TAG,
+      `aboutToAppear, beanList:${this.compDTO?.operDataList?.length}, currentBreakpoint:${this.currentBreakpoint}`);
     let list: number[] = []
     let list: number[] = []
     for (let i = 1; i <= this.compDTO?.operDataList?.length; i++) {
     for (let i = 1; i <= this.compDTO?.operDataList?.length; i++) {
       list.push(i);
       list.push(i);
@@ -155,16 +158,21 @@ export struct ZhCarouselLayout01 {
   }
   }
 
 
   public buildDisplayCount(): number {
   public buildDisplayCount(): number {
-    return new BreakPointType({ xs: 1, sm: 1, md: 2, lg: 3 }).getValue(this.currentBreakpoint)
+    return new BreakPointType({
+      xs: 1,
+      sm: 1,
+      md: 2,
+      lg: 3
+    }).getValue(this.currentBreakpoint)
   }
   }
 }
 }
 
 
 
 
 @Component
 @Component
 struct CarouselLayout01CardView {
 struct CarouselLayout01CardView {
+  @State loadImg: boolean = false;
   private item: ContentDTO = new ContentDTO();
   private item: ContentDTO = new ContentDTO();
   private length: number = 1; // 轮播图数量
   private length: number = 1; // 轮播图数量
-  @State loadImg: boolean = false;
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
     this.loadImg = await onlyWifiLoadImg();
     this.loadImg = await onlyWifiLoadImg();
@@ -187,29 +195,37 @@ 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 })
             .width(CommonConstants.FULL_PARENT)
             .width(CommonConstants.FULL_PARENT)
         }
         }
         Blank()
         Blank()
         // 文本信息
         // 文本信息
-        Text(`${this.item.corner}${this.item.newsTitle}`)
-          .width(CommonConstants.FULL_PARENT)
-          .height(39)
-          .padding({
-            left: 10,
-            right: 10
-          })
-          .margin({
-            bottom: this.length > 1 ? 28 : 10
-          })
-          .fontColor(Color.White)
-          .fontSize($r('app.float.font_size_16'))
-          .fontWeight(FontWeight.Medium)
-          .textAlign(TextAlign.Start)
-          .align(Alignment.Bottom)
-          .maxLines(CompUtils.MAX_LINES_2)
-          .textOverflow({ overflow: TextOverflow.Ellipsis })
+        Stack() {
+          if (this.item.objectType == '5') {
+            Notes({ objectType: this.item.objectType })
+          }
+          Text(`${this.item.corner}${this.item.newsTitle}`)
+            .width(CommonConstants.FULL_PARENT)
+            .fontColor(Color.White)
+            .fontSize($r('app.float.font_size_16'))
+            .fontWeight(FontWeight.Medium)
+            .textAlign(TextAlign.Start)
+            .align(Alignment.Bottom)
+            .maxLines(CompUtils.MAX_LINES_2)
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
+            .textIndent(this.item.objectType == '5' ? 35 : 0)
+        }
+        // .height(39)
+        .padding({
+          left: 10,
+          right: 10
+        })
+        .margin({
+          bottom: this.length > 1 ? 28 : 10
+        })
+        .alignContent(Alignment.TopStart)
+
       }
       }
       .width(CommonConstants.FULL_PARENT)
       .width(CommonConstants.FULL_PARENT)
       .height(CommonConstants.FULL_PARENT)
       .height(CommonConstants.FULL_PARENT)

@@ -40,6 +40,7 @@ export struct ZhSingleRow03 {
 
 
   // 请求所有预约状态
   // 请求所有预约状态
   async getReserveState() {
   async getReserveState() {
+    this.reservedIds = []
     const reserveBean: reserveReqItem[] = this.compDTO.operDataList.map((item: ContentDTO) => {
     const reserveBean: reserveReqItem[] = this.compDTO.operDataList.map((item: ContentDTO) => {
       const reqItem: reserveReqItem = {
       const reqItem: reserveReqItem = {
         liveId: item.objectId.toString(),
         liveId: item.objectId.toString(),

-import { commentInfo, CompDTO, ContentDTO, Params } from 'wdBean';
+import { commentInfo, CompDTO, ContentDTO, Params, batchLikeAndCollectResult } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { DateTimeUtils, SPHelper } from 'wdKit/Index';
+import { DateTimeUtils, SPHelper, Logger } from 'wdKit/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
+import {
+  batchLikeAndCollectParams,
+} from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
+import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel';
+import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
+import { commentItemModel } from '../../components/comment/model/CommentModel'
 
 
 /**
 /**
  * 精选评论卡
  * 精选评论卡
  * Zh_Single_Row-06
  * Zh_Single_Row-06
  */
  */
 const TAG = 'Zh_Single_Row-06'
 const TAG = 'Zh_Single_Row-06'
-
-// interface commentInfo {
-//   commentTitle: string,
-//   newsTitle: string,
-//   userName: string,
-//   userHeaderUrl: string,
-//   publishTime: number
-// }
-// interface operDataListItem {
-//   commentInfo: commentInfo
-// }
-// interface CommentData{
-//   operDataList: Array<operDataListItem>
-// }
-
 @Entry
 @Entry
 @Component
 @Component
 export struct ZhSingleRow06 {
 export struct ZhSingleRow06 {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-  @State likeBl: boolean = false;
+  @State newsStatusOfUser: batchLikeAndCollectResult = {
+    likeStatus: '0'
+  } as batchLikeAndCollectResult // 点赞、收藏状态
+
+  aboutToAppear(): void {
+    this.getInteractDataStatus()
+  }
 
 
-  async likeAction() {
+  /**
+   * 点赞、取消点赞
+   */
+  async toggleLikeStatus() {
+    // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (!user_id) {
     if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
 
 
-    if (this.likeBl) {
-      this.likeBl = false;
-    } else {
-      this.likeBl = true;
+    const commentInfo = this.compDTO.operDataList[0]?.commentInfo as commentInfo;
+    // commentLikeChange(this.item)
+    this.newsStatusOfUser.likeStatus = this.newsStatusOfUser.likeStatus === '1' ? '0' : '1';
+    const commentLikeParam = {
+      targetId: commentInfo.newsId || '',
+      id: commentInfo.commentId,
+      targetType: commentInfo?.objectType || '',
+      api_status: this.newsStatusOfUser?.likeStatus == '1' ? false : true
+    } as commentItemModel;
+    commentViewModel.commentLike(commentLikeParam).then(() => {
+    }).catch(() => {
+      this.newsStatusOfUser.likeStatus = this.newsStatusOfUser.likeStatus === '1' ? '0' : '1';
+    })
+  }
+
+  // 已登录->查询用户对作品点赞、收藏状态
+  async getInteractDataStatus() {
+    // 未登录，跳转登录
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
+      return
+    }
+    try {
+      const params: batchLikeAndCollectParams = {
+        contentList: [
+          {
+            contentId: this.compDTO.operDataList[0]?.commentInfo?.newsId + '',
+            contentType: this.compDTO.operDataList[0]?.commentInfo?.newsType + '',
+          }
+        ]
+      }
+      let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
+      Logger.info(TAG, 'ZhSingleRow06-data', JSON.stringify(data))
+      this.newsStatusOfUser = data[0];
+      Logger.info(TAG, `ZhSingleRow06-newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
+    } catch (exception) {
+      console.error(TAG, JSON.stringify(exception))
     }
     }
   }
   }
 
 
@@ -95,7 +129,7 @@ export struct ZhSingleRow06 {
           .fontColor(0x999999)
           .fontColor(0x999999)
 
 
         Row(){
         Row(){
-          Image(this.likeBl ? $r('app.media.icon_like_select') : $r('app.media.icon_like'))
+          Image(Number(this.newsStatusOfUser?.likeStatus) == 1 ? $r('app.media.icon_like_select') : $r('app.media.icon_like'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
             .margin({right: 3})
             .margin({right: 3})
@@ -103,9 +137,11 @@ export struct ZhSingleRow06 {
           Text('点赞')
           Text('点赞')
             .fontSize(15)
             .fontSize(15)
             .fontColor(0x999999)
             .fontColor(0x999999)
+            .onClick(() => {
+            })
         }
         }
         .onClick(() => {
         .onClick(() => {
-          this.likeAction()
+          this.toggleLikeStatus()
         })
         })
       }
       }
       .justifyContent(FlexAlign.SpaceBetween)
       .justifyContent(FlexAlign.SpaceBetween)

-import lottie, { AnimationSegment } from '@ohos/lottie';
+import lottie, { AnimationItem, AnimationSegment } from '@ohos/lottie';
 
 
 @Component
 @Component
 export struct LottieView {
 export struct LottieView {
-  @Prop name: string = ''
-  @Prop path: string = ''
-  @Prop lottieWidth?: number = 30
-  @Prop lottieHeight?: number = 30
-  @Prop autoplay?: boolean = false
-  @Prop loop?: boolean = false
+  @Prop name: string
+  @Prop path: string
+  @Prop lottieWidth: number = 30
+  @Prop lottieHeight: number = 30
+  @Prop autoplay: boolean = false
+  @Prop loop: boolean = false
   @Prop initialSegment?: AnimationSegment = [0, 120] // 动画起始帧
   @Prop initialSegment?: AnimationSegment = [0, 120] // 动画起始帧
-  @Prop onReady: (animateItem: ESObject) => void // 动画初始化完成事件
+  @Prop onReady: (animateItem: AnimationItem | null) => void // 动画初始化完成事件
   @Prop onComplete?: () => void // 动画完成事件
   @Prop onComplete?: () => void // 动画完成事件
-  private politeChickyController: CanvasRenderingContext2D = new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象
-  private animateItem: ESObject = null; // 初始化loadAnimation接口的返回对象
+  private politeChickyController: CanvasRenderingContext2D =
+    new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象
+  private animateItem: AnimationItem | null = null; // 初始化loadAnimation接口的返回对象
 
 
   // 页面隐藏销毁动画
   // 页面隐藏销毁动画
   onPageHide(): void {
   onPageHide(): void {
-    this.animateItem.destroy()
+    this.animateItem?.destroy()
 
 
     if (this.onComplete) {
     if (this.onComplete) {
-      this.animateItem.removeEventListener('complete', this.onComplete)
+      this.animateItem?.removeEventListener('complete', this.onComplete)
     }
     }
   }
   }
 
 
@@ -44,7 +45,7 @@ export struct LottieView {
       // initialSegment: this.initialSegment
       // initialSegment: this.initialSegment
     })
     })
     if (this.initialSegment) {
     if (this.initialSegment) {
-      this.animateItem.initialSegment = this.initialSegment
+      this.animateItem.segments = this.initialSegment
     }
     }
 
 
     if (this.onComplete) {
     if (this.onComplete) {
@@ -57,7 +58,7 @@ export struct LottieView {
     Stack({ alignContent: Alignment.TopStart }) {
     Stack({ alignContent: Alignment.TopStart }) {
       Canvas(this.politeChickyController)
       Canvas(this.politeChickyController)
         .width(this.lottieWidth)
         .width(this.lottieWidth)
-        .height(this.lottieHeight)
+        .height(this.lottieHeight)// .backgroundColor(Color.Black)
         .onReady(() => {
         .onReady(() => {
           this.loadAnimation();
           this.loadAnimation();
           if (this.onReady) {
           if (this.onReady) {
@@ -65,7 +66,7 @@ export struct LottieView {
           }
           }
         })
         })
         .onClick(() => {
         .onClick(() => {
-          this.animateItem.play()
+          this.animateItem?.play()
         })
         })
     }
     }
   }
   }

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
-import { WDRouterRule, WDRouterPage } from 'wdRouter'
+import { WDRouterRule, WDRouterPage, ProcessUtils } from 'wdRouter'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { ToastUtils } from 'wdKit/Index';
 import { ToastUtils } from 'wdKit/Index';
 
 
@@ -77,7 +77,7 @@ export default struct MinePageMoreFunctionUI {
             }else if (item.msg == "关于") { // 关于
             }else if (item.msg == "关于") { // 关于
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
             }else if (item.msg == "意见反馈") { // 关于
             }else if (item.msg == "意见反馈") { // 关于
-              ToastUtils.shortToast("待开发")
+              ProcessUtils.gotoFeedBackActivity()
             }
             }
           })
           })
           .height('117lpx')
           .height('117lpx')

 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
 import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
+import { PagePersonFunction } from './PagePersonFunction'
 
 
 @Component
 @Component
 export default struct MinePagePersonFunctionUI {
 export default struct MinePagePersonFunctionUI {
@@ -10,30 +11,7 @@ export default struct MinePagePersonFunctionUI {
     Grid(){
     Grid(){
       ForEach(this.personalData,(item:MinePagePersonalFunctionsItem,index:number)=>{
       ForEach(this.personalData,(item:MinePagePersonalFunctionsItem,index:number)=>{
         GridItem(){
         GridItem(){
-          Row(){
-            Column(){
-              Image(item.imgSrc)
-                .width('46lpx')
-                .height('46lpx')
-                .objectFit(ImageFit.Auto)
-                .interpolation(ImageInterpolation.High)
-              Text(`${item.msg}`)
-                .margin({top:'8lpx'})
-                .height('23lpx')
-                .fontColor($r('app.color.color_222222'))
-                .fontSize('23lpx')
-            }
-            .alignItems(HorizontalAlign.Center)
-            .width('100%')
-            Blank()
-              .layoutWeight(1)
-            if(index % 4 < 3 && index != this.personalData.length-1){
-              Text().backgroundColor($r('app.color.color_222222'))
-                .opacity(0.1)
-                .width('2lpx')
-                .height('29lpx')
-            }
-          }
+          PagePersonFunction({ item: item, noDivider : (index % 4 < 3 && index != this.personalData.length-1) ? false : true})
         }.onClick(()=>{
         }.onClick(()=>{
           console.log(index+"")
           console.log(index+"")
           switch (item.msg){
           switch (item.msg){
@@ -42,7 +20,8 @@ export default struct MinePagePersonFunctionUI {
                 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
                 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
                 return
                 return
               }else {
               }else {
-                WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage)
+                let params: Record<string, string> = {'comment': "1"};
+                WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage,params)
               }
               }
               break;
               break;
             }
             }
@@ -91,11 +70,10 @@ export default struct MinePagePersonFunctionUI {
         .height('117lpx')
         .height('117lpx')
       })
       })
     }
     }
-    // .rowsTemplate('1fr 1fr')
-    .rowsTemplate('1fr')
+    .rowsTemplate('1fr 1fr')
     .columnsTemplate('1fr 1fr 1fr 1fr')
     .columnsTemplate('1fr 1fr 1fr 1fr')
-    // .height('234lpx')
-    .height('167lpx')
+    .height('234lpx')
     .margin({top:'31lpx',left:'23lpx',right:'23lpx' })
     .margin({top:'31lpx',left:'23lpx',right:'23lpx' })
   }
   }
-}
+}
+

+import MinePagePersonalFunctionsItem from '../../viewmodel/MinePagePersonalFunctionsItem'
+
+@Component
+export struct PagePersonFunction{
+  @ObjectLink item: MinePagePersonalFunctionsItem
+  @State noDivider:boolean = false
+
+  build() {
+    Row(){
+      Column(){
+        Stack({ alignContent: Alignment.TopEnd }){
+          Image(this.item.imgSrc)
+            .objectFit(ImageFit.Auto)
+            .interpolation(ImageInterpolation.High)
+          if (this.item.isShowRedPoint) {
+            Button()
+              .type(ButtonType.Circle)
+              .width("12lpx")
+              .height("12lpx")
+              .backgroundColor($r('app.color.color_ED2800'))
+          }
+        }.width('46lpx')
+        .height('46lpx')
+
+        Text(`${this.item.msg}`)
+          .margin({top:'8lpx'})
+          .height('23lpx')
+          .fontColor($r('app.color.color_222222'))
+          .fontSize('23lpx')
+      }
+      .alignItems(HorizontalAlign.Center)
+      .width('100%')
+      Blank()
+        .layoutWeight(1)
+      if(!this.noDivider){
+        Text().backgroundColor($r('app.color.color_222222'))
+          .opacity(0.1)
+          .width('2lpx')
+          .height('29lpx')
+      }
+    }
+  }
+
+}

 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
-import { DateTimeUtils, 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 MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
@@ -116,9 +116,14 @@ export struct FollowChildComponent{
         }.height('202lpx')
         }.height('202lpx')
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
 
 
-        Text().backgroundColor($r('app.color.color_EDEDED'))
+        // Text().backgroundColor($r('app.color.color_EDEDED'))
+        //   .width('100%')
+        //   .height('2lpx')
+        Divider()
           .width('100%')
           .width('100%')
           .height('2lpx')
           .height('2lpx')
+          .color($r('app.color.color_F5F5F5'))
+          .strokeWidth('1lpx')
       }.width('100%')
       }.width('100%')
 
 
     }else {
     }else {
@@ -230,9 +235,15 @@ export struct FollowChildComponent{
         }.height('146lpx')
         }.height('146lpx')
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
 
 
-        Text().backgroundColor($r('app.color.color_EDEDED'))
+        // Text().backgroundColor($r('app.color.color_EDEDED'))
+        //   .width('100%')
+        //   .height('2lpx')
+
+        Divider()
           .width('100%')
           .width('100%')
           .height('2lpx')
           .height('2lpx')
+          .color($r('app.color.color_F5F5F5'))
+          .strokeWidth('1lpx')
       }.width('100%')
       }.width('100%')
 
 
     }
     }
@@ -255,12 +266,6 @@ 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"){
-            //   UserDataLocal.setUserFollowOperation(DateTimeUtils.getTimeStamp()+"")
-            // }else{
-            //   UserDataLocal.setUserFollowOperation(DateTimeUtils.getTimeStamp()+","+this.data.creatorId)
-            // }
           }
           }
         }
         }
       })
       })

@@ -30,10 +30,9 @@ export struct HomePageBottomCommentComponent {
   build() {
   build() {
     Column() {
     Column() {
       if (this.isGetRequest == true) {
       if (this.isGetRequest == true) {
-        Divider().width('100%')
+        Text().backgroundColor($r('app.color.color_EDEDED'))
+          .width('100%')
           .height('2lpx')
           .height('2lpx')
-          .strokeWidth('1lpx')
-          .backgroundColor($r('app.color.color_EDEDED'))
       }
       }
       if (this.count === 0) {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {

@@ -65,10 +65,9 @@ export struct HomePageBottomFollowComponent {
 
 
     Column() {
     Column() {
       if (this.isGetRequest == true) {
       if (this.isGetRequest == true) {
-        Divider().width('100%')
+        Text().backgroundColor($r('app.color.color_EDEDED'))
+          .width('100%')
           .height('2lpx')
           .height('2lpx')
-          .strokeWidth('1lpx')
-          .backgroundColor($r('app.color.color_EDEDED'))
       }
       }
 
 
       if (this.count === 0) {
       if (this.count === 0) {

@@ -30,10 +30,9 @@ export struct OtherHomePageBottomCommentComponent {
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Divider().width('100%')
+      Text().backgroundColor($r('app.color.color_EDEDED'))
+        .width('100%')
         .height('2lpx')
         .height('2lpx')
-        .strokeWidth('1lpx')
-        .backgroundColor($r('app.color.color_EDEDED'))
 
 
       if (this.count === 0) {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {

@@ -30,10 +30,9 @@ export struct OtherHomePageBottomFollowComponent{
 
 
   build(){
   build(){
     Column(){
     Column(){
-      Divider().width('100%')
+      Text().backgroundColor($r('app.color.color_EDEDED'))
+        .width('100%')
         .height('2lpx')
         .height('2lpx')
-        .strokeWidth('1lpx')
-        .backgroundColor($r('app.color.color_EDEDED'))
 
 
       if(this.count === 0){
       if(this.count === 0){
         Column(){
         Column(){

@@ -85,6 +85,7 @@ export struct BottomNavigationComponent {
             VideoChannelPage({
             VideoChannelPage({
               topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
               topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
               _currentNavIndex: $currentNavIndex,
               _currentNavIndex: $currentNavIndex,
+              autoRefresh: this.autoRefresh
             })
             })
           } else {
           } else {
             TopNavigationComponent({
             TopNavigationComponent({

@@ -487,12 +487,7 @@ export struct PaperSingleColumn999CardView {
             Text(this.getPublishTime())
             Text(this.getPublishTime())
               .fontSize(12)
               .fontSize(12)
               .fontColor(Color.Gray)
               .fontColor(Color.Gray)
-            if (this.interactData && this.interactData.commentNum) {
-              Text(this.interactData.commentNum + "评")
-                .fontSize(12)
-                .fontColor(Color.Gray)
-                .margin({ left: 6 })
-            }else if (this.commentList && this.commentList.length) {
+            if (this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
               Text(this.interactData.commentNum + "评")
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontSize(12)
                 .fontColor(Color.Gray)
                 .fontColor(Color.Gray)
@@ -517,7 +512,7 @@ export struct PaperSingleColumn999CardView {
       }
       }
     }
     }
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
-    .margin({ bottom: 14, left: 12, right: 12 })
+    .margin({ bottom: 10, left: 12, right: 12 })
     .borderRadius(4)
     .borderRadius(4)
     .onClick(() => {
     .onClick(() => {
       ProcessUtils.processPage(this.item)
       ProcessUtils.processPage(this.item)

@@ -53,8 +53,25 @@ export struct MinePageComponent {
     this.getUserLogin()
     this.getUserLogin()
     this.getFunctionData()
     this.getFunctionData()
     this.addLoginStatusObserver()
     this.addLoginStatusObserver()
+    this.getMessageData()
   }
   }
 
 
+  getMessageData(){
+    MinePageDatasModel.getMessageUnReadData().then((value) => {
+      if(value !=null) {
+        if(value.activeCount >0 ||value.subscribeCount > 0 || value.systemCount > 0){
+          this.personalData.forEach((value) => {
+            if(value.msg == "消息")
+              value.isShowRedPoint = true
+          })
+        }
+      }
+    }).catch((err: Error) => {
+      console.log(TAG, JSON.stringify(err))
+    })
+  }
+
+
   async addLoginStatusObserver(){
   async addLoginStatusObserver(){
     this.preferences = await SPHelper.default.getPreferences();
     this.preferences = await SPHelper.default.getPreferences();
     this.preferences.on('change', this.observer);
     this.preferences.on('change', this.observer);

@@ -13,6 +13,7 @@ import {
   PeopleShipUserDetailData,
   PeopleShipUserDetailData,
   ArticleCountData
   ArticleCountData
 } from 'wdBean'
 } from 'wdBean'
+import { EmptyComponent } from '../view/EmptyComponent'
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -35,65 +36,87 @@ struct PeopleShipHomePage {
   @Provide @Watch('handleChangeAttentionStata') isLoadingAttention: boolean = false
   @Provide @Watch('handleChangeAttentionStata') isLoadingAttention: boolean = false
   //关注显示
   //关注显示
   @State attentionOpacity: boolean = false
   @State attentionOpacity: boolean = false
-  @Provide topHeight: number = 400
+  @Provide topHeight: number = 286
+  @State isLoading: boolean = true
 
 
   build() {
   build() {
-
-    Stack({ alignContent: Alignment.TopStart }) {
-      // 头部返回
-      PeopleShipHomePageNavComponent({
-        attentionOpacity: this.attentionOpacity,
-        topOpacity: this.topOpacity,
-        detailModel: this.detailModel
-      })
-        .height($r('app.float.top_bar_height'))
-        .zIndex(100)
-        .backgroundColor(Color.Transparent)
-
-      if (this.detailModel && this.detailModel.userName) {
-        Scroll(this.scroller) {
-          Column() {
-            // 顶部相关
-            PeopleShipHomePageTopComponent({
-              creatorId: this.creatorId,
-              detailModel: this.detailModel,
-              publishCount: this.publishCount,
-              topHeight: this.topHeight
-            })
+      Stack({ alignContent: Alignment.TopStart }) {
+        // 顶部图片
+        Image($r('app.media.home_page_bg'))
+          .width('100%')
+          .height('120vp')
+          .objectFit(ImageFit.Fill)
+          .backgroundColor(Color.White)
+          .visibility(this.isLoading ? Visibility.None : Visibility.Visible)
+
+        Column(){
+          // 头部返回
+          PeopleShipHomePageNavComponent({
+            attentionOpacity: this.attentionOpacity,
+            topOpacity: this.topOpacity,
+            detailModel: this.detailModel
+          })
+            .height($r('app.float.top_bar_height'))
+            .backgroundColor(Color.Transparent)
+          if (this.detailModel && this.detailModel.userName) {
+            Scroll(this.scroller) {
+              Column() {
+                // 顶部相关
+                PeopleShipHomePageTopComponent({
+                  creatorId: this.creatorId,
+                  detailModel: this.detailModel,
+                  publishCount: this.publishCount,
+                  topHeight: this.topHeight
+                })
+                  .width("100%")
+                  .height(this.topHeight)
+                // 列表
+                Column(){
+                  PeopleShipHomeListComponent({
+                    publishCount: this.publishCount,
+                    creatorId: this.creatorId
+                  })
+                }.height('100%')
+
+
+              }
               .width("100%")
               .width("100%")
-              .height(this.topHeight)
+              .justifyContent(FlexAlign.Start)
+              .alignItems(HorizontalAlign.Start)
+              // .height('100%')
+              // .height(this.publishCount == 0 ? '100%' : '')
+            }
+            .scrollable(ScrollDirection.Vertical)
+            // .alignSelf(ItemAlign.Start)
+            // .align(Alignment.Start)
+            .edgeEffect(EdgeEffect.None)
+            .friction(0.7)
+            .backgroundColor(Color.White)
+            .scrollBar(BarState.Off)
+            .width('100%')
+            .height('calc(100% - 44vp)')
+            // .layoutWeight(1)
+            .onDidScroll(() => {
+              // this.topOpacity = yOffset / (this.getDeviceHeight() * 0.2)
+              this.topOpacity = this.scroller.currentOffset().yOffset / 100
+              if (this.scroller.currentOffset().yOffset >= this.topHeight - 66) {
+                this.attentionOpacity = true
+              } else {
+                this.attentionOpacity = false
+              }
+              Logger.debug('PeopleShipHomePage',`透明度:${this.topOpacity}`)
 
 
-            // 列表
-            PeopleShipHomeListComponent({
-              publishCount: this.publishCount,
-              creatorId: this.creatorId
             })
             })
-
           }
           }
-          .width("100%")
-          .justifyContent(FlexAlign.Start)
-          // .height(this.publishCount == 0 ? '100%' : '')
+
         }
         }
-        .edgeEffect(EdgeEffect.None)
-        .friction(0.6)
-        .backgroundColor(Color.White)
-        .scrollBar(BarState.Off)
+        .alignItems(HorizontalAlign.Start)
+        .justifyContent(FlexAlign.Start)
         .width('100%')
         .width('100%')
-        .height('100%')
-        .onDidScroll(() => {
-          // this.topOpacity = yOffset / (this.getDeviceHeight() * 0.2)
-          this.topOpacity = this.scroller.currentOffset().yOffset / 100
-          if (this.scroller.currentOffset().yOffset >= this.topHeight - 66) {
-            this.attentionOpacity = true
-          } else {
-            this.attentionOpacity = false
-          }
-          Logger.debug('PeopleShipHomePage',`透明度:${this.topOpacity}`)
-
-        })
+        // .height('100%')
       }
       }
-
-    }
+      // .height('100%')
+      .width('100%')
 
 
   }
   }
 
 
@@ -104,9 +127,11 @@ struct PeopleShipHomePage {
 
 
   private async getData() {
   private async getData() {
     try {
     try {
+      this.isLoading = true
       // 获取页面信息
       // 获取页面信息
       this.detailModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageDetailInfo(this.creatorId, '', '')
       this.detailModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageDetailInfo(this.creatorId, '', '')
       Logger.debug('PeopleShipHomePage', '获取页面信息' + `${JSON.stringify(this.detailModel)}`)
       Logger.debug('PeopleShipHomePage', '获取页面信息' + `${JSON.stringify(this.detailModel)}`)
+      this.isLoading = false
 
 
       // 获取关注
       // 获取关注
       // 登录后获取，是否关注
       // 登录后获取，是否关注
@@ -117,7 +142,7 @@ struct PeopleShipHomePage {
       }
       }
 
 
     } catch (exception) {
     } catch (exception) {
-
+      this.isLoading = false
     }
     }
   }
   }
 
 

 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
-import { DisplayUtils, LazyDataSource, Logger, SPHelper,  NetworkUtil, ToastUtils  } from 'wdKit';
+import { DisplayUtils, LazyDataSource, Logger, NetworkUtil, SPHelper, ToastUtils } from 'wdKit';
 import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter';
 import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter';
 import { PageComponent } from './PageComponent';
 import { PageComponent } from './PageComponent';
 import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout';
 import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout';

@@ -13,6 +13,8 @@ export struct VideoChannelPage {
   readonly MAX_LINE: number = 1;
   readonly MAX_LINE: number = 1;
   private groupId: number = 0
   private groupId: number = 0
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
+  // 自动刷新触发（双击tab自动刷新）
+  @Prop autoRefresh: number = 0
   @Prop topNavList: TopNavDTO[]
   @Prop topNavList: TopNavDTO[]
   @Link _currentNavIndex?: number;
   @Link _currentNavIndex?: number;
   @Consume barBackgroundColor: Color
   @Consume barBackgroundColor: Color
@@ -91,8 +93,12 @@ export struct VideoChannelPage {
           right: $r('app.float.top_tab_item_padding_horizontal'),
           right: $r('app.float.top_tab_item_padding_horizontal'),
         })
         })
         .onClick(() => {
         .onClick(() => {
+          if (this.currentTopNavSelectedIndex === index) {
+            this.autoRefresh++
+          }
           this.currentTopNavSelectedIndex = index
           this.currentTopNavSelectedIndex = index
           this.swiperController.changeIndex(index, true)
           this.swiperController.changeIndex(index, true)
+
         })
         })
       }, (item: TopNavDTO) => item.channelId + '')
       }, (item: TopNavDTO) => item.channelId + '')
     }
     }
@@ -113,6 +119,7 @@ export struct VideoChannelPage {
             groupId: this.groupId + '',
             groupId: this.groupId + '',
             pageId: item.pageId + '',
             pageId: item.pageId + '',
             channelId: item.channelId + '',
             channelId: item.channelId + '',
+            autoRefresh: this.autoRefresh,
           })
           })
         } else {
         } else {
           // 直播
           // 直播
@@ -121,7 +128,7 @@ export struct VideoChannelPage {
             navIndex: index,
             navIndex: index,
             pageId: item.pageId + '',
             pageId: item.pageId + '',
             channelId: item.channelId + '',
             channelId: item.channelId + '',
-            autoRefresh: this.autoRefresh2Page
+            autoRefresh: this.autoRefresh
           }).margin({ top: 40 })
           }).margin({ top: 40 })
         }
         }
       }, (item: TopNavDTO) => item.channelId + '')
       }, (item: TopNavDTO) => item.channelId + '')

 import { PeopleShipRecommendHeadComponent } from './PeopleShipRecommendHeadComponent'
 import { PeopleShipRecommendHeadComponent } from './PeopleShipRecommendHeadComponent'
 import { RmhRecommendDTO } from 'wdBean';
 import { RmhRecommendDTO } from 'wdBean';
+import { faceDetector } from '@kit.CoreVisionKit';
 
 
 @Component
 @Component
 export struct PeopleShipRecommendComponent {
 export struct PeopleShipRecommendComponent {
@@ -29,7 +30,7 @@ export struct PeopleShipRecommendComponent {
           .fontSize($r('app.float.vp_18'))
           .fontSize($r('app.float.vp_18'))
 
 
         Blank()
         Blank()
-        Button({ type: ButtonType.Normal, stateEffect: true }) {
+        Button({ type: ButtonType.Normal, stateEffect: false }) {
           Row() {
           Row() {
             Text('换一换')
             Text('换一换')
               .height('30vp')
               .height('30vp')

-import { Logger, DisplayUtils} from 'wdKit'
+import { Logger} from 'wdKit'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import {
 import {
   ContentDTO,
   ContentDTO,
@@ -16,11 +16,11 @@ import {
 } from 'wdBean'
 } from 'wdBean'
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
 import { PageRepository } from '../../repository/PageRepository'
 import { PageRepository } from '../../repository/PageRepository'
-import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
 import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData'
 import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData'
+import LoadMoreLayout from '../page/LoadMoreLayout'
 
 
 const TAG = 'PeopleShipHomeArticleListComponent';
 const TAG = 'PeopleShipHomeArticleListComponent';
 
 
@@ -47,45 +47,29 @@ export struct PeopleShipHomeArticleListComponent {
     } else if (this.viewType == 2) {
     } else if (this.viewType == 2) {
       ErrorComponent()
       ErrorComponent()
     }  else {
     }  else {
-      CustomPullToRefresh({
-        alldata:this.arr,
-        scroller:this.scroller,
-        hasMore: this.hasMore,
-        customList:()=>{
-          this.ListLayout()
-        },
-        onRefresh:(resolve)=>{
-          this.currentPage = 1
-          this.getPeopleShipPageArticleList(resolve)
-        },
-        onLoadMore:(resolve)=> {
-          if (this.hasMore === false) {
-            if(resolve) {
-              resolve('')
-            }
-            return
-          }
-          if(!this.isLoading && this.hasMore){
-            //加载分页数据
-            this.currentPage++;
-            this.getPeopleShipPageArticleList(resolve)
-          }else  {
-            if(resolve)  {
-              resolve('')
-            }
-          }
-        },
-      })
+      this.ListLayout()
+      // CustomPullToRefresh({
+      //   alldata:this.arr,
+      //   scroller:this.scroller,
+      //   hasMore: false,
+      //   customList:()=>{
+      //     this.ListLayout()
+      //   },
+      //   onRefresh:(resolve)=>{
+      //     this.currentPage = 1
+      //     this.getPeopleShipPageArticleList(resolve)
+      //   },
+      // })
     }
     }
 
 
   }
   }
 
 
   @Builder
   @Builder
   LoadingLayout() {
   LoadingLayout() {
-    CustomRefreshLoadLayout({
-      refreshBean: new RefreshLayoutBean(true,
-        $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), 20)
-    }).height(DisplayUtils.getDeviceHeight() - this.topHeight)
+    // CustomRefreshLoadLayout({
+    //   refreshBean: new RefreshLayoutBean(true,
+    //     $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), 20)
+    // }).height(DisplayUtils.getDeviceHeight() - this.topHeight)
   }
   }
 
 
   @Builder
   @Builder
@@ -93,7 +77,6 @@ export struct PeopleShipHomeArticleListComponent {
 
 
     List({scroller: this.scroller}) {
     List({scroller: this.scroller}) {
       // 下拉刷新
       // 下拉刷新
-
         ForEach(this.arr, (item: ContentDTO) => {
         ForEach(this.arr, (item: ContentDTO) => {
           ListItem() {
           ListItem() {
             CardParser({ contentDTO: item })
             CardParser({ contentDTO: item })
@@ -103,11 +86,14 @@ export struct PeopleShipHomeArticleListComponent {
 
 
         // 加载更多
         // 加载更多
         ListItem() {
         ListItem() {
-          if (!this.hasMore && !this.isLoading) {
+          if (this.hasMore) {
+            LoadMoreLayout({ isVisible: this.hasMore })
+          } else if (!this.hasMore && !this.isLoading) {
             PeopleShipNoMoreData()
             PeopleShipNoMoreData()
           }
           }
         }
         }
     }
     }
+    .backgroundColor(Color.Transparent)
     .width("100%")
     .width("100%")
     .height("100%")
     .height("100%")
     .edgeEffect(EdgeEffect.None)
     .edgeEffect(EdgeEffect.None)
@@ -115,13 +101,13 @@ export struct PeopleShipHomeArticleListComponent {
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollBackward: NestedScrollMode.SELF_FIRST
       scrollBackward: NestedScrollMode.SELF_FIRST
     })
     })
-
-    // .onReachEnd(() => {
-    //   if(!this.isLoading && this.hasMore){
-    //     //加载分页数据
-    //     this.getPeopleShipPageArticleList()
-    //   }
-    // })
+    .onReachEnd(() => {
+      if(!this.isLoading && this.hasMore){
+        //加载分页数据
+        this.currentPage++;
+        this.getPeopleShipPageArticleList()
+      }
+    })
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
@@ -313,7 +299,6 @@ export struct PeopleShipHomeArticleListComponent {
       }
       }
 
 
     }
     }
-
     // this.arr = listData.list
     // this.arr = listData.list
   }
   }
 
 

@@ -24,10 +24,10 @@ export struct PeopleShipHomeListComponent {
     // 列表
     // 列表
     else if (this.publishCount == 0) {
     else if (this.publishCount == 0) {
       // 无数据展示
       // 无数据展示
-      EmptyComponent({emptyType: 12}).height(DisplayUtils.getDeviceHeight() - this.topHeight)
+      EmptyComponent({emptyType: 12}).height('100%')
     } else {
     } else {
       Column() {
       Column() {
-        Column() {
+        Stack({ alignContent: Alignment.Top }){
           // 页签
           // 页签
           Row() {
           Row() {
             Scroll() {
             Scroll() {
@@ -44,54 +44,54 @@ export struct PeopleShipHomeListComponent {
             .scrollBar(BarState.Off)
             .scrollBar(BarState.Off)
             .width('100%')
             .width('100%')
           }
           }
+          .zIndex(10)
           .backgroundColor(Color.White)
           .backgroundColor(Color.White)
+          .height('44vp')
           .alignItems(VerticalAlign.Bottom)
           .alignItems(VerticalAlign.Bottom)
           .width('100%')
           .width('100%')
-        }
-        .justifyContent(FlexAlign.Start)
-        .height('44vp')
-        .alignItems(HorizontalAlign.Start)
-        .width('100%')
 
 
-        Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
-          ForEach(this.tabArr, (item: ArticleTypeData, index: number) => {
-            TabContent() {
-              PeopleShipHomeArticleListComponent({
-                typeModel: item,
-                creatorId: this.creatorId,
-                currentTopSelectedIndex: this.currentIndex,
-                currentIndex: index
-              })
-            }
-            // }.tabBar(this.tabBuilder(index, item.name ?? ''))
+          Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
+            ForEach(this.tabArr, (item: ArticleTypeData, index: number) => {
+              TabContent() {
+                PeopleShipHomeArticleListComponent({
+                  typeModel: item,
+                  creatorId: this.creatorId,
+                  currentTopSelectedIndex: this.currentIndex,
+                  currentIndex: index
+                })
+              }
+              // .tabBar(this.Tab(index, item.name ?? ''))
+            })
+
+          }
+          .backgroundColor(Color.White)
+          .barWidth('100%')
+          .vertical(false)
+          .barHeight('44vp')
+          .height('100% ')
+          .animationDuration(0)
+          .divider({
+            strokeWidth: '0.5vp',
+            color: $r('app.color.color_F5F5F5'),
+            startMargin: 0,
+            endMargin: 0
+          })
+          .onChange((index: number) => {
+            this.currentIndex = index
           })
           })
 
 
         }
         }
-        .backgroundColor(Color.White)
-        .barWidth('100%')
-        .barHeight(0)
-        .vertical(false)
-        .height(DisplayUtils.getDeviceHeight() - 144)
-        .animationDuration(0)
-        .divider({
-          strokeWidth: '0.5vp',
-          color: $r('app.color.color_F5F5F5'),
-          startMargin: 0,
-          endMargin: 0
-        })
-        .onChange((index: number) => {
-          this.currentIndex = index
-        })
+
       }
       }
     }
     }
   }
   }
 
 
   @Builder
   @Builder
   LoadingLayout() {
   LoadingLayout() {
-    CustomRefreshLoadLayout({
-      refreshBean: new RefreshLayoutBean(true,
-        $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), DisplayUtils.getDeviceHeight() - this.topHeight)
-    }).height(DisplayUtils.getDeviceHeight() - this.topHeight)
+    // CustomRefreshLoadLayout({
+    //   refreshBean: new RefreshLayoutBean(true,
+    //     $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), DisplayUtils.getDeviceHeight() - this.topHeight)
+    // }).height('100%')
   }
   }
 
 
   // 单独的页签
   // 单独的页签

@@ -12,6 +12,7 @@ import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
 import {  HttpUtils } from 'wdNetwork/Index';
 import {  HttpUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import { WDRouterPage, WDRouterRule } from 'wdRouter'
 import {  LazyDataSource } from 'wdKit/Index';
 import {  LazyDataSource } from 'wdKit/Index';
+import LoadMoreLayout from '../page/LoadMoreLayout'
 
 
 const TAG: string = 'ReserveMorePage';
 const TAG: string = 'ReserveMorePage';
 
 
@@ -31,7 +32,7 @@ struct ReserveMorePage {
   topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   type: number = 2;
   type: number = 2;
   pageSize: number = 20;
   pageSize: number = 20;
-  title: string = '预约列表'
+  title: string = '直播预告'
   //是否预约过直播
   //是否预约过直播
   @State isAppointmentLive: boolean = false
   @State isAppointmentLive: boolean = false
   @State contentDTO: ContentDTO = {} as ContentDTO;
   @State contentDTO: ContentDTO = {} as ContentDTO;
@@ -95,7 +96,9 @@ struct ReserveMorePage {
       )
       )
       // 加载更多
       // 加载更多
       ListItem() {
       ListItem() {
-        if (!this.hasMore && !this.isLoading) {
+        if (this.hasMore) {
+          LoadMoreLayout({ isVisible: this.hasMore })
+        } else if (!this.hasMore && !this.isLoading) {
           PeopleShipNoMoreData()
           PeopleShipNoMoreData()
         }
         }
       }
       }
@@ -201,7 +204,7 @@ struct ReserveMorePage {
             .color(!this.isReserved(item) ? $r('app.color.color_fff') : $r('app.color.color_CCCCCC'))
             .color(!this.isReserved(item) ? $r('app.color.color_fff') : $r('app.color.color_CCCCCC'))
             .visibility((this.isLoadingAttention && this.liveId == item.objectId) ? Visibility.Visible : Visibility.None)
             .visibility((this.isLoadingAttention && this.liveId == item.objectId) ? Visibility.Visible : Visibility.None)
 
 
-          Text(!this.isReserved(item) ? '关注' : '已关注')
+          Text(!this.isReserved(item) ? '预约' : '已预约')
             .fontSize($r('app.float.vp_12'))
             .fontSize($r('app.float.vp_12'))
             .fontWeight(500)
             .fontWeight(500)
             .fontColor(!this.isReserved(item) ? $r('app.color.color_fff') : $r('app.color.color_CCCCCC'))
             .fontColor(!this.isReserved(item) ? $r('app.color.color_fff') : $r('app.color.color_CCCCCC'))

@@ -323,9 +323,10 @@ export struct SearchComponent {
         if(value.videoTotal!=0){
         if(value.videoTotal!=0){
           this.count.push("视频")
           this.count.push("视频")
         }
         }
-        if(value.activityTotal!=0){
-          this.count.push("活动")
-        }
+        //屏蔽活动
+        // if(value.activityTotal!=0){
+        //   this.count.push("活动")
+        // }
       }
       }
       this.isGetRequest = true
       this.isGetRequest = true
      this.resetSearch()
      this.resetSearch()

-import { ContentDTO,
+import {
+  ContentDTO,
   contentListParams,
   contentListParams,
-  FullColumnImgUrlDTO, InteractDataDTO,
+  FullColumnImgUrlDTO,
+  InteractDataDTO,
   Params,
   Params,
-  RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index'
+  RmhInfoDTO,
+  VideoInfoDTO
+} from 'wdBean/Index'
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
-import { LazyDataSource, Logger, StringUtils, ToastUtils } from 'wdKit/Index'
+import { LazyDataSource, Logger, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import MinePageDatasModel from '../../model/MinePageDatasModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
+import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem'
+import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
+import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import { SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 import { SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
+import { FollowChildComponent } from '../mine/follow/FollowChildComponent'
 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
 import { ActivityItemComponent } from './ActivityItemComponent'
 import { ActivityItemComponent } from './ActivityItemComponent'
 import { SearchCreatorComponent } from './SearchCreatorComponent'
 import { SearchCreatorComponent } from './SearchCreatorComponent'
@@ -19,27 +28,28 @@ import { SearchCreatorComponent } from './SearchCreatorComponent'
 const TAG = "SearchResultContentComponent"
 const TAG = "SearchResultContentComponent"
 
 
 @Component
 @Component
-export struct SearchResultContentComponent{
-  @State keywords:string = ""
-  @State searchType:string = ""
+export struct SearchResultContentComponent {
+  @State keywords: string = ""
+  @State searchType: string = ""
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data_rmh: SearchRmhDescription[] = []
   @State data_rmh: SearchRmhDescription[] = []
-  @State count:number = -1;
-  @State isLoading:boolean = false
-  @State hasMore:boolean = true
-  curPageNum:number = 1;
-
+  @State count: number = -1;
+  @State isLoading: boolean = false
+  @State hasMore: boolean = true
+  curPageNum: number = 1;
+  @State bean: FollowListDetailItem = new FollowListDetailItem("", "", "", "", "", "", "", "", "", -1, -1, "")
+  scroller: Scroller = new Scroller()
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-    if(this.searchType == "全部"){
+    if (this.searchType == "全部") {
       this.searchType = "all"
       this.searchType = "all"
-    }else if(this.searchType == "精选"){
+    } else if (this.searchType == "精选") {
       this.searchType = "cms"
       this.searchType = "cms"
-    }else if(this.searchType == "人民号"){
+    } else if (this.searchType == "人民号") {
       this.searchType = "rmh"
       this.searchType = "rmh"
-    }else if(this.searchType == "视频"){
+    } else if (this.searchType == "视频") {
       this.searchType = "video"
       this.searchType = "video"
-    }else if(this.searchType == "活动"){
+    } else if (this.searchType == "活动") {
       this.searchType = "activity"
       this.searchType = "activity"
     }
     }
 
 
@@ -47,93 +57,135 @@ export struct SearchResultContentComponent{
     this.getNewSearchResultData()
     this.getNewSearchResultData()
   }
   }
 
 
-  getNewSearchResultData(){
+  getNewSearchResultData() {
     this.isLoading = true
     this.isLoading = true
-    if(this.hasMore){
-      SearcherAboutDataModel.getSearchResultListData("20",`${this.curPageNum}`,this.searchType,this.keywords,getContext(this)).then((value)=>{
-        if (!this.data || value.list.length == 0){
+    if (this.hasMore) {
+      SearcherAboutDataModel.getSearchResultListData("15", `${this.curPageNum}`, this.searchType, this.keywords,
+        getContext(this)).then((value) => {
+        if (!this.data || value.list.length == 0) {
           this.hasMore = false
           this.hasMore = false
           this.isLoading = false
           this.isLoading = false
-          this.count = this.count===-1?0:this.count
-        }else{
-          if(value.list[0].dataList!=null){
+          this.count = this.count === -1 ? 0 : this.count
+        } else {
+          if (value.list[0].dataList != null) {
             let data_temp: SearchRmhDescription[] = []
             let data_temp: SearchRmhDescription[] = []
+
             data_temp = value.list[0].dataList
             data_temp = value.list[0].dataList
 
 
             //TODO 查询创作者详情接口
             //TODO 查询创作者详情接口
             let request = new CreatorDetailRequestItem()
             let request = new CreatorDetailRequestItem()
 
 
-            data_temp.forEach((data)=>{
+            data_temp.forEach((data) => {
               request.creatorIdList.push(data.creatorId)
               request.creatorIdList.push(data.creatorId)
             })
             })
 
 
-            SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{
-              if(value!=null && value.length>0){
-                data_temp.forEach((data)=>{
-                  value.forEach((item)=>{
-                    if(data.creatorId == item.creatorId){
+            SearcherAboutDataModel.getCreatorDetailListData(request).then((value) => {
+              if (value != null && value.length > 0) {
+                data_temp.forEach((data) => {
+                  value.forEach((item) => {
+                    if (data.creatorId == item.creatorId) {
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
-                      data.mainControl = item.mainControl+""
+                      data.mainControl = item.mainControl + ""
+
+                      if(data_temp.length === 1){
+                        this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0]
+                        this.bean.cnUserName = item.userName
+                        this.bean.creatorId = item.creatorId
+                        this.bean.authIcon = item.authIcon
+
+                        if (value[0].fansNum > 10000) {
+                          let temp = (value[0].fansNum / 10000) + ""
+                          let index = temp.indexOf('.')
+                          if (index != -1) {
+                            temp = temp.substring(0, index + 2)
+                          } else {
+                            temp = temp
+                          }
+                          this.bean.cnFansNum = temp + "万"
+                        } else {
+                          this.bean.cnFansNum = item.fansNum + ""
+                        }
+                        this.bean.introduction = item.introduction
+                        this.bean.mainControl = item.mainControl
+                        this.bean.banControl = item.banControl
+                        this.bean.cnUserType = item.userType
+                        this.bean.cnUserId = item.userId
+                      }
                     }
                     }
                   })
                   })
                 })
                 })
               }
               }
-              data_temp.forEach((data)=>{
+              data_temp.forEach((data) => {
                 this.data_rmh.push(data)
                 this.data_rmh.push(data)
               })
               })
 
 
-            }).catch((err:Error)=>{
-              console.log(TAG,JSON.stringify(err))
+              //只有一条创作者，获取 创作者信息
+              if (this.data_rmh.length === 1) {
+                if(StringUtils.isNotEmpty(UserDataLocal.getUserId())){
+                  //查询是否被关注
+                  let status = new FollowListStatusRequestItem()
+                  status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId))
+                  MinePageDatasModel.getFollowListStatusData(status, getContext(this)).then((newValue) => {
+                    this.bean.status = newValue[0].status
+                  }).catch((err: Error) => {
+                    console.log(TAG, "请求失败")
+                  })
+                }else{
+                  this.bean.status = ""
+                }
+              }
+            }).catch((err: Error) => {
+              console.log(TAG, JSON.stringify(err))
             })
             })
           }
           }
           this.getInteractData(value)
           this.getInteractData(value)
         }
         }
-      }).catch((err:Error)=>{
-        console.log(TAG,JSON.stringify(err))
+      }).catch((err: Error) => {
+        console.log(TAG, JSON.stringify(err))
         this.isLoading = false
         this.isLoading = false
-        this.count = this.count===-1?0:this.count
+        this.count = this.count === -1 ? 0 : this.count
       })
       })
     }
     }
   }
   }
 
 
-  getInteractData(resultData:SearchResultContentData){
-    if(resultData.list[0].dataList!=null){
-      resultData.list.splice(0,1)
+  getInteractData(resultData: SearchResultContentData) {
+    if (resultData.list[0].dataList != null) {
+      resultData.list.splice(0, 1)
     }
     }
 
 
-    let data : contentListParams = {
+    let data: contentListParams = {
       contentList: []
       contentList: []
     }
     }
-    resultData.list.forEach((item)=>{
+    resultData.list.forEach((item) => {
       data.contentList.push({
       data.contentList.push({
         contentId: item.data.id + '',
         contentId: item.data.id + '',
         contentType: Number.parseInt(item.data.type)
         contentType: Number.parseInt(item.data.type)
       })
       })
     })
     })
 
 
-    SearcherAboutDataModel.getInteractListData(data,getContext(this)).then((newValue)=>{
-      newValue.forEach((item)=>{
-        resultData.list.forEach((data)=>{
+    SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
+      newValue.forEach((item) => {
+        resultData.list.forEach((data) => {
           if (item.contentId == data.data.id) {
           if (item.contentId == data.data.id) {
-            data.data.collectNum = item.collectNum+""
-            data.data.commentNum = item.commentNum+""
-            data.data.likeNum = item.likeNum+""
-            data.data.readNum = item.readNum+""
-            data.data.shareNum = item.shareNum+""
+            data.data.collectNum = item.collectNum + ""
+            data.data.commentNum = item.commentNum + ""
+            data.data.likeNum = item.likeNum + ""
+            data.data.readNum = item.readNum + ""
+            data.data.shareNum = item.shareNum + ""
           }
           }
         })
         })
       })
       })
 
 
-      resultData.list.forEach((value)=>{
-        let photos:FullColumnImgUrlDTO[] = []
-        if(value.data.appStyle === 4){
-          value.data.appStyleImages.split("&&").forEach((value)=>{
-            photos.push({url:value} as FullColumnImgUrlDTO)
+      resultData.list.forEach((value) => {
+        let photos: FullColumnImgUrlDTO[] = []
+        if (value.data.appStyle === 4) {
+          value.data.appStyleImages.split("&&").forEach((value) => {
+            photos.push({ url: value } as FullColumnImgUrlDTO)
           })
           })
         }
         }
 
 
-        let contentDTO = this.dataTransform(value,photos);
-        if(contentDTO.appStyle != "13"){
+        let contentDTO = this.dataTransform(value, photos);
+        if (contentDTO.appStyle != "13") {
           this.data.push(contentDTO)
           this.data.push(contentDTO)
         }
         }
 
 
@@ -142,131 +194,189 @@ export struct SearchResultContentComponent{
       this.count = this.data.totalCount()
       this.count = this.data.totalCount()
       if (this.data.totalCount() < resultData.totalCount) {
       if (this.data.totalCount() < resultData.totalCount) {
         this.curPageNum++
         this.curPageNum++
-      }else {
+      } else {
         this.hasMore = false
         this.hasMore = false
       }
       }
       this.isLoading = false
       this.isLoading = false
 
 
-      if(this.count === 0 && resultData.list.length > 0){
+      if (this.count === 0 && resultData.list.length > 0) {
         this.count = -1
         this.count = -1
-        if(!this.isLoading){
+        if (!this.isLoading) {
           //加载分页数据
           //加载分页数据
           this.getNewSearchResultData()
           this.getNewSearchResultData()
         }
         }
-      }else if(this.count <= 20 && resultData.list.length > 0){
-        if(!this.isLoading){
+      } else if (this.count <= 10 && resultData.list.length > 0) {
+        if (!this.isLoading) {
           //加载分页数据
           //加载分页数据
           this.getNewSearchResultData()
           this.getNewSearchResultData()
         }
         }
       }
       }
-    }).catch((err:Error)=>{
-      console.log(TAG,"请求失败")
+    }).catch((err: Error) => {
+      console.log(TAG, "请求失败")
       this.isLoading = false
       this.isLoading = false
-      this.count = this.count===-1?0:this.count
+      this.count = this.count === -1 ? 0 : this.count
     })
     })
   }
   }
 
 
   build() {
   build() {
     Column() {
     Column() {
-      if(this.count == 0){
-        ListHasNoMoreDataUI({style:2})
-      }else{
-        Column(){
-          if (this.data_rmh!=null && this.data_rmh.length > 0) {
-            //List
-            List({space:'8lpx'}) {
-              ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
-                ListItem() {
-                  SearchCreatorComponent({item:item})
-                }.onClick(()=>{
-                  //TODO 跳转
-                })
-                .width('150lpx')
-                .height('100%')
-              })
-
+      if (this.count == 0) {
+        ListHasNoMoreDataUI({ style: 2 })
+      } else {
+        List() {
+          if (this.data_rmh != null && this.data_rmh.length > 0){
+            if (this.data_rmh.length === 1){
+              ListItem(){
+                FollowChildComponent({ data: this.bean, type: 1 })
+              }.padding({left:"31lpx",right:"31lpx"})
+            }else{
               ListItem(){
               ListItem(){
                 Column(){
                 Column(){
-                  Text("查看更多")
-                    .width('19lpx')
-                    .fontSize('19lpx')
-                    .fontWeight('400lpx')
-                    .lineHeight('27lpx')
-                    .fontColor($r('app.color.color_9E9E9E'))
-                }.borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
-                .height('180lpx')
-                .width('77lpx')
-                .backgroundColor($r('app.color.color_EDEDED'))
-                .justifyContent(FlexAlign.Center)
-
-              }.height('100%')
-              .margin({left:'23lpx'})
-              .onClick(()=>{
-                let params: Params = {
-                  pageID: this.keywords
+                  this.SearchListUI()
                 }
                 }
-                WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
-              })
+              }
             }
             }
-            .cachedCount(6)
-            .edgeEffect(EdgeEffect.Spring)
-            .scrollBar(BarState.Off)
-            .listDirection(Axis.Horizontal)
-            .width('100%')
-            .height('219lpx')
-
-            Divider()
-              .width('100%')
-              .height('12lpx')
-              .color($r('app.color.color_F5F5F5'))
-              .strokeWidth('12lpx')
           }
           }
-          //List
-          List({ space: '6lpx' }) {
-            LazyForEach(this.data, (item: ContentDTO, index: number) => {
-              ListItem() {
-                Column(){
-                  if(this.searchType == "activity"){
-                    ActivityItemComponent({contentDTO:item})
-                  }else{
-                    CardParser({contentDTO:item})
-                  }
-                  if(index != this.data.totalCount()-1 ){
-                    Divider()
-                      .width('100%')
-                      .height('1lpx')
-                      .color($r('app.color.color_F5F5F5'))
-                      .strokeWidth('1lpx')
-                  }
+          LazyForEach(this.data, (item: ContentDTO, index: number) => {
+            ListItem() {
+              Column() {
+                if (this.searchType == "activity") {
+                  ActivityItemComponent({ contentDTO: item })
+                } else {
+                  CardParser({ contentDTO: item })
+                }
+                if (index != this.data.totalCount() - 1) {
+                  Divider()
+                    .width('100%')
+                    .height('1lpx')
+                    .color($r('app.color.color_F5F5F5'))
+                    .strokeWidth('1lpx')
                 }
                 }
-              }
-            }, (item: ContentDTO, index: number) => index.toString())
-
-            //没有更多数据  显示提示
-            if(!this.hasMore && this.data.totalCount() > 0){
-              ListItem(){
-                ListHasNoMoreDataUI()
               }
               }
             }
             }
-          }.cachedCount(6)
-          .edgeEffect(EdgeEffect.None)
-          .scrollBar(BarState.Off)
-          .layoutWeight(1)
-          .onReachEnd(()=>{
-            console.log(TAG,"触底了");
-            if(!this.isLoading){
-              //加载分页数据
-              this.getNewSearchResultData()
+          }, (item: ContentDTO, index: number) => index.toString())
+
+          //没有更多数据  显示提示
+          if (!this.hasMore && this.data.totalCount() > 0) {
+            ListItem() {
+              ListHasNoMoreDataUI()
             }
             }
-          })
-        }.layoutWeight(1)
+          }
+        }.cachedCount(10)
+        .edgeEffect(EdgeEffect.None)
+        .scrollBar(BarState.Off)
+        .onReachEnd(() => {
+          console.log(TAG, "触底了");
+          if (!this.isLoading) {
+            //加载分页数据
+            this.getNewSearchResultData()
+          }
+        })
       }
       }
     }
     }
     .backgroundColor($r('app.color.white'))
     .backgroundColor($r('app.color.white'))
-    .layoutWeight(1)
     .width('100%')
     .width('100%')
   }
   }
 
 
+  @Builder
+  multiCreatorUI() {
+    Column() {
+      List() {
+        ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
+          ListItem() {
+            SearchCreatorComponent({ item: item })
+          }
+          .width('150lpx')
+          .height('100%')
+        })
+
+        ListItem() {
+          Column() {
+            Text("查看更多")
+              .width('19lpx')
+              .fontSize('19lpx')
+              .fontWeight('400lpx')
+              .lineHeight('27lpx')
+              .fontColor($r('app.color.color_9E9E9E'))
+          }
+          .borderRadius({ topLeft: '4lpx', bottomLeft: '4lpx' })
+          .height('180lpx')
+          .width('77lpx')
+          .backgroundColor($r('app.color.color_EDEDED'))
+          .justifyContent(FlexAlign.Center)
+
+        }.height('100%')
+        .margin({ left: '23lpx' })
+        .onClick(() => {
+          let params: Params = {
+            pageID: this.keywords
+          }
+          WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage, params)
+        })
+      }
+      .cachedCount(6)
+      .edgeEffect(EdgeEffect.None)
+      .scrollBar(BarState.Off)
+      .listDirection(Axis.Horizontal)
+      .width('100%')
+      .height('219lpx')
+
+      Divider()
+        .width('100%')
+        .height('12lpx')
+        .color($r('app.color.color_F5F5F5'))
+        .strokeWidth('12lpx')
+    }
+  }
+
+  @Builder
+  SearchListUI() {
+    List({space:'8lpx'}) {
+      ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
+        ListItem() {
+          SearchCreatorComponent({item:item})
+        }
+        .width('150lpx')
+        .height('100%')
+      })
+
+      ListItem(){
+        Column(){
+          Text("查看更多")
+            .width('19lpx')
+            .fontSize('19lpx')
+            .fontWeight('400lpx')
+            .lineHeight('27lpx')
+            .fontColor($r('app.color.color_9E9E9E'))
+        }.borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
+        .height('180lpx')
+        .width('77lpx')
+        .backgroundColor($r('app.color.color_EDEDED'))
+        .justifyContent(FlexAlign.Center)
+
+      }.height('100%')
+      .margin({left:'23lpx'})
+      .onClick(()=>{
+        let params: Params = {
+          pageID: this.keywords
+        }
+        WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
+      })
+    }
+    .cachedCount(6)
+    .edgeEffect(EdgeEffect.None)
+    .scrollBar(BarState.Off)
+    .listDirection(Axis.Horizontal)
+    .width('100%')
+    .height('219lpx')
+
+    Divider()
+      .width('100%')
+      .height('12lpx')
+      .color($r('app.color.color_F5F5F5'))
+      .strokeWidth('12lpx')
+  }
+
   private dataTransform(value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
   private dataTransform(value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
     let contentDTO = new ContentDTO();
     let contentDTO = new ContentDTO();
     contentDTO.appStyle = value.data.appStyle + ""
     contentDTO.appStyle = value.data.appStyle + ""

@@ -8,7 +8,7 @@ const TAG = 'AboutPageUI';
 
 
 @Component
 @Component
 export struct AboutPageUI {
 export struct AboutPageUI {
-  @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议'];
+  @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议','收集个人信息明示清单','第三方信息共享清单'];
   @State message: string = '京ICP备16066560号-6A   Copyright © 人民日报客户端\nall rights reserved.'
   @State message: string = '京ICP备16066560号-6A   Copyright © 人民日报客户端\nall rights reserved.'
   @State version: string = '版本号：v'
   @State version: string = '版本号：v'
   dialogController: CustomDialogController = new CustomDialogController({
   dialogController: CustomDialogController = new CustomDialogController({
@@ -76,9 +76,15 @@ export struct AboutPageUI {
             if (index == 0) {
             if (index == 0) {
               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 {
+            } else if(index == 1){
               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){
+              let bean = { contentID: "5", pageID: "" } as Params
+              WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
+            }else if(index == 3){
+              let bean = { contentID: "6", pageID: "" } as Params
+              WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
             }
             }
           })
           })
         })
         })

@@ -14,6 +14,7 @@ import { MineMainSettingFunctionItem } from '../../viewmodel/MineMainSettingFunc
 import common from '@ohos.app.ability.common';
 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';
 
 
 @Component
 @Component
 export struct MineSettingComponent {
 export struct MineSettingComponent {
@@ -23,17 +24,22 @@ export struct MineSettingComponent {
   @State cacheSize: number = 0
   @State cacheSize: number = 0
   @State accountState:boolean=false
   @State accountState:boolean=false
   preferences: dataPreferences.Preferences | null = null;
   preferences: dataPreferences.Preferences | null = null;
+
   dialogController: CustomDialogController = new CustomDialogController({
   dialogController: CustomDialogController = new CustomDialogController({
-    builder: CustomCacheDialog({
+    builder: MyCustomDialog({
       cancel: () => {
       cancel: () => {
-
       },
       },
       confirm: () => {
       confirm: () => {
         this.deleteCache()
         this.deleteCache()
-      }
+      },
+      title: "清理缓存",
+      tipValue:"是否确认清理此App的缓存",
+      tipShow:true,
+      leftTextColor:$r('app.color.color_648DF2')
     }),
     }),
-    customStyle: true,
-    alignment: DialogAlignment.Center
+    autoCancel: true,
+    alignment: DialogAlignment.Center,
+    customStyle: true
   })
   })
   aboutToAppear() {
   aboutToAppear() {
     // 获取设置页面数据
     // 获取设置页面数据

@@ -16,29 +16,42 @@ export struct newsSkeleton {
               Column() {
               Column() {
                 Image($r('app.media.peopleSeleton')).width('100%').height(47)// 后缀名不能省略
                 Image($r('app.media.peopleSeleton')).width('100%').height(47)// 后缀名不能省略
                   .interpolation(ImageInterpolation.High)
                   .interpolation(ImageInterpolation.High)
-                textArea('100%', 9)
-              }.width('72.00%').alignItems(HorizontalAlign.Start).margin({ right: 5 })
+                textArea('100%', 8)
+              }
+              .width(124)
+              .alignItems(HorizontalAlign.Start)
+              .margin({ right: 5 })
 
 
               Column() {
               Column() {
-                textArea(27, 25)
-                textArea(27, 4)
-                textArea(27, 20)
+                Row()
+                  .width(27)
+                  .height(25)
+                  .backgroundColor('#FFF5F5F5')
+                Row()
+                  .width(27)
+                  .height(4)
+                  .backgroundColor('#FFF5F5F5')
+                  .margin({ top: 3, bottom: 3 })
+                Row()
+                  .width(27)
+                  .height(20)
+                  .backgroundColor('#FFF5F5F5')
+                // textArea(27, 25)
+                // textArea(27, 4)
+                // textArea(27, 20)
               }
               }
               .border({ width: 1 })
               .border({ width: 1 })
               .borderColor('#FFF5F5F5')
               .borderColor('#FFF5F5F5')
               .padding({
               .padding({
-                right: 2,
-                left: 2,
-                top: 0,
-                bottom: 2
+                right: 5,
+                left: 5,
+                top: 4,
+                bottom: 4
               })
               })
-              .justifyContent(FlexAlign.SpaceEvenly)
+              .justifyContent(FlexAlign.SpaceBetween)
               .alignItems(HorizontalAlign.Start)
               .alignItems(HorizontalAlign.Start)
             }
             }
-            .justifyContent(FlexAlign.SpaceBetween)
-            .width('98%')
-
-            // .height(64)
+            .width('100%')
 
 
             BoxAndLine().width('100%')
             BoxAndLine().width('100%')
             BoxAndBox({ firstBoxNumber: '65%', boxHeight: 100 })
             BoxAndBox({ firstBoxNumber: '65%', boxHeight: 100 })
@@ -48,24 +61,27 @@ export struct newsSkeleton {
 
 
             BoxAndBox({ firstBoxNumber: '30%', boxHeight: 51 })
             BoxAndBox({ firstBoxNumber: '30%', boxHeight: 51 })
 
 
-          }.width('45%')
-          .opacity(1)
-          .align(Alignment.Start)
-          .alignItems(HorizontalAlign.Start)
+          }
+          .width('50%')
+          .margin({ right: 5 })
 
 
           Column() {
           Column() {
             Column() {
             Column() {
               textArea('100%', 13)
               textArea('100%', 13)
             }.width('100%')
             }.width('100%')
 
 
-            BoxAndLine()
+            Column() {
+              textArea('100%', 136)
+              textArea('100%', 13)
+              textArea('80%', 13)
+            }.width('100%').alignItems(HorizontalAlign.Start)
 
 
             Column() {
             Column() {
-              textArea('95%', 126)
+              textArea('100%', 126)
             }
             }
 
 
             Column() {
             Column() {
-              textArea('95%', 13)
+              textArea('100%', 13)
             }
             }
 
 
             Row() {
             Row() {
@@ -76,24 +92,28 @@ export struct newsSkeleton {
               Column() {
               Column() {
                 textArea('100%', 30)
                 textArea('100%', 30)
               }.layoutWeight(1)
               }.layoutWeight(1)
-            }.width('95%').justifyContent(FlexAlign.SpaceBetween)
+            }.width('100%').justifyContent(FlexAlign.SpaceBetween)
 
 
             Column() {
             Column() {
-              textArea('95%', 100)
+              textArea('100%', 100)
             }
             }
-          }.width('45%')
+          }
+          .width('50%')
         }
         }
         .justifyContent(FlexAlign.SpaceBetween)
         .justifyContent(FlexAlign.SpaceBetween)
         .backgroundColor(Color.White)
         .backgroundColor(Color.White)
         .padding({
         .padding({
-          top: 5,
-          bottom: 5,
-          right: 5,
-          left: 5
+          top: 15,
+          bottom: 15,
+          right: 15,
+          left: 15
         })
         })
+
+        Column().backgroundColor('#CBCBCB').height(5).width(339)
+        Column().backgroundColor('#909090').height(5).width(326)
       }
       }
       .width('100%')
       .width('100%')
-
+      .padding({ right: 10, left: 10 })
     }
     }
     .height('100%')
     .height('100%')
 
 
@@ -107,7 +127,7 @@ struct BoxAndLine {
       textArea('100%', 130)
       textArea('100%', 130)
       textArea('100%', 13)
       textArea('100%', 13)
       textArea('80%', 13)
       textArea('80%', 13)
-    }.width('98%').alignItems(HorizontalAlign.Start)
+    }.alignItems(HorizontalAlign.Start)
   }
   }
 }
 }
 
 
@@ -140,18 +160,5 @@ function textArea(width: number | Resource | string = '100%', height: number | R
   // .borderRadius(5)
   // .borderRadius(5)
 }
 }
 
 
-// 全局公共样式
-@Styles
-function SkeletonStyle() {
-  .padding({ right: 14, left: 14 })
-  .width('100%')
-  .margin({ top: 5 })
-}
 
 
-@Extend(Column)
-function RightStyle() {
-  .alignItems(HorizontalAlign.Start)
-  .justifyContent(FlexAlign.SpaceAround)
-  .height('100%')
-}
 
 

-import { Logger } from 'wdKit/Index'
+import { Logger, NumberFormatterUtils } from 'wdKit/Index'
 import { LikeViewModel } from '../../viewmodel/LikeViewModel'
 import { LikeViewModel } from '../../viewmodel/LikeViewModel'
 import { SPHelper } from 'wdKit';
 import { SPHelper } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
+import { ContentDetailDTO } from 'wdBean/Index';
 
 
 
 
 const TAG = 'LikeComponent';
 const TAG = 'LikeComponent';
 
 
+interface ILikeStyleResp {
+  url: Resource;
+  name: string;
+}
+
 @Component
 @Component
 export struct LikeComponent {
 export struct LikeComponent {
+  @Consume contentDetailData: ContentDetailDTO
+  @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State likeStatus: boolean = false
   @State likeStatus: boolean = false
   viewModel: LikeViewModel = new LikeViewModel()
   viewModel: LikeViewModel = new LikeViewModel()
   @Prop data: Record<string, string>
   @Prop data: Record<string, string>
   enableBtn = true
   enableBtn = true
-  componentType : number = 1   //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
-  styleType : number = 1   //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
+  componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
+  styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   @State likeCount: number = 0 //点赞数
   @State likeCount: number = 0 //点赞数
 
 
   //上层传值  样例
   //上层传值  样例
@@ -37,105 +45,202 @@ export struct LikeComponent {
   }
   }
 
 
   build() {
   build() {
-    if (this.componentType == 2){
+
+    if (this.componentType == 2) {
       //2: 新闻页中间位置样式
       //2: 新闻页中间位置样式
-      Column() {
+      this.likeCompStyle2()
+    } else if (this.componentType == 3) {
+      this.likeCompStyle3()
+    } else if (this.componentType == 4) {
+      // 直播，点赞按钮底测有灰色圆角背景+右上点赞数量
+      this.likeCompStyle4()
+    } else {
+      //1: 底部栏目样式  默认样式
+      this.likeCompStyle1()
+    }
+  }
 
 
-        Button(){
-
-          Row(){
-            Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
-              .width(20)
-              .height(20)
-            Text(this.likeCount.toString())
-              .height(20)
-              .margin({
-                right: 0,
-                left: 4
-              })
-              .fontColor(this.likeStatus ? '#ED2800' : '#222222')
-              .fontSize('16')
-          }
-          .justifyContent(FlexAlign.Center)
-          .width('100%')
-          .height('100%')
+  /**
+   * 将点赞样式转换为icon
+   */
+  transLikeStyle(): ILikeStyleResp {
+    if (this.likesStyle === 1) {
+      return {
+        url: this.likeStatus ? $r(`app.media.ic_like_check`) :
+          this.styleType == 1 ? $r('app.media.icon_like_default') : $r(`app.media.ic_like_uncheck`),
+        name: '赞'
+      }
+    } else if (this.likesStyle === 2) {
+      return {
+        url: this.likeStatus ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
+        name: '祈祷'
+      }
+    } else if (this.likesStyle === 3) {
+      return {
+        url: this.likeStatus ? $r(`app.media.ic_candle_check`) :
+        $r(`app.media.ic_candle_uncheck`),
+        name: '默哀'
+      }
+    }
+    return {
+      url: this.likeStatus ? $r(`app.media.ic_like_check`) :
+        this.styleType == 1 ? $r('app.media.icon_like_default') : $r(`app.media.ic_like_uncheck`),
+      name: '点赞'
+    }
+  }
 
 
+  @Builder
+  likeCompStyle2() {
+    //2: 新闻页中间位置样式
+    Column() {
+      Button() {
+        Row() {
+          Image(this.transLikeStyle().url)
+            .width(20)
+            .height(20)
+          Text(this.likeCount.toString())
+            .height(20)
+            .margin({
+              right: 0,
+              left: 4
+            })
+            .fontColor(this.likeStatus ? '#ED2800' : '#222222')
+            .fontSize('16')
         }
         }
+        .justifyContent(FlexAlign.Center)
         .width('100%')
         .width('100%')
         .height('100%')
         .height('100%')
-        .backgroundColor(Color.White)
-        .type(ButtonType.Capsule)
-        .borderColor('#EDEDED')
-        .borderRadius(20)
-        .borderWidth(1)
-        .onClick(()=>{
-          this.clickButtonEvent()
-        })
-      }
-      .width(154)
-      .height(40)
-    }else if(this.componentType == 3){
-      Row(){
-        Image(this.likeStatus ? $r('app.media.icon_like_select') : this.styleType == 1 ? $r('app.media.CarderInteraction_like') :
-        $r('app.media.icon_like_default_white'))
-          .width(18)
-          .height(18)
-        Text(this.likeCount >0?this.likeCount.toString(): '点赞')
-          .margin({left:4})
-          .fontSize(14)
-          .fontColor(this.likeStatus ? '#ED2800' : '#666666')
+
       }
       }
-      .justifyContent(FlexAlign.Center)
+      .width('100%')
+      .height('100%')
+      .backgroundColor(Color.White)
+      .type(ButtonType.Capsule)
+      .borderColor('#EDEDED')
+      .borderRadius(20)
+      .borderWidth(1)
       .onClick(() => {
       .onClick(() => {
         this.clickButtonEvent()
         this.clickButtonEvent()
       })
       })
-    }else{
-      //1: 底部栏目样式  默认样式
+    }
+    .width(154)
+    .height(40)
+  }
+
+  @Builder
+  likeCompStyle3() {
+    Row() {
+      Image(this.transLikeStyle().url)
+        .width(18)
+        .height(18)
+      // Text(this.likeStatus ? '已赞' : '点赞')
+      Text(this.likeCount > 0 ? this.likeCount.toString() : '点赞')
+        .margin({ left: 4 })
+        .fontSize(14)
+        .fontColor(this.likeStatus ? '#ED2800' : '#666666')
+    }
+    .justifyContent(FlexAlign.Center)
+    .onClick(() => {
+      this.clickButtonEvent()
+    })
+  }
+
+  @Builder
+  likeCompStyle1() {
+    //1: 底部栏目样式  默认样式
+    Column() {
+      // Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
+      Image(this.transLikeStyle().url)
+        .width(24)
+        .height(24)
+        .onClick(() => {
+          this.clickButtonEvent()
+        })
+    }.width(24).height(24)
+  }
+
+  @Builder
+  likeCompStyle4() {
+    Stack({ alignContent: Alignment.Bottom }) {
       Column() {
       Column() {
-        // Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
-        Image(this.likeStatus ? $r('app.media.icon_like_select') : this.styleType == 1 ? $r('app.media.icon_like_default') :
-        $r('app.media.icon_like_default_white'))
+        Image(this.transLikeStyle().url)
           .width(24)
           .width(24)
           .height(24)
           .height(24)
           .onClick(() => {
           .onClick(() => {
             this.clickButtonEvent()
             this.clickButtonEvent()
           })
           })
-      }.width(24).height(24)
+      }
+      .justifyContent(FlexAlign.Center)
+      .width(36)
+      .height(36)
+      .borderRadius(18)
+      .backgroundColor('#FFF5F5F5')
+
+
+      Row() {
+        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
+          .fontSize(8)
+          .fontColor(Color.White)
+          .padding({ left: 4, right: 2 })
+      }
+      .height(12)
+      .alignItems(VerticalAlign.Center)
+      .position({ x: '100%', })
+      .markAnchor({ x: '100%' })
+      .backgroundImage($r('app.media.ic_like_back'))
+      .backgroundImageSize(ImageSize.Auto)
+      .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
     }
     }
+    .width(36)
+    .height(42)
 
 
   }
   }
 
 
-  async clickButtonEvent(){
+  async clickButtonEvent() {
+    console.log(TAG, '点赞点击')
     // 未登录，跳转登录
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (!user_id) {
     if (!user_id) {
+      console.log(TAG, '点赞点击,未登录')
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
 
 
-    if (!this.enableBtn) {
-      return
-    }
-    if (this.likeStatus) {
-      //1
-      this.executeLike('0')
-    } else {
-      //0
-      this.executeLike('1')
-    }
+    // if (!this.enableBtn) {
+    //   return
+    // }
+    this.executeLike(this.likeStatus ? '0' : '1')
 
 
   }
   }
 
 
   executeLike(status: string) {
   executeLike(status: string) {
+    console.log(TAG, '点赞接口调用', status)
     this.data['status'] = status
     this.data['status'] = status
+    this.data['contentId'] = this.contentDetailData?.newsId + ''
+    this.data['contentType'] = this.contentDetailData?.newsType + ''
+
     this.viewModel.executeLike2(this.data).then(() => {
     this.viewModel.executeLike2(this.data).then(() => {
-      this.likeStatus = !this.likeStatus
-      //点赞和取消点赞成功后更新点赞数
-      if(this.likeStatus){
-        this.likeCount ++
-      }else {
-        this.likeCount --
+
+      console.log(TAG, '点赞接口调用成功')
+
+      // 直播点赞一直增加
+      if (this.contentDetailData.liveInfo) {
+        this.likeStatus = true
+        this.likeCount++
+      } else {
+        this.likeStatus = !this.likeStatus
+        //点赞和取消点赞成功后更新点赞数
+        if (this.likeStatus) {
+          this.likeCount++
+        } else {
+          this.likeCount--
+        }
+      }
+
+      if (this.likeCount <= 0) {
+        this.likeCount = 0
       }
       }
+
       this.enableBtn = true
       this.enableBtn = true
     }).catch(() => {
     }).catch(() => {
       this.enableBtn = true
       this.enableBtn = true
@@ -144,9 +249,9 @@ export struct LikeComponent {
 
 
   getLikeStatus() {
   getLikeStatus() {
     this.viewModel.getLikeStatus(this.data).then((data) => {
     this.viewModel.getLikeStatus(this.data).then((data) => {
-      if (data && data['data'].length  && data['data'][0]['likeStatus']) {
+      if (data && data['data'].length && data['data'][0]['likeStatus']) {
         this.likeStatus = data['data'][0]['likeStatus']
         this.likeStatus = data['data'][0]['likeStatus']
-      }else {
+      } else {
         this.likeStatus = false
         this.likeStatus = false
       }
       }
     }).catch(() => {
     }).catch(() => {
@@ -159,14 +264,11 @@ export struct LikeComponent {
     this.viewModel.getLikeCount(this.data).then((data) => {
     this.viewModel.getLikeCount(this.data).then((data) => {
       if (data && data['data']) {
       if (data && data['data']) {
         this.likeCount = data['data']['likeNum']
         this.likeCount = data['data']['likeNum']
-      }else {
+      } else {
         this.likeCount = 0
         this.likeCount = 0
       }
       }
     }).catch(() => {
     }).catch(() => {
       this.likeCount = 0
       this.likeCount = 0
     })
     })
   }
   }
-
-
-
 }
 }

@@ -33,7 +33,7 @@ const TAG = 'OperRowListView';
  * 2、（非必传）  operationButtonList---组件展示条件，
  * 2、（非必传）  operationButtonList---组件展示条件，
  * ['comment', 'like', 'collect', 'share']，需要展示什么传什么
  * ['comment', 'like', 'collect', 'share']，需要展示什么传什么
  * comment--评论；like--点赞；collect--收藏；listen--音频；share--分享；
  * comment--评论；like--点赞；collect--收藏；listen--音频；share--分享；
- *
+ * 注意：外层需注册 @Provide contentDetailData:contentDetailData = {} as contentDetailData
  * 传值示例：
  * 传值示例：
  OperRowListView({
  OperRowListView({
  contentDetailData: this.contentDetailData[0],
  contentDetailData: this.contentDetailData[0],
@@ -48,22 +48,35 @@ export struct OperRowListView {
   private onCommentFocus: () => void = () => {
   private onCommentFocus: () => void = () => {
   }
   }
   @Prop @Watch('onDetailUpdated') contentDetailData: ContentDetailDTO // 稿件详情
   @Prop @Watch('onDetailUpdated') contentDetailData: ContentDetailDTO // 稿件详情
+  /**
+   * 组件样式类型，根据详情页类型传值，组件内部根据样式展现类型做判断
+   * 1：底部栏目样式
+   * 2：新闻页中间位置样式
+   * 3：动态Tab内容下的互动入口
+   * 4：视频详情页
+   * 5：横屏直播详情页
+   * 6：竖屏直播详情页
+   * 7：图集详情页
+   */
+  @Prop componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
+  @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
+  @State needLike: boolean = true
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   @State styleType: number = 1
   @State styleType: number = 1
+  @State showCommentIcon: boolean = true
+  @State bgColor: ResourceColor = Color.White
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
   @State likeBean: Record<string, string> = {}
   @State audioUrl: string = ''
   @State audioUrl: string = ''
-  @State bgColor: ResourceColor = Color.White
-  @State showCommentIcon: boolean = true
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
-  needLike: boolean = true
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     console.info(TAG, '22222----', this.styleType)
     console.info(TAG, '22222----', this.styleType)
     console.info(TAG, '3333----', this.needLike)
     console.info(TAG, '3333----', this.needLike)
     this.handleStyle()
     this.handleStyle()
+    this.onDetailUpdated()
   }
   }
 
 
   async onDetailUpdated() {
   async onDetailUpdated() {
@@ -146,8 +159,8 @@ export struct OperRowListView {
     .backgroundColor(this.bgColor)
     .backgroundColor(this.bgColor)
     .padding({
     .padding({
       top: 10,
       top: 10,
-      // bottom: `${this.bottomSafeHeight}px`
-      bottom: 50
+      bottom: `${this.bottomSafeHeight}px`
+      // bottom: 50
     })
     })
   }
   }
 
 
@@ -183,15 +196,18 @@ export struct OperRowListView {
    */
    */
   @Builder
   @Builder
   builderLike() {
   builderLike() {
+    // 点赞根据字段判断是否显示待添加
     Column() {
     Column() {
-      if (this.likeBean?.contentId) {
-        LikeComponent({
-          data: this.likeBean,
-          styleType: this.styleType
-        })
-      }
+      // if (this.likeBean?.contentId) {
+      LikeComponent({
+        data: this.likeBean,
+        styleType: this.styleType,
+        componentType: this.componentType
+      })
+      // }
     }
     }
     .width(42)
     .width(42)
+    .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
   }
   }
 
 
   /**
   /**
@@ -301,10 +317,11 @@ export struct OperRowListView {
    * 收藏、取消收藏
    * 收藏、取消收藏
    */
    */
   async toggleCollectStatus() {
   async toggleCollectStatus() {
-    // console.log(TAG, '收藏--')
+    console.log(TAG, '收藏点击')
     // 未登录，跳转登录
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (!user_id) {
     if (!user_id) {
+      console.log(TAG, '收藏点击，用户未登录')
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
@@ -316,7 +333,9 @@ export struct OperRowListView {
       }],
       }],
 
 
     }
     }
+    console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
+      console.log(TAG, '收藏点击 res', JSON.stringify(res))
       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) {
@@ -339,7 +358,9 @@ export struct OperRowListView {
         contentType: this.contentDetailData?.newsType,
         contentType: this.contentDetailData?.newsType,
       }]
       }]
     }
     }
+    console.log(TAG, '点赞点击', JSON.stringify(params))
     PageRepository.getContentInteract(params).then(res => {
     PageRepository.getContentInteract(params).then(res => {
+      console.log(TAG, '点赞点击 res', JSON.stringify(res))
       if (res.data) {
       if (res.data) {
         this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
         this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)

@@ -8,7 +8,6 @@ export struct ENewspaperCalendarDialog {
   onDateChange?: (date: RMCalendarBean) => void
   onDateChange?: (date: RMCalendarBean) => void
   //当前选择的日期标记
   //当前选择的日期标记
   @Prop selectDate: Date = new Date()
   @Prop selectDate: Date = new Date()
-
   build() {
   build() {
     RMCalendar({
     RMCalendar({
       // 开始日期
       // 开始日期

@@ -48,6 +48,7 @@ export struct ENewspaperPageDialog {
               .justifyContent(FlexAlign.Center)
               .justifyContent(FlexAlign.Center)
               .width(30)
               .width(30)
               .height(30)
               .height(30)
+              .borderRadius(3)
               .backgroundColor(this.currentPageNum != item.pageNum ? Color.White : $r('app.color.color_ED2800'))
               .backgroundColor(this.currentPageNum != item.pageNum ? Color.White : $r('app.color.color_ED2800'))
               .onClick((event: ClickEvent) => {
               .onClick((event: ClickEvent) => {
                 this.currentPageNum = item.pageNum
                 this.currentPageNum = item.pageNum