Merge remote-tracking branch 'origin/main'

@@ -456,6 +456,7 @@ export class ProcessUtils {
         pageID: 'FeedBackActivity'
       } as Params,
     };
+
     WDRouterRule.jumpWithAction(taskAction)
   }
 
@@ -463,6 +464,7 @@ export class ProcessUtils {
    * 跳转到登录页
    */
   public static gotoLoginPage() {
+
     WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
   }
 }

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

 export interface commentInfo {
   commentTitle: string,
   newsTitle: string,
-  userName: string,
-  userHeaderUrl: string,
+  userId?: string,
+  userName?: string,
+  userHeaderUrl?: string,
   publishTime: number,
   commentId: string,
   newsId: string,
   relId: string;
   relType: string;
-  userId: string;
-  newsType?: string
+  newsType?: string,
+  objectType?: string,
 }
\ No newline at end of file

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

@@ -32,12 +32,12 @@ import { LiveHorizontalCardComponent } from './view/LiveHorizontalCardComponent'
 @Component
 export struct CompParser {
   @State compDTO: CompDTO = {} as CompDTO
-  @State private pageModel: PageModel = new PageModel();
   @State compIndex: number = 0;
+  @State private pageModel: PageModel = new PageModel();
 
   build() {
     Column() {
-      if (this.compDTO.name !="月度排行卡") {
+      if (this.compDTO.name != "月度排行卡") {
 
         this.componentBuilder(this.compDTO, this.compIndex);
       }
@@ -53,7 +53,8 @@ export struct CompParser {
     } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
       ZhCarouselLayout01({ compDTO: compDTO })
       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 })
       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 })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
       //头图卡 和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 })
     } 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 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } 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 })
-    }
-    else {
+    } else {
       Text(compDTO.compStyle)
         .width(CommonConstants.FULL_PARENT)
         .padding(10)

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

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

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

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

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

@@ -49,7 +49,7 @@ export struct Card6Component {
               .maxLines(3)
               .alignSelf(ItemAlign.Start)
               .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.objectType == '5' ? 30 : 0)
           }.alignContent(Alignment.TopStart)

@@ -43,8 +43,11 @@ export struct Card9Component {
             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)
 
       // 时间线--后端返回三个，

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

@@ -214,7 +214,7 @@ struct CarouselLayout01CardView {
             .align(Alignment.Bottom)
             .maxLines(CompUtils.MAX_LINES_2)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
-            .textIndent(this.item.objectType == '5' ? 40 : 0)
+            .textIndent(this.item.objectType == '5' ? 35 : 0)
         }
         // .height(39)
         .padding({

@@ -5,13 +5,10 @@ import { ProcessUtils } from 'wdRouter';
 import { SpConstants } from 'wdConstant/Index'
 import {
   batchLikeAndCollectParams,
-  ContentDetailRequest,
-  contentListParams,
-  postExecuteCollectRecordParams,
-  postExecuteLikeParams,
-  postInteractAccentionOperateParams
 } 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'
 
 /**
  * 精选评论卡
@@ -40,13 +37,19 @@ export struct ZhSingleRow06 {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       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)
-      console.error(TAG, 'ZhSingleRow06-data', JSON.stringify(data))
+      Logger.info(TAG, 'ZhSingleRow06-data', JSON.stringify(data))
       this.newsStatusOfUser = data[0];
       Logger.info(TAG, `ZhSingleRow06-newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
     } catch (exception) {
@@ -126,7 +129,7 @@ export struct ZhSingleRow06 {
           .fontColor(0x999999)
 
         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)
             .height(16)
             .margin({right: 3})

 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 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 { PageComponent } from './PageComponent';
 import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout';

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

@@ -3,4 +3,5 @@
 /.preview
 /build
 /.cxx
-/.test
\ No newline at end of file
+/.test
+/oh-package-lock.json5
\ No newline at end of file