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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  多图（图集）详情页（人民号）关注增加部分代码
  多图（图集）详情页点赞、收藏联调完成
  卡片组件样式优化
  多图（图集）详情页评论、点赞调接口中
  切换至现网环境
  音乐详情-切换页面后释放音乐

@@ -32,4 +32,6 @@ export { SystemUtils } from './src/main/ets/utils/SystemUtils'
 
 export { PermissionUtil } from './src/main/ets/utils/PermissionUtil'
 
-export { UserDataLocal } from './src/main/ets/utils/UserDataLocal'
\ No newline at end of file
+export { UserDataLocal } from './src/main/ets/utils/UserDataLocal'
+
+export { NumberFormatterUtils } from './src/main/ets/utils/NumberFormatterUtils'
\ No newline at end of file

+
+export class NumberFormatterUtils {
+
+  /**
+   * 数据小于一万返回原数据，大于一万保留小数点后一位，加上万字
+   * @param num
+   * @returns
+   */
+  static formatNumberWithWan(inputNumber: number | String): string  {
+    const num = typeof inputNumber === 'number' ? inputNumber : Number(inputNumber);
+    if (isNaN(num) || num < 10000) {
+      return num.toString();
+    } else {
+      const wanUnit = num / 10000;
+      return `${wanUnit.toFixed(1)}万`;
+    }
+  }
+}
\ No newline at end of file

@@ -179,7 +179,7 @@ export class HttpUrlUtils {
    * */
   static readonly MORNING_EVENING_PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo";
   static readonly MORNING_EVENING_COMP_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo";
-  private static _hostUrl: string = HttpUrlUtils.HOST_UAT;
+  private static _hostUrl: string = HttpUrlUtils.HOST_PRODUCT;
 
   public static set hostUrl(value: string) {
     HttpUrlUtils._hostUrl = value;

@@ -23,7 +23,19 @@ export { Pic } from './src/main/ets/bean/content/Pic'
 
 export { InteractDataDTO } from './src/main/ets/bean/content/InteractDataDTO';
 
-export { InteractDataStatusBean, PhotoListBean, InputMethodProperty } from './src/main/ets/bean/detail/MultiPictureDetailPageDTO';
+export {
+  PhotoListBean,
+  InputMethodProperty,
+  batchLikeAndCollectParams,
+  postBatchAttentionStatusParams,
+  postInteractBrowsOperateParams,
+  postBatchAttentionStatusResult,
+  batchLikeAndCollectResult,
+  postExecuteLikeParams,
+  postExecuteCollectRecordParams,
+  contentListParams,
+  postInteractAccentionOperateParams
+} from './src/main/ets/bean/detail/MultiPictureDetailPageDTO';
 
 export { InteractParam, ContentBean } from './src/main/ets/bean/content/InteractParam';
 

@@ -2,11 +2,11 @@
  * 批查接口查询互动相关数据，返回数据bean
  */
 export interface InteractDataDTO {
-  collectNum: number;
-  commentNum: number;
+  collectNum: number | String;
+  commentNum: number | String;
   contentId: string;
   contentType: number;
-  likeNum: number;
+  likeNum: number | String;
   readNum: number;
   shareNum: number;
 }
\ No newline at end of file

 /*
  * 多图（图集）详情
  * */
-// 批量查询内容当前用户点赞、收藏状态
-export interface InteractDataStatusBean {
-  contentId: string;
-  contentType: number;
-  contentRelId: string;
-  relType: number;
-  likeStatus: number;
-  collectStatus: number;
-}
 
 // 【图文、图集稿件正文图片】图片信息数组
 export interface PhotoListBean {
@@ -97,4 +88,93 @@ export interface InputMethodProperty {
    * @since 10
    */
   extra?: object;
+}
+
+export interface IStatusContentList {
+  contentId: string;
+
+  // relType: string;
+  contentType: string;
+  // contentRelId: string;
+}
+export interface batchLikeAndCollectParams {
+  // userType: number;
+  // userId: string;
+  contentList: IStatusContentList[]
+}
+
+export interface postBatchAttentionStatusParamsItem {
+  creatorId: string;
+}
+
+export interface postBatchAttentionStatusParams {
+  creatorIds: postBatchAttentionStatusParamsItem[]
+}
+
+export interface postInteractBrowsOperateParamsContent {
+  browseTime: string;
+  contentId: string;
+  contentType: number;
+}
+
+export interface postInteractBrowsOperateParams {
+  delStatus: number;
+  contentList: postInteractBrowsOperateParamsContent[]
+}
+
+export interface postBatchAttentionStatusResult {
+  creatorId: string;
+  status: string;
+  userId: string;
+}
+
+export interface batchLikeAndCollectResult {
+  collectStatus: number;
+  contentType: string;
+  likeStatus: string;
+  relType: string;
+  contentId: string;
+  contentRelId: string;
+}
+
+export interface postExecuteLikeParams {
+  status: string;
+  contentId: string;
+  contentType: string;
+  relType?: string;
+  userName?: string;
+  title?: string;
+  contentRelId?: string;
+  userHeaderUrl?: string;
+  channelId?: string;
+}
+export interface postExecuteCollectRecordParamsItem {
+  contentId: string;
+  contentType: string;
+  relType?: string;
+  contentRelId?: string;
+}
+
+export interface postExecuteCollectRecordParams {
+  status: string;
+  contentList: postExecuteCollectRecordParamsItem[]
+}
+
+interface contentListItem {
+  contentId: string;
+  contentType: number;
+}
+
+export interface contentListParams {
+  contentList: contentListItem[];
+}
+
+export interface postInteractAccentionOperateParams {
+  attentionUserType: string;
+  attentionUserId: string;
+  attentionCreatorId: string;
+
+  // userType: number;
+  // userId: string;
+  status: number;
 }
\ No newline at end of file

@@ -47,6 +47,9 @@ export struct AudioDetailComponent {
       this.duration = totalSeconds
     }
   }
+  onPageHide() {
+    this.playerController?.pause();
+  }
   build() {
       Row() {
         Column() {

 import { Logger } from 'wdKit';
-import { ContentDetailDTO, PhotoListBean } from 'wdBean';
+import {
+  ContentDetailDTO,
+  PhotoListBean,
+  postInteractBrowsOperateParams,
+  postBatchAttentionStatusParams,
+  postInteractAccentionOperateParams
+} from 'wdBean';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import display from '@ohos.display';
 import font from '@ohos.font';
 import { OperRowListView } from './view/OperRowListView';
 import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
+import { DateTimeUtils } from 'wdKit/Index';
+import { HttpUrlUtils } from 'wdNetwork/Index';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { PageRepository } from '../repository/PageRepository';
 
 const TAG = 'MultiPictureDetailPageComponent';
 
@@ -17,10 +27,11 @@ export struct MultiPictureDetailPageComponent {
   private screenWidth: number = 0
   private picWidth: number = 0
   @State picHeight: number = 0
-  @State contentDetailData: ContentDetailDTO[] = [] as ContentDetailDTO[]
+  @State contentDetailData: ContentDetailDTO  = {} as ContentDetailDTO
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   private swiperController: SwiperController = new SwiperController()
   @State swiperIndex: number = 0;
+  @Provide followStatus: string = '0' // 关注状态
 
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
@@ -43,6 +54,10 @@ export struct MultiPictureDetailPageComponent {
       familySrc: $rawfile('font/BebasNeue_Regular.otf')
     })
     this.getContentDetailData()
+    if (HttpUrlUtils.getUserId()) {
+      this.getInteractBrowsOperate()
+      this.getBatchAttentionStatus()
+    }
   }
 
   aboutToDisappear() {
@@ -51,10 +66,10 @@ export struct MultiPictureDetailPageComponent {
 
   build() {
     RelativeContainer() {
-      if (this.contentDetailData && this.contentDetailData.length > 0 && this.contentDetailData[0].photoList && this.contentDetailData[0].photoList?.length > 0) {
+      if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
         Swiper(this.swiperController) {
-          ForEach(this.contentDetailData[0].photoList, (item: PhotoListBean, index: number) => {
-            MultiPictureDetailItemComponent({ photoListLength: this.contentDetailData[0].photoList?.length , index: index, newsTitle: this.contentDetailData[0].newsTitle, MultiPictureDetailItem: item })
+          ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
+            MultiPictureDetailItemComponent({ photoListLength: this.contentDetailData.photoList?.length , index: index, newsTitle: this.contentDetailData.newsTitle, MultiPictureDetailItem: item })
           })
         }
         .index(this.swiperIndex)
@@ -73,15 +88,96 @@ export struct MultiPictureDetailPageComponent {
         .onChange((index: number) => {
           this.swiperIndex = index
         })
+        if(this.contentDetailData.rmhPlatform == 1) {
+          Row() {
+            Row(){
+              Row({space: 8}) {
+                Image(this.contentDetailData?.rmhInfo?.rmhHeadUrl)
+                  .borderRadius('50%')
+                  .alt($r('app.media.picture_loading'))
+                  .width(36)
+                  .height(36)
+                  .objectFit(ImageFit.Fill)
+                  .interpolation(ImageInterpolation.High)
+              }
+              .width('13%')
+              .height('100%')
+              Row() {
+                Flex({
+                  direction: FlexDirection.Column,
+                  justifyContent: FlexAlign.Start
+                }) {
+                  Text(`${this.contentDetailData?.rmhInfo?.rmhName}`)
+                    .fontColor(Color.White)
+                    .fontSize(14)
+                    .fontFamily('PingFang PingFang SC-Medium')
+                    .fontWeight(500)
+                    .lineHeight(17)
+                    .margin(0)
+                  Text(`${this.contentDetailData?.rmhInfo?.rmhDesc}`)
+                    .fontColor('#676767')
+                    .fontSize(12)
+                    .fontFamily('PingFang SC-Regular')
+                    .fontWeight(400)
+                    .lineHeight(14)
+                    .textOverflow({ overflow: TextOverflow.Clip })
+                    .margin (0)
+                }
+              }
+              .width('81%')
+              .height('100%')
+            }
+            .width('74.4%')
+            .height('100%')
+            .margin({
+              top: 0,
+              bottom: 0,
+              left: 16,
+              right:0
+            })
+            if(this.followStatus == '0') {
+              Row(){
+                Button('+关注', { type: ButtonType.Normal, stateEffect: true })
+                  .borderRadius(4)
+                  .backgroundColor('#ED2800')
+                  .width(48)
+                  .height(24)
+                  .onClick(() => {
+                    this.handleAccention()
+                  })
+                  .margin({
+                    top: 10,
+                    bottom: 10,
+                    left: 16,
+                    right:16
+                  })
+                  .fontSize(12)
+                  .fontColor(Color.White)
+              }
+              .width('21.6%')
+              .height('100%')
+            }
+          }
+          .width('100%')
+          .height(44)
+          .alignRules({
+            top: { anchor: "e_swiper_content", align: VerticalAlign.Top },
+            middle: { anchor: "e_swiper_content", align: HorizontalAlign.Center }
+          })
+          .id('e_attention')
+        }
+
+        OperRowListView({
+          contentDetailData: this.contentDetailData,
+        })
+          .alignRules({
+            bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
+            middle: { anchor: "__container__", align: HorizontalAlign.Center }
+          })
+          .width('100%').height(56).margin(16)
+          .border({ width: {top: 0.5}, color: '#FFFFFF' })
+          .id('e_oper_row')
       }
-      OperRowListView()
-      .alignRules({
-        bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
-        middle: { anchor: "__container__", align: HorizontalAlign.Center }
-      })
-      .width('100%').height(56).margin(16)
-      .border({ width: {top: 0.5}, color: '#FFFFFF' })
-      .id('e_oper_row')
     }
     .width('100%')
     .height('100%')
@@ -92,10 +188,70 @@ export struct MultiPictureDetailPageComponent {
   private async getContentDetailData() {
     try {
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
-      this.contentDetailData = data;
+      this.contentDetailData = data?.[0];
       Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
     } catch (exception) {
 
     }
   }
+
+  //  记录浏览历史
+  private getInteractBrowsOperate() {
+    try {
+      const params: postInteractBrowsOperateParams = {
+        delStatus: 0,
+        contentList: [{
+          browseTime: DateTimeUtils.getCurDate(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN),
+          contentId: this.contentDetailData?.newsId + '',
+          contentType: this.contentDetailData?.newsType || 0,
+        }]
+      }
+      MultiPictureDetailViewModel.getInteractBrowsOperate(params).then(res => {
+        console.log(TAG, '记录浏览历史==', JSON.stringify(res.data))
+      })
+    } catch (exception) {
+
+    }
+  }
+
+  // 已登录->批量查作品是否被号主关注
+  private async getBatchAttentionStatus() {
+    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) {
+
+    }
+  }
+  /**
+   * 关注号主
+   */
+  handleAccention() {
+    // 未登录，跳转登录
+    if (!HttpUrlUtils.getUserId()) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+
+    const params: postInteractAccentionOperateParams = {
+      attentionUserType: this.contentDetailData?.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
+      attentionUserId: this.contentDetailData?.rmhInfo?.userId || '', // 被关注用户号主id
+      attentionCreatorId: this.contentDetailData?.rmhInfo?.rmhId || '', // 被关注用户号主id
+      // userType: 1,
+      // userId: '1',
+      status: 1,
+    }
+    PageRepository.postInteractAccentionOperate(params).then(res => {
+      console.log(TAG, '关注号主==', JSON.stringify(res.data))
+      if (this.followStatus == '1') {
+        this.followStatus = '0'
+      } else {
+        this.followStatus = '1'
+      }
+    })
+  }
 }
\ No newline at end of file

@@ -25,7 +25,7 @@ export struct CarouselLayout01CardView {
         .width(CommonConstants.FULL_PARENT)
         .height(CommonConstants.FULL_PARENT)
         .objectFit(ImageFit.Cover)
-        .borderRadius($r("app.float.border_radius_6"))
+        // .borderRadius($r("app.float.border_radius_6"))
         .alignRules({
           top: { anchor: '__container__', align: VerticalAlign.Top },
           left: { anchor: '__container__', align: HorizontalAlign.Start }
@@ -45,7 +45,7 @@ export struct CarouselLayout01CardView {
       //     .id('img_corner_top_Left')
       // }
 
-      Text(this.item.title)
+      Text(this.item.newsTitle)
         .width(CommonConstants.FULL_PARENT)
         .height(39)
         .padding({ left: 8, right: 69, bottom: 8 })

@@ -49,6 +49,7 @@ export struct BannerComponent {
       }
       .margin({ left: $r('app.float.main_margin'), right: $r('app.float.main_margin') })
       .padding({ bottom: 14 })
+      .borderRadius($r('app.float.image_border_radius'))
       .displayCount(this.buildDisplayCount()) // 仅展示1个图片
       .cachedCount(2)
       .index(1) // The default index of Swiper.

@@ -22,9 +22,18 @@ export struct CompStyle_09 {
           .margin({ bottom: 19 })
       }
       // 大图
-      Image(this.compDTO.operDataList[0].coverUrl)
-        .width('100%')
-        .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
+      Stack(){
+        Image(this.compDTO.operDataList[0].coverUrl)
+          .width('100%')
+          .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
+        Text('专题')
+          .fontSize($r('app.float.font_size_12'))
+          .padding({left: 8, right: 8, top: 3, bottom: 3})
+          .backgroundColor(Color.Red)
+          .fontColor(Color.White)
+          .borderRadius($r('app.float.button_border_radius'))
+          .margin({left: 5, bottom: 5})
+      }.alignContent(Alignment.BottomStart)
       // 时间线--后端返回三个，
       Column(){
         ForEach(this.compDTO.operDataList[0].slideShows, (item:slideShows, index:number) => {
@@ -68,20 +77,27 @@ export struct CompStyle_09 {
     Column(){
       Stack() {
         if(index < this.compDTO.operDataList[0].slideShows.length - 1) {
-          Line()
-            .width(1)
-            .startPoint([4, index > 0 ? 0 : 20])
-            .endPoint([4, 100])
-            .stroke($r('app.color.color_EDEDED'))
+          Divider()
+            .vertical(true)
+            .color($r('app.color.color_EDEDED'))
             .strokeWidth(1)
-            .strokeLineCap(LineCapStyle.Butt)
+            .margin({top: index > 0 ? 0 : 16, left: 4})
         }
+        if(index > 0 && index == this.compDTO.operDataList[0].slideShows.length - 1) {
+          Divider()
+            .vertical(true)
+            .color($r('app.color.color_EDEDED'))
+            .strokeWidth(1)
+            .height(16)
+            .margin({left: 4})
+        }
+
         Column(){
           Row() {
             // 标题
             Image($r("app.media.point_icon"))
               .width(9)
-              .height(6)
+              .height(9)
               .margin({ right: 5 })
             Text(DateTimeUtils.formatDate(item.publishTime, "MM月dd日 HH:mm"))
               .fontSize($r('app.float.font_size_12'))
@@ -90,6 +106,7 @@ export struct CompStyle_09 {
           }
           .width(CommonConstants.FULL_WIDTH)
           .height(32)
+          .alignItems(VerticalAlign.Center)
           Row() {
             Text(item.newsTitle)
               .fontSize($r('app.float.font_size_17'))
@@ -109,8 +126,9 @@ export struct CompStyle_09 {
           }
         }
       }
-      .alignContent(Alignment.Start)
+      .alignContent(Alignment.TopStart)
     }
     .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 78)
+    .alignItems(HorizontalAlign.Start)
   }
 }
\ No newline at end of file

@@ -24,12 +24,21 @@ export struct CompStyle_10 {
           .margin({ bottom: 19 })
       }
       // 大图
-      Image(this.compDTO.operDataList[0] && this.compDTO.operDataList[0].coverUrl)
-        .width('100%')
-        .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
-        .onClick((event: ClickEvent) => {
-          ProcessUtils.processPage(this.compDTO?.operDataList[0])
-        })
+      Stack(){
+        Image(this.compDTO.operDataList[0] && this.compDTO.operDataList[0].coverUrl)
+          .width('100%')
+          .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
+          .onClick((event: ClickEvent) => {
+            ProcessUtils.processPage(this.compDTO?.operDataList[0])
+          })
+        Text('专题')
+          .fontSize($r('app.float.font_size_12'))
+          .padding({left: 8, right: 8, top: 3, bottom: 3})
+          .backgroundColor(Color.Red)
+          .fontColor(Color.White)
+          .borderRadius($r('app.float.button_border_radius'))
+          .margin({left: 5, bottom: 5})
+      }.alignContent(Alignment.BottomStart)
       // 专题列表--后端返回三个，
       Column(){
         ForEach(this.compDTO.operDataList[0].slideShows, (item:slideShows, index:number) => {

@@ -10,8 +10,8 @@ export struct HeadPictureCardComponent {
     Stack() {
       Image(this.compDTO.operDataList[0].coverUrl)
         .width(CommonConstants.FULL_WIDTH)
-        .height(CommonConstants.FULL_HEIGHT)
         .autoResize(true)
+        .borderRadius($r('app.float.image_border_radius'))
       if (this.compDTO.operDataList[0].newsTitle) {
         Row()
           .width(CommonConstants.FULL_WIDTH)
@@ -38,7 +38,6 @@ export struct HeadPictureCardComponent {
     }
     .alignContent(Alignment.Bottom)
     .width(CommonConstants.FULL_WIDTH)
-    .height(200)
     .padding(
       { top: 16, bottom: 16, left: 14, right: 14 })
     .onClick((event: ClickEvent) => {

-import { ToastUtils, Logger } from 'wdKit';
-import { InputMethodProperty } from 'wdBean';
+import { ToastUtils, Logger, NumberFormatterUtils } from 'wdKit';
+import {
+  InputMethodProperty,
+  batchLikeAndCollectResult,
+  batchLikeAndCollectParams,
+  ContentDetailDTO,
+  postExecuteLikeParams,
+  contentListParams,
+  InteractDataDTO,
+  postExecuteCollectRecordParams
+} from 'wdBean';
 import router from '@ohos.router';
 import inputMethod from '@ohos.inputMethod';
+import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel';
+import { HttpUrlUtils } from 'wdNetwork/Index';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { PageRepository } from '../../repository/PageRepository';
 
 export interface OperationItem {
   icon: Resource;
+  icon_check?: Resource;
   text: string | Resource;
   num?: number; // 个数
 }
@@ -14,19 +28,23 @@ const TAG = 'OperRowListView';
 @Preview
 @Component
 export struct OperRowListView {
+  private contentDetailData: ContentDetailDTO  = {} as ContentDetailDTO
+  @State interactData: InteractDataDTO  = {} as InteractDataDTO
+  @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
+
   @State operationList: OperationItem[] = [
     {
       icon: $r('app.media.ic_comment'),
       text: "评论",
-      num: 500,
     },
     {
       icon: $r('app.media.ic_like_uncheck'),
+      icon_check: $r('app.media.ic_like_check'),
       text: "点赞",
-      num: 6622
     },
     {
       icon: $r('app.media.ic_collect_uncheck'),
+      icon_check: $r('app.media.ic_collect_check'),
       text: "收藏",
     },
     {
@@ -36,6 +54,10 @@ export struct OperRowListView {
   ]
 
   aboutToAppear() {
+    if (HttpUrlUtils.getUserId()) {
+      this.getInteractDataStatus()
+    }
+    this.queryContentInteractCount()
   }
 
   build() {
@@ -100,55 +122,166 @@ export struct OperRowListView {
   @Builder
   buildOperationItem(item: OperationItem, index: number) {
     Column() {
-      RelativeContainer()  {
-        Row() {
-          Image(item.icon)
-            .width(24)
-            .height(24)
-            .aspectRatio(1)
-            .interpolation(ImageInterpolation.High)
+      if (item.text === '点赞') {
+        RelativeContainer()  {
+          Row() {
+            Image(this.newsStatusOfUser?.likeStatus == '1' ? item.icon_check : item.icon)
+              .width(24)
+              .height(24)
+              .aspectRatio(1)
+              .interpolation(ImageInterpolation.High)
+              .onClick(() => {
+                this.toggleLikeStatus()
+              })
+          }
+          .alignRules({
+            center: { anchor: '__container__', align: VerticalAlign.Center },
+            middle: { anchor: '__container__', align: HorizontalAlign.Center }
+          })
+          .id(`e_row1_${index}`)
+          if(this.interactData?.likeNum > 0) {
+            Row() {
+              Image($r('app.media.corner_mark'))
+                .width(25)
+                .height(12)
+                .interpolation(ImageInterpolation.High)
+            }
+            .alignRules({
+              top: { anchor: `e_row1_${index}`, align: VerticalAlign.Top },
+              left: { anchor: `e_row1_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row2_${index}`)
+
+            Row() {
+              Text(`${this.interactData?.likeNum}`)
+                .fontSize(8)
+                .textAlign(TextAlign.Center)
+                .fontColor(Color.White)
+                .lineHeight(12)
+            }
+            .alignRules({
+              top: { anchor: `e_row2_${index}`, align: VerticalAlign.Top },
+              middle: { anchor: `e_row2_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row3_${index}`)
+          }
         }
-        .alignRules({
-          center: { anchor: '__container__', align: VerticalAlign.Center },
-          middle: { anchor: '__container__', align: HorizontalAlign.Center }
-        })
-        .id(`e_row1_${index}`)
-        if(item.num) {
+        .id(`e_icon_${index}`)
+      } else if (item.text === '收藏') {
+        RelativeContainer()  {
           Row() {
-            Image($r('app.media.corner_mark'))
-              .width(25)
-              .height(12)
+            Image(this.newsStatusOfUser?.collectStatus == 1 ? item.icon_check : item.icon)
+              .width(24)
+              .height(24)
+              .aspectRatio(1)
               .interpolation(ImageInterpolation.High)
+              .onClick(() => {
+                this.toggleCollectStatus()
+              })
           }
           .alignRules({
-            top: { anchor: `e_row1_${index}`, align: VerticalAlign.Top },
-            left: { anchor: `e_row1_${index}`, align: HorizontalAlign.Center }
+            center: { anchor: '__container__', align: VerticalAlign.Center },
+            middle: { anchor: '__container__', align: HorizontalAlign.Center }
           })
-          .id(`e_row2_${index}`)
+          .id(`e_row1_${index}`)
+          if(this.interactData?.collectNum > 0) {
+            Row() {
+              Image($r('app.media.corner_mark'))
+                .width(25)
+                .height(12)
+                .interpolation(ImageInterpolation.High)
+            }
+            .alignRules({
+              top: { anchor: `e_row1_${index}`, align: VerticalAlign.Top },
+              left: { anchor: `e_row1_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row2_${index}`)
+
+            Row() {
+              Text(`${this.interactData?.collectNum}`)
+                .fontSize(8)
+                .textAlign(TextAlign.Center)
+                .fontColor(Color.White)
+                .lineHeight(12)
+            }
+            .alignRules({
+              top: { anchor: `e_row2_${index}`, align: VerticalAlign.Top },
+              middle: { anchor: `e_row2_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row3_${index}`)
+          }
+        }
+        .id(`e_icon_${index}`)
+      }  else if (item.text === '评论') {
+        RelativeContainer()  {
+          Row() {
+            Image(item.icon)
+              .width(24)
+              .height(24)
+              .aspectRatio(1)
+              .interpolation(ImageInterpolation.High)
+              .onClick((event: ClickEvent) => {
+                ToastUtils.showToast('评论为公共方法，待开发', 1000);
+              })
+          }
+          .alignRules({
+            center: { anchor: '__container__', align: VerticalAlign.Center },
+            middle: { anchor: '__container__', align: HorizontalAlign.Center }
+          })
+          .id(`e_row1_${index}`)
+          if(this.interactData?.commentNum > 0) {
+            Row() {
+              Image($r('app.media.corner_mark'))
+                .width(25)
+                .height(12)
+                .interpolation(ImageInterpolation.High)
+            }
+            .alignRules({
+              top: { anchor: `e_row1_${index}`, align: VerticalAlign.Top },
+              left: { anchor: `e_row1_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row2_${index}`)
 
+            Row() {
+              Text(`${this.interactData?.commentNum}`)
+                .fontSize(8)
+                .textAlign(TextAlign.Center)
+                .fontColor(Color.White)
+                .lineHeight(12)
+            }
+            .alignRules({
+              top: { anchor: `e_row2_${index}`, align: VerticalAlign.Top },
+              middle: { anchor: `e_row2_${index}`, align: HorizontalAlign.Center }
+            })
+            .id(`e_row3_${index}`)
+          }
+        }
+        .id(`e_icon_${index}`)
+      } else {
+        RelativeContainer()  {
           Row() {
-            Text('99+')
-              .fontSize(8)
-              .textAlign(TextAlign.Center)
-              .fontColor(Color.White)
-              .lineHeight(12)
+            Image(item.icon)
+              .width(24)
+              .height(24)
+              .aspectRatio(1)
+              .interpolation(ImageInterpolation.High)
+              .onClick((event: ClickEvent) => {
+                ToastUtils.showToast('分享为公共方法，待开发', 1000);
+              })
           }
           .alignRules({
-            top: { anchor: `e_row2_${index}`, align: VerticalAlign.Top },
-            middle: { anchor: `e_row2_${index}`, align: HorizontalAlign.Center }
+            center: { anchor: '__container__', align: VerticalAlign.Center },
+            middle: { anchor: '__container__', align: HorizontalAlign.Center }
           })
-          .id(`e_row3_${index}`)
+          .id(`e_row1_${index}`)
         }
+        .id(`e_icon_${index}`)
       }
-      .id(`e_icon_${index}`)
+
     }
     .margin(5)
     .alignItems(HorizontalAlign.Center)
     .hoverEffect(HoverEffect.Scale)
-    .onClick(() => {
-      Logger.info(TAG, `buildOperationItem onClick event index: ${index}`);
-      ToastUtils.showToast('体验版，本功能暂未开发', 1000);
-    })
   }
 
   /**
@@ -180,4 +313,97 @@ export struct OperRowListView {
       console.error('Failed to switchInputMethod: ' + JSON.stringify(err));
     }
   }
+
+  // 已登录->查询用户对作品点赞、收藏状态
+  private async getInteractDataStatus() {
+    try {
+      const params: batchLikeAndCollectParams = {
+        contentList: [
+          {
+            contentId: this.contentDetailData?.newsId + '',
+            contentType: this.contentDetailData?.newsType + '',
+          }
+        ]
+      }
+      console.error(TAG, JSON.stringify(this.contentDetailData))
+      let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
+      console.error(TAG, '查询用户对作品点赞、收藏状态', JSON.stringify(data))
+      this.newsStatusOfUser = data[0];
+      Logger.info(TAG, `newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
+    } catch (exception) {
+      console.error(TAG, JSON.stringify(exception))
+    }
+  }
+
+  /**
+   * 点赞、取消点赞
+   */
+  toggleLikeStatus() {
+    // 未登录，跳转登录
+    if (!HttpUrlUtils.getUserId()) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+    const params: postExecuteLikeParams = {
+      status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
+      contentId: this.contentDetailData?.newsId + '',
+      contentType: this.contentDetailData?.newsType + '',
+    }
+    PageRepository.postExecuteLike(params).then(res => {
+      console.log(TAG, '点赞、取消点赞', 'toggleLikeStatus==',)
+      if (this.newsStatusOfUser) {
+        this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
+        this.queryContentInteractCount()
+      }
+
+    })
+  }
+  /**
+   * 收藏、取消收藏
+   */
+  toggleCollectStatus() {
+    // 未登录，跳转登录
+    if (!HttpUrlUtils.getUserId()) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+    const params: postExecuteCollectRecordParams = {
+      status: this.newsStatusOfUser?.collectStatus === 1 ? '0' : '1',
+      contentList: [{
+        contentId: this.contentDetailData?.newsId + '',
+        contentType: this.contentDetailData?.newsType + '',
+      }],
+
+    }
+    PageRepository.postExecuteCollectRecord(params).then(res => {
+      console.log(TAG, '收藏、取消收藏','toggleLikeStatus==',)
+      if (this.newsStatusOfUser) {
+        this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
+        this.queryContentInteractCount()
+      }
+    })
+
+  }
+
+  /**
+   * 查询点赞、收藏数量
+   */
+  queryContentInteractCount() {
+    console.error(TAG,'contentDetailData2222', JSON.stringify(this.contentDetailData))
+    const params: contentListParams = {
+      contentList: [{
+        contentId: this.contentDetailData?.newsId + '',
+        contentType: this.contentDetailData?.newsType,
+      }]
+    }
+    PageRepository.getContentInteract(params).then(res => {
+      if (res.data) {
+        this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
+        this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
+        this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
+      }
+      console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
+      console.log(TAG, 'this.interactData', JSON.stringify(this.interactData))
+    })
+  }
 }
\ No newline at end of file

@@ -5,13 +5,19 @@ import {
   CompInfoBean,
   ContentDetailDTO,
   InteractDataDTO,
-  InteractDataStatusBean,
+  batchLikeAndCollectResult,
   MorningEveningPaperDTO,
   NavigationBodyDTO,
   NewspaperListBean,
   NewspaperTimeInfoBean,
   PageDTO,
-  PageInfoBean
+  PageInfoBean,
+  postBatchAttentionStatusParams,
+  postBatchAttentionStatusResult,
+  postExecuteLikeParams,
+  postExecuteCollectRecordParams,
+  contentListParams,
+  postInteractAccentionOperateParams
 } from 'wdBean';
 
 const TAG = 'HttpRequest';
@@ -174,9 +180,41 @@ export class PageRepository {
   static fetchInteractDataStatus(param: object) {
     let url = PageRepository.getInteractDataStatusUrl()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post<ResponseDTO<InteractDataStatusBean[]>>(url, param, headers)
+    return WDHttp.post<ResponseDTO<batchLikeAndCollectResult[]>>(url, param, headers)
   };
 
+  /**
+   * 用户点赞、取消点赞
+   * @param params
+   * @returns
+   */
+  static postExecuteLike(params: postExecuteLikeParams): Promise<ResponseDTO> {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTELIKE
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.post0(url, params, headers)
+  }
+
+  /**
+   * 用户收藏、取消收藏
+   * @param params
+   * @returns
+   */
+  static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.post0(url, params, headers)
+  }
+
+  /**
+   *
+   * @returns
+   */
+  static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.post0(url, params, headers)
+  }
+
   // 浏览历史新增、删除接口
   static fetchInteractBrowsOperate(param: object) {
     let url = PageRepository.getInteractBrowsOperateUrl()
@@ -184,6 +222,25 @@ export class PageRepository {
     return WDHttp.post<ResponseDTO<null>>(url, param, headers)
   };
 
+  /**
+   * 批量查号主是否为用户关注
+   * @returns
+   */
+  static fetchBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<ResponseDTO<postBatchAttentionStatusResult[]>> {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.post0(url, params, headers)
+  }
+
+  /**
+   * 关注号主
+   */
+  static postInteractAccentionOperate(params: postInteractAccentionOperateParams): Promise<ResponseDTO> {
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_ACCENTION_OPERATION
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.post0(url, params, headers)
+  }
+
   static fetchNewspaperInfo(date: string) {
     let url = PageRepository.getNewspaperInfoUrl(date)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();

 import { Logger } from 'wdKit';
 import { ResponseDTO } from 'wdNetwork';
-import {  ContentDetailDTO } from 'wdBean';
+import {  ContentDetailDTO,
+  batchLikeAndCollectParams,
+  batchLikeAndCollectResult,
+  postBatchAttentionStatusParams,
+  postBatchAttentionStatusResult,
+  postInteractBrowsOperateParams
+} from 'wdBean';
 import { PageRepository } from '../repository/PageRepository';
 
 const TAG = 'MultiPictureDetailViewModel';
 
 export class MultiPictureDetailViewModel {
 
-  /*fetchDetailData
-  fetchInteractData
-  fetchInteractDataStatus
-  fetchInteractBrowsOperate*/
-
   static async getDetailData(relId: string, contentId: string, relType: string): Promise<ContentDetailDTO[]> {
     return new Promise<ContentDetailDTO[]>((success, error) => {
       Logger.info(TAG, `fetchDetailData start`);
@@ -34,4 +35,75 @@ export class MultiPictureDetailViewModel {
       })
     })
   }
+
+  /**
+   * 批量查询作品查询点赞、收藏状态
+   * @returns
+   */
+  static async getInteractDataStatus(params:batchLikeAndCollectParams): Promise<batchLikeAndCollectResult[]> {
+    return new Promise<batchLikeAndCollectResult[]>((success, error) => {
+      Logger.info(TAG, `fetchInteractDataStatus start`);
+      PageRepository.fetchInteractDataStatus(params).then((resDTO: ResponseDTO<batchLikeAndCollectResult[]>) => {
+        if (!resDTO || !resDTO.data) {
+          Logger.error(TAG, 'fetchInteractDataStatus is empty');
+          error('resDTO is empty');
+          return
+        }
+        if (resDTO.code != 0) {
+          Logger.error(TAG, `fetchInteractDataStatus then code:${resDTO.code}, message:${resDTO.message}`);
+          error('resDTO Response Code is failure');
+          return
+        }
+        Logger.info(TAG, "fetchInteractDataStatus then,navResDTO.timestamp:" + resDTO.timestamp);
+        success(resDTO.data);
+      }).catch((err: Error) => {
+        Logger.error(TAG, `fetchInteractDataStatus catch, error.name : ${err.name},  error.message:${err.message}`);
+        error(err);
+      })
+    })
+  }
+
+  // 已登录->批量查作品是否被号主关注
+  static async getBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<postBatchAttentionStatusResult[]> {
+    return new Promise<postBatchAttentionStatusResult[]>((success, error) => {
+      Logger.info(TAG, `fetchBatchAttentionStatus start`);
+      PageRepository.fetchBatchAttentionStatus(params).then((resDTO: ResponseDTO<postBatchAttentionStatusResult[]>) => {
+        if (!resDTO || !resDTO.data) {
+          Logger.error(TAG, 'fetchBatchAttentionStatus is empty');
+          error('resDTO is empty');
+          return
+        }
+        if (resDTO.code != 0) {
+          Logger.error(TAG, `fetchBatchAttentionStatus then code:${resDTO.code}, message:${resDTO.message}`);
+          error('resDTO Response Code is failure');
+          return
+        }
+        Logger.info(TAG, "fetchBatchAttentionStatus then,navResDTO.timestamp:" + resDTO.timestamp);
+        success(resDTO.data);
+      }).catch((err: Error) => {
+        Logger.error(TAG, `fetchBatchAttentionStatus catch, error.name : ${err.name},  error.message:${err.message}`);
+        error(err);
+      })
+    })
+  }
+
+  // 记录浏览历史
+  static async getInteractBrowsOperate(params: postInteractBrowsOperateParams): Promise<ResponseDTO<null>> {
+    return new Promise<ResponseDTO<null>>((success, error) => {
+      Logger.info(TAG, `fetchInteractBrowsOperate start`);
+      PageRepository.fetchInteractBrowsOperate(params).then((resDTO: ResponseDTO<null>) => {
+        if (resDTO.code != 0) {
+          Logger.error(TAG, `fetchInteractBrowsOperate then code:${resDTO.code}, message:${resDTO.message}`);
+          error('resDTO Response Code is failure');
+          return
+        }
+        Logger.info(TAG, "fetchInteractBrowsOperate then,navResDTO.timestamp:" + resDTO.timestamp);
+        success(resDTO);
+      }).catch((err: Error) => {
+        Logger.error(TAG, `fetchInteractBrowsOperate catch, error.name : ${err.name},  error.message:${err.message}`);
+        error(err);
+      })
+    })
+  }
+
 }