Merge remote-tracking branch 'origin/main'

@@ -190,6 +190,7 @@ export struct CommentIconComponent {
               .width(this.getMeasureText(this.publishCommentModel.totalCommentNumer) +
               .width(this.getMeasureText(this.publishCommentModel.totalCommentNumer) +
                 12)// .backgroundColor(Color.Green)
                 12)// .backgroundColor(Color.Green)
               .id("Text")
               .id("Text")
+              .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)
             // .offset({
             // .offset({
             //   x: 3
             //   x: 3
             // })
             // })

@@ -55,10 +55,10 @@ export struct LikeComponent {
     } else if (this.componentType == 4) {
     } else if (this.componentType == 4) {
       // 直播，点赞按钮底测有灰色圆角背景+右上点赞数量
       // 直播，点赞按钮底测有灰色圆角背景+右上点赞数量
       this.likeCompStyle4()
       this.likeCompStyle4()
-    }  else if (this.componentType == 5) {
+    } else if (this.componentType == 5) {
       // 图集点赞，展示标识
       // 图集点赞，展示标识
       this.likeCompStyle5()
       this.likeCompStyle5()
-    }else {
+    } else {
       //1: 底部栏目样式  默认样式
       //1: 底部栏目样式  默认样式
       this.likeCompStyle1()
       this.likeCompStyle1()
     }
     }
@@ -188,7 +188,7 @@ export struct LikeComponent {
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .position({ x: '100%', })
       .position({ x: '100%', })
       .markAnchor({ x: '100%' })
       .markAnchor({ x: '100%' })
-      .backgroundImage(this.likeStatus? $r('app.media.ic_like_back_Select'):$r('app.media.ic_like_back'))
+      .backgroundImage(this.likeStatus ? $r('app.media.ic_like_back_Select') : $r('app.media.ic_like_back'))
       .backgroundImageSize(ImageSize.Auto)
       .backgroundImageSize(ImageSize.Auto)
       .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
       .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
     }.width(24).height(24)
     }.width(24).height(24)
@@ -209,7 +209,7 @@ export struct LikeComponent {
       .width(36)
       .width(36)
       .height(36)
       .height(36)
       .borderRadius(18)
       .borderRadius(18)
-      .backgroundColor(this.pageComponentType === 4 ? '#4D000000' : '#FFF5F5F5')
+      .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : '#FFF5F5F5')
 
 
 
 
       Row() {
       Row() {

@@ -199,6 +199,7 @@ export struct DetailPlayShortVideoPage {
           })
           })
 
 
         }
         }
+        .width('100%')
         .layoutWeight(1)
         .layoutWeight(1)
         .onClick(() => {
         .onClick(() => {
           this.playerController?.switchPlayOrPause();
           this.playerController?.switchPlayOrPause();
@@ -223,9 +224,10 @@ export struct DetailPlayShortVideoPage {
       }
       }
       .height('100%')
       .height('100%')
       .width('100%')
       .width('100%')
-      .padding({
-        top: this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ? 0 : this.topSafeHeight + 'px'
-      })
+
+      // .padding({
+      //   top: this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ? 0 : this.topSafeHeight + 'px'
+      // })
 
 
       if (this.showCommentList) {
       if (this.showCommentList) {
         CommentComponentPage({})
         CommentComponentPage({})

@@ -258,15 +258,12 @@ export struct VideoChannelDetail {
           .visibility(this.isMouted ? Visibility.None : Visibility.Visible)
           .visibility(this.isMouted ? Visibility.None : Visibility.Visible)
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
           ForEach(this.data, (item: ContentDetailDTO, index: number) => {
           ForEach(this.data, (item: ContentDetailDTO, index: number) => {
-            Column() {
-              DetailPlayShortVideoPage({
-                contentDetailData: item,
-                currentIndex: this.currentIndex,
-                index: index,
-                interactData: this.interactDataList[index]
-              })
-            }.width('100%')
-            .height('100%')
+            DetailPlayShortVideoPage({
+              contentDetailData: item,
+              currentIndex: this.currentIndex,
+              index: index,
+              interactData: this.interactDataList[index]
+            })
           }, (item: ContentDetailDTO) => item.newsId + '')
           }, (item: ContentDetailDTO) => item.newsId + '')
         }
         }
         .displayCount(1, true)
         .displayCount(1, true)