Merge remote-tracking branch 'origin/main'

@@ -185,53 +185,13 @@ export struct CommentIconComponent {
         Image(this.styleType == 1 ? $r('app.media.comment_icon') :
         $r('app.media.comment_icon_white')).width(24).height(24)
         // Stack({alignContent:Alignment.Start}) {
-        if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
-          RelativeContainer() {
-            Image(this.styleType == 1 ? this.showMainText?$r('app.media.comment_icon_text_bg'):$r('app.media.comment_icon_number_bg') : this.showMainText?$r('app.media.comment_icon_text_block_bg'):$r('app.media.ic_like_back_Select'))
-              .objectFit(ImageFit.Fill)
-              .resizable({
-                slice: {
-                  top: 1,
-                  left: 20,
-                  right: 1,
-                  bottom: 1
-                }
-              })
-              .alignRules({
-                top: { anchor: "Text", align: VerticalAlign.Top },
-                left: { anchor: "Text", align: HorizontalAlign.Start },
-                right: { anchor: "Text", align: HorizontalAlign.End },
-                bottom: { anchor: "Text", align: VerticalAlign.Bottom },
-              })// .offset({
-                //   x:-6
-                // })
-              .id("Image")
-            Text(this.showMainText?'正文':NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer))// Text("44444444")
-              .fontSize(8)
-              .fontColor(this.showMainText?'#222222':'#ffffff')// .backgroundColor('#ED2800')
-              .height(12)
-              .textAlign(TextAlign.Center)
-              .alignRules({
-                top: { anchor: "__container__", align: VerticalAlign.Top },
-                left: { anchor: "__container__", align: HorizontalAlign.Start }
-              })// .margin({left: 4,right:4
-                // })
-                /*动态计算文字宽度*/
-              .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer)) +
-                12)// .backgroundColor(Color.Green)
-              .id("Text")
-              .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)
-            // .offset({
-            //   x: 3
-            // })
 
+        if (this.showMainText) {
+          this.commentIcon()
+        }else {
+          if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
+            this.commentIcon()
           }
-          // }
-          .offset({
-            x: this.showMainText?8:12,
-            y: -2
-          })
-
         }
       }
     }
@@ -242,6 +202,55 @@ export struct CommentIconComponent {
     // .backgroundColor(Color.Blue)
   }
 
+  @Builder
+  commentIcon() {
+    RelativeContainer() {
+      Image(this.styleType == 1 ? this.showMainText?$r('app.media.comment_icon_text_bg'):$r('app.media.comment_icon_number_bg') : this.showMainText?$r('app.media.comment_icon_text_block_bg'):$r('app.media.ic_like_back_Select'))
+        .objectFit(ImageFit.Fill)
+        .resizable({
+          slice: {
+            top: 1,
+            left: 20,
+            right: 1,
+            bottom: 1
+          }
+        })
+        .alignRules({
+          top: { anchor: "Text", align: VerticalAlign.Top },
+          left: { anchor: "Text", align: HorizontalAlign.Start },
+          right: { anchor: "Text", align: HorizontalAlign.End },
+          bottom: { anchor: "Text", align: VerticalAlign.Bottom },
+        })// .offset({
+          //   x:-6
+          // })
+        .id("Image")
+      Text(this.showMainText?'正文':NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer))// Text("44444444")
+        .fontSize(8)
+        .fontColor(this.showMainText?'#222222':'#ffffff')// .backgroundColor('#ED2800')
+        .height(12)
+        .textAlign(TextAlign.Center)
+        .alignRules({
+          top: { anchor: "__container__", align: VerticalAlign.Top },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })// .margin({left: 4,right:4
+          // })
+          /*动态计算文字宽度*/
+        .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.publishCommentModel.totalCommentNumer)) +
+          12)// .backgroundColor(Color.Green)
+        .id("Text")
+        .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)
+      // .offset({
+      //   x: 3
+      // })
+
+    }
+    // }
+    .offset({
+      x: this.showMainText?8:12,
+      y: -2
+    })
+  }
+
   private getMeasureText(text: string) {
 
 

@@ -140,6 +140,14 @@ export struct ZhSingleRow06 {
       .borderRadius(4)
       .margin({bottom: 12})
       .onClick(() => {
+        let contentBean = ProcessUtils.commentBeanToContentBean(this.compDTO.operDataList[0]?.commentInfo as commentInfo)
+        if(contentBean !== null && contentBean !== undefined){
+          let type = contentBean.objectType;
+          if (type == "1") {
+            AppStorage.setOrCreate<number>('isZhingleRow06', 1)
+          }
+        }
+
         ProcessUtils.commentGotoWeb(this.compDTO.operDataList[0]?.commentInfo as commentInfo)
       })
 

@@ -31,6 +31,7 @@ struct AppointmentListPage {
       }
     }.width("100%")
     .height("100%")
+    .backgroundColor(Color.White)
     .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
 
   }

@@ -498,7 +498,10 @@ export struct OperRowListView {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
     }
-    const params: postExecuteCollectRecordParams = {
+
+    let  params: postExecuteCollectRecordParams = {} as postExecuteCollectRecordParams
+
+    params = {
       status: this.newsStatusOfUser?.collectStatus === 1 ? '0' : '1',
       contentList: [{
         contentId: this.contentDetailData?.newsId + '',
@@ -506,8 +509,21 @@ export struct OperRowListView {
         relType: this.contentDetailData?.reLInfo?.relType || '' + '',
         contentRelId: this.contentDetailData?.reLInfo?.relId || '' + '',
       }],
+    }
 
+    //专题
+    if (this.topicInfo && Object.keys(this.topicInfo).length > 0){
+      params = {
+        status: this.newsStatusOfUser?.collectStatus === 1 ? '0' : '1',
+        contentList: [{
+          contentId: this.topicInfo?.topicId + '',
+          contentType: '5',
+          relType: this.topicInfo?.relType || '' + '',
+          contentRelId: this.topicInfo?.relId || '' + '',
+        }],
+      }
     }
+
     console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
       if (this.newsStatusOfUser) {

@@ -69,7 +69,6 @@ export struct TabLiveItemComponent {
           })
           .borderRadius(2)
           .margin({ left: 8 })
-          .width(100)
           .visibility(1 == this.item.isTop ? Visibility.Visible : Visibility.None)
       }
       .justifyContent(FlexAlign.Start)

@@ -213,12 +213,12 @@ export struct PlayUIComponent {
           LottieView({
             name: 'live_status_wait',
             path: "lottie/live_detail_living.json",
-            lottieWidth: 9,
-            lottieHeight: 9,
+            lottieWidth: 12,
+            lottieHeight: 12,
             autoplay: true,
             loop: true,
           })
-            .margin({ right: 2 })
+            .margin({ right: 3 })
         }
 
         Text('直播中')

@@ -121,12 +121,12 @@ export struct PlayerTitleComponent {
             LottieView({
               name: 'live_status_wait',
               path: "lottie/live_detail_living.json",
-              lottieWidth: 9,
-              lottieHeight: 9,
+              lottieWidth: 12,
+              lottieHeight: 12,
               autoplay: true,
               loop: true,
             })
-              .margin({ right: 2 })
+              .margin({ right: 3 })
           }.margin({ right: 1 })
 
           // Image($r('app.media.icon_live_status_running'))

@@ -45,6 +45,7 @@ export struct PlayerRightView {
   @Consume pageId: string
   followUserId: string = ''
   followUserName: string = ''
+  @State isZhingleRow06: number = AppStorage.get<number>('isZhingleRow06') || 0
 
   aboutToAppear() {
     // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
@@ -53,6 +54,14 @@ export struct PlayerRightView {
     // console.log(TAG, 'this.likesStyle', this.likesStyle)
     // console.log(TAG, 'this.openLikes', this.openLikes)
     this.contentTrackingDict()
+    if (this.isZhingleRow06 == 1) { //锐评精选卡视频类自动弹评论框
+      this.showCommentList = true
+    }
+  }
+
+  aboutToDisappear(): void {
+    AppStorage.setOrCreate<number>('isZhingleRow06', 0)
+    this.showCommentList = false
   }
 
   contentTrackingDict() {