Merge remote-tracking branch 'origin/main'

@@ -44,9 +44,9 @@ export struct DynamicDetailComponent {
   /**
   /**
    * 关注状态：默认未关注 点击去关注
    * 关注状态：默认未关注 点击去关注
    */
    */
-  @State  followStatus: String = '0';
+  @State  followStatus: String = '';
 
 
-  @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined// 点赞、收藏状态
+  @State newsStatusOfUser: batchLikeAndCollectResult = {} as batchLikeAndCollectResult// 点赞、收藏状态
   //跳转
   //跳转
   private  mJumpInfo: ContentDTO = {} as ContentDTO;
   private  mJumpInfo: ContentDTO = {} as ContentDTO;
 
 
@@ -121,6 +121,7 @@ export struct DynamicDetailComponent {
                 }
                 }
                 .width('63%')
                 .width('63%')
                 .margin({right: $r('app.float.margin_6')})
                 .margin({right: $r('app.float.margin_6')})
+                if(!StringUtils.isEmpty(this.followStatus)){
                   if (this.followStatus == '0') {
                   if (this.followStatus == '0') {
                     Text('关注')
                     Text('关注')
                       .width($r('app.float.margin_54'))
                       .width($r('app.float.margin_54'))
@@ -148,6 +149,7 @@ export struct DynamicDetailComponent {
                       })
                       })
                   }
                   }
                 }
                 }
+              }
               .width('100%')
               .width('100%')
               .margin({ left: $r('app.float.margin_16')})
               .margin({ left: $r('app.float.margin_16')})
               //内容
               //内容
@@ -330,8 +332,8 @@ export struct DynamicDetailComponent {
                 Image(this.newsStatusOfUser?.likeStatus == '1'?
                 Image(this.newsStatusOfUser?.likeStatus == '1'?
                 $r('app.media.icon_like_selected_redheart')
                 $r('app.media.icon_like_selected_redheart')
                   :$r('app.media.icon_like_unselect_grey_redheart'))
                   :$r('app.media.icon_like_unselect_grey_redheart'))
-                  .width($r('app.float.margin_24'))
-                  .height($r('app.float.margin_24'))
+                  .width($r('app.float.margin_36'))
+                  .height($r('app.float.margin_36'))
                   .objectFit(ImageFit.Cover)
                   .objectFit(ImageFit.Cover)
                 if(this.interactDataDTO?.likeNum != 0){
                 if(this.interactDataDTO?.likeNum != 0){
                   Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
                   Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
@@ -430,12 +432,18 @@ export struct DynamicDetailComponent {
 
 
   // 已登录->查询用户对作品点赞、收藏状态
   // 已登录->查询用户对作品点赞、收藏状态
   private async getInteractDataStatus() {
   private async getInteractDataStatus() {
+    // 未登录，跳转登录
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
     try {
     try {
       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 + '',
           }
           }
         ]
         ]
       }
       }
@@ -453,6 +461,13 @@ export struct DynamicDetailComponent {
    * 查询当前登录用户是否关注作品号主
    * 查询当前登录用户是否关注作品号主
    * */
    * */
   private async getBatchAttentionStatus() {
   private async getBatchAttentionStatus() {
+    // 未登录，跳转登录
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      this.followStatus = '0';
+      return
+    }
     try {
     try {
         const params: postBatchAttentionStatusParams = {
         const params: postBatchAttentionStatusParams = {
           creatorIds: [{ creatorId: this.contentDetailData?.rmhInfo?.rmhId ?? '' }]
           creatorIds: [{ creatorId: this.contentDetailData?.rmhInfo?.rmhId ?? '' }]
@@ -461,7 +476,7 @@ export struct DynamicDetailComponent {
         this.followStatus = data[0]?.status;
         this.followStatus = data[0]?.status;
         Logger.info(TAG, `followStatus：${JSON.stringify(this.followStatus)}`)
         Logger.info(TAG, `followStatus：${JSON.stringify(this.followStatus)}`)
       } catch (exception) {
       } catch (exception) {
-
+        this.followStatus = '0';
       }
       }
   }
   }
 
 
@@ -558,8 +573,6 @@ export struct DynamicDetailComponent {
       contentType: this.contentDetailData?.newsType + '',
       contentType: this.contentDetailData?.newsType + '',
     }
     }
     ContentDetailRequest.postExecuteLike(params).then(res => {
     ContentDetailRequest.postExecuteLike(params).then(res => {
-
-      if (this.newsStatusOfUser) {
       this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
       this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
       if (this.newsStatusOfUser.likeStatus === '1') {
       if (this.newsStatusOfUser.likeStatus === '1') {
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) + 1
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) + 1
@@ -567,9 +580,6 @@ export struct DynamicDetailComponent {
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) - 1
         this.interactDataDTO.likeNum = Number(this.interactDataDTO.likeNum) - 1
       }
       }
       console.log('点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactDataDTO?.likeNum)
       console.log('点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactDataDTO?.likeNum)
-        // this.queryContentInteractCount()
-      }
-
     })
     })
   }
   }
 }
 }

@@ -104,6 +104,9 @@ struct createImg {
           }
           }
           .align(Alignment.BottomEnd)
           .align(Alignment.BottomEnd)
         }
         }
+        .onClick((event: ClickEvent) => {
+          ProcessUtils.gotoVod(this.contentDTO)
+        })
       } else {
       } else {
         // 竖图显示，宽度占50%，高度自适应
         // 竖图显示，宽度占50%，高度自适应
         GridCol({
         GridCol({