Merge remote-tracking branch 'origin/main'

 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
+  newsType?: string,
+  objectType?: string,
 }
 }

@@ -5,13 +5,10 @@ import { ProcessUtils } from 'wdRouter';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import {
 import {
   batchLikeAndCollectParams,
   batchLikeAndCollectParams,
-  ContentDetailRequest,
-  contentListParams,
-  postExecuteCollectRecordParams,
-  postExecuteLikeParams,
-  postInteractAccentionOperateParams
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel';
+import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
+import { commentItemModel } from '../../components/comment/model/CommentModel'
 
 
 /**
 /**
  * 精选评论卡
  * 精选评论卡
@@ -40,13 +37,19 @@ export struct ZhSingleRow06 {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
-    const params: postExecuteLikeParams = {
-      status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
-      contentId: this.compDTO.operDataList[0]?.commentInfo?.newsId + '',
-      contentType: this.compDTO.operDataList[0]?.commentInfo?.newsType + '',
-    }
-    ContentDetailRequest.postExecuteLike(params).then(res => {
-      this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
+
+    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';
     })
     })
   }
   }
 
 
@@ -67,7 +70,7 @@ export struct ZhSingleRow06 {
         ]
         ]
       }
       }
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
-      console.error(TAG, 'ZhSingleRow06-data', JSON.stringify(data))
+      Logger.info(TAG, 'ZhSingleRow06-data', JSON.stringify(data))
       this.newsStatusOfUser = data[0];
       this.newsStatusOfUser = data[0];
       Logger.info(TAG, `ZhSingleRow06-newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
       Logger.info(TAG, `ZhSingleRow06-newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
     } catch (exception) {
     } catch (exception) {
@@ -126,7 +129,7 @@ export struct ZhSingleRow06 {
           .fontColor(0x999999)
           .fontColor(0x999999)
 
 
         Row(){
         Row(){
-          Image(this.newsStatusOfUser?.likeStatus == '1' ? $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})

@@ -49,9 +49,6 @@ export class LiveModel {
     params['relationId'] = relationId
     params['relationId'] = relationId
     params['liveId'] = liveId
     params['liveId'] = liveId
     params['isSubscribe'] = `${isSubscribe}`
     params['isSubscribe'] = `${isSubscribe}`
-    Logger.info('relationId', relationId)
-    Logger.info('liveId', liveId)
-    Logger.info('isSubscribe', typeof isSubscribe)
     return new Promise<ResponseDTO<string>>((success, fail) => {
     return new Promise<ResponseDTO<string>>((success, fail) => {
       HttpRequest.post<ResponseDTO<string>>(
       HttpRequest.post<ResponseDTO<string>>(
         HttpUrlUtils.getLiveAppointmentUrl(),
         HttpUrlUtils.getLiveAppointmentUrl(),