Merge remote-tracking branch 'origin/main'

-import { Logger } from 'wdKit';
+import { AccountManagerUtils, Logger } from 'wdKit';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
-import { ContentDetailDTO } from 'wdBean';
+import { ContentDetailDTO,batchLikeAndCollectResult,batchLikeAndCollectParams,postBatchAttentionStatusParams,
+  PhotoListBean,
+  ContentDTO, } from 'wdBean';
 import media from '@ohos.multimedia.media';
 import { OperRowListView } from './view/OperRowListView';
 import { WDPlayerController } from 'wdPlayer/Index';
+import { ContentConstants } from '../constants/ContentConstants';
+import { ProcessUtils } from '../utils/ProcessUtils';
 
 const TAG = 'DynamicDetailComponent'
 @Preview
@@ -19,8 +23,11 @@ export struct DynamicDetailComponent {
   /**
    * 默认未关注 点击去关注
    */
-  private  followStatus: boolean = false;
+  private  followStatus: String = '0';
+  @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
 
+  //跳转
+  private mJumpInfo: ContentDTO = {} as ContentDTO;
 
   async aboutToAppear() {
     await this.getContentDetailData()
@@ -85,7 +92,7 @@ export struct DynamicDetailComponent {
               .fontWeight(FontWeight.Medium)
               .margin({ left: $r('app.float.margin_5') })
           }
-          if (!this.followStatus) {
+          if (this.followStatus == '0') {
             Text('关注')
               .width(60)
               .height($r('app.float.margin_48'))
@@ -121,6 +128,31 @@ export struct DynamicDetailComponent {
           .margin({ top: $r('app.float.margin_6')
           ,left: $r('app.float.margin_16')
           ,right: $r('app.float.margin_16') })
+        if(this.contentDetailData.photoList!= null && this.contentDetailData.photoList.length>0){
+          //附件内容：图片/视频
+          if(this.contentDetailData.newsType+"" == ContentConstants.TYPE_FOURTEEN){
+            GridRow({
+              columns: { sm: this.contentDetailData.photoList.length
+              , md: this.contentDetailData.photoList.length == 1?1:
+                  this.contentDetailData.photoList.length == 4?2:
+                    3 },
+              breakpoints: { value: ['320vp', '520vp', '840vp'] }
+            }) {
+              ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
+                GridCol() {
+                  this.buildItemCard(this.contentDetailData.photoList[index],this.contentDetailData.photoList.length, index);
+                }
+              })
+            }
+          }else{
+            //附件内容：视频，只有一个
+            ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
+              GridCol() {
+                this.buildItemCard(this.contentDetailData.photoList[index],this.contentDetailData.photoList.length, index);
+              }
+            })
+          }
+        }
         //特别声明
         Text("特别声明：本文为人民日报新媒体平台“人民号”作者上传并发布，仅代表作者观点。人民日报仅提供信息发布平台。")
           .fontColor($r('app.color.color_CCCCCC'))
@@ -160,17 +192,253 @@ export struct DynamicDetailComponent {
             .margin({ left: $r('app.float.margin_2')})
         }
         //评论组件/底部组件
+
       }
     }
     .backgroundColor('#FFFFFFFF')
   }
+  /**
+   * 请求（动态）详情页数据
+   * */
   private async getContentDetailData() {
     try {
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
       this.contentDetailData = data[0];
+      this.makeJumpInfo
       console.log('动态详情',JSON.stringify(this.contentDetailData))
     } catch (exception) {
     console.log('请求失败',JSON.stringify(exception))
     }
+    this.getBatchAttentionStatus
+    this.getInteractDataStatus
+  }
+
+  // 查询当前登录用户点赞状态
+  private async getInteractDataStatus() {
+    //未登录
+    if(!AccountManagerUtils.isLoginSync() || this.contentDetailData?.openLikes != 1){
+      return
+    }
+    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))
+    }
+  }
+
+  /**
+   * 查询当前登录用户是否关注作品号主
+   * */
+  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) {
+
+    }
+  }
+  @Builder
+  setItemImageStyle(picPath: string,topLeft: number,topRight: number,bottomLeft: number,bottomRight: number){
+    //四角圆角
+    Image(picPath)
+      .width(44).aspectRatio(1 / 1).margin(16).borderRadius({topLeft: topLeft, topRight: topRight, bottomLeft: bottomLeft, bottomRight: bottomRight})
+  }
+  /**
+   * 组件项
+   *
+   * @param programmeBean item 组件项, 上面icon,下面标题
+   */
+  @Builder
+  buildItemCard(item: PhotoListBean,len: number,index: number) {
+    Column() {
+      this.setItemImageRoundCorner(len, item, 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%')
+    .onClick((event: ClickEvent) => {
+      if(this.contentDetailData.newsType+"" == ContentConstants.TYPE_FOURTEEN){
+        //fixme 跳转到查看图片页面（带页脚/下载按钮）
+        // this.mJumpInfo.objectType = ContentConstants.TYPE_
+        ProcessUtils.processPage(this.mJumpInfo)
+      }else{
+        //fixme 跳转到播放视频页面（点播）
+        this.mJumpInfo.objectType = ContentConstants.TYPE_VOD
+        ProcessUtils.processPage(this.mJumpInfo)
+      }
+    })
+  }
+
+  //创建跳转信息
+  makeJumpInfo(){
+    this.mJumpInfo.pageId = 'dynamicDetailPage';
+    // this.mJumpInfo.from = 'dynamicDetailPage';
+    this.mJumpInfo.objectId = this.contentDetailData.newsId+"";
+    this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType+"";
+    this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId+"";
+  }
+
+  //设置图片圆角
+  @Builder
+  setItemImageRoundCorner(len: number, item: PhotoListBean, index: number) {
+    if (len == 1) {
+      //四角圆角
+      this.setItemImageStyle(item.picPath, 4, 4, 4, 4);
+    } else if (len == 2) {
+      if (index == 0) {
+        //左边圆角
+        this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
+      } else {
+        //右边圆角
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
+      }
+    } else if (3 == len) {
+      if (index == 0) {
+        //左边圆角
+        this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else {
+        //右边圆角
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
+      }
+    } else if (4 == len) {
+      if (index == 0) {
+        //左边圆角
+        this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
+      } else if (index == 1) {
+        //右边圆角
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
+      } else if (index = 2) {
+        //左边圆角
+        this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
+      } else {
+        //右边圆角
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
+      }
+    } else if (5 == len) {
+      if (index == 0) {
+        this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 2) {
+        this.setItemImageStyle(item.picPath, 4, 4, 4, 4);
+      } else if (index = 3) {
+        this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
+      } else {
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      }
+    } else if (6 == len) {
+      if (index == 0) {
+        this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 2) {
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
+      } else if (index = 3) {
+        this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
+      } else if (index = 4) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else {
+        //右边圆角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      }
+    } else if (7 == len) {
+      if (index == 0) {
+        this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 2) {
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
+      } else if (index = 3) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 4) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 5) {
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      } else {
+        this.setItemImageStyle(item.picPath, 0, 0, 4, 4);
+      }
+    } else if (8 == len) {
+      if (index == 0) {
+        this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 2) {
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
+      } else if (index = 3) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 4) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index = 5) {
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      } else if (index = 6) {
+        this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
+      } else {
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      }
+    } else {
+      if (index == 0) {
+        this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
+      } else if (index == 1) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index == 2) {
+        this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
+      } else if (index == 3) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index == 4) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index == 5) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else if (index == 6) {
+        this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
+      } else if (index == 7) {
+        //直角
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
+      } else {
+        this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
+      }
+    }
   }
 }
\ No newline at end of file

@@ -56,6 +56,9 @@ export struct ZhGridLayout03 {
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }
     .width('100%')
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(item)
+    })
   }
 }
 

@@ -36,7 +36,13 @@ export const enum WDViewDefaultType {
   ///该号主无法访问
   WDViewDefaultType_NoVisitAccount,
   ///暂无关注
-  WDViewDefaultType_NoFollow
+  WDViewDefaultType_NoFollow,
+  ///直播结束
+  WDViewDefaultType_NoLiveEnd,
+  /// 直播暂停
+  WDViewDefaultType_NoLiveSuspend,
+  /// 视频加载失败
+  WDViewDefaultType_NoVideo,
 }
 
 /**
@@ -120,6 +126,12 @@ export struct EmptyComponent {
       contentString = '' // 前方拥堵，请耐心等待
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) {
       contentString = '该号主暂时无法访问' // 前方拥堵，请耐心等待
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
+      contentString = '直播已结束' // 前方拥堵，请耐心等待
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
+      contentString = '主播暂时离开，马上回来' // 前方拥堵，请耐心等待
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
+      contentString = '获取内容失败请重试' // 前方拥堵，请耐心等待
     }
 
     return contentString
@@ -148,6 +160,10 @@ export struct EmptyComponent {
       imageString = $r('app.media.icon_no_net')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) {
       imageString = $r('app.media.icon_no_master1')
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
+      imageString = $r('app.media.icon_no_end')
+    }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
+      imageString = $r('app.media.icon_no_content')
     }
     return imageString
   }