Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 修复直播间视频消息下面有多余空白问题
  ref |> 修复单个视频播放页返回按钮不容易点击问题
  视频>直播，正在直播只配置一个内容时，卡片样式不正确，封面图没有左右对齐，见截图

@@ -29,9 +29,9 @@ export struct LiveHorizontalCardForOneComponent {
         .margin({ top: 8 })
         .margin({ top: 8 })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
     }
     }
-    .padding({
-      left: 16,
-      right: 16
-    })
+    // .padding({
+    //   left: 16,
+    //   right: 16
+    // })
   }
   }
 }
 }

@@ -18,6 +18,8 @@ export struct VideoPlayPage {
   @State currentTime: string = ''
   @State currentTime: string = ''
   @State totalTime: string = ''
   @State totalTime: string = ''
   @State progressVal: number = 0;
   @State progressVal: number = 0;
+  @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     let par: Action = router.getParams() as Action
     let par: Action = router.getParams() as Action
@@ -65,26 +67,27 @@ export struct VideoPlayPage {
       Row() {
       Row() {
         Image($r('app.media.icon_arrow_left_white'))
         Image($r('app.media.icon_arrow_left_white'))
           .width(24)
           .width(24)
+          .height(24)
           .aspectRatio(1)
           .aspectRatio(1)
+          .interpolation(ImageInterpolation.High)
           .margin({
           .margin({
             right: 10
             right: 10
           })
           })
+
           .onClick(() => {
           .onClick(() => {
             router.back()
             router.back()
           })
           })
       }
       }
       .width('100%')
       .width('100%')
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
-      .margin({
-        bottom: 10
-      })
+      .margin({ top: `${this.topSafeHeight}px` })
     }.width('100%')
     }.width('100%')
-    .padding({
-      top: 20,
-      bottom: 6,
-      left: 10,
-      right: 10
-    })
+    // .padding({
+    //   top: 20,
+    //   bottom: 6,
+    //   left: 10,
+    //   right: 10
+    // })
     .alignItems(HorizontalAlign.Start)
     .alignItems(HorizontalAlign.Start)
   }
   }
 
 

@@ -124,6 +124,7 @@ export struct TabLiveItemComponent {
           RelativeContainer() {
           RelativeContainer() {
             Image(this.item.transcodeImageUrl)
             Image(this.item.transcodeImageUrl)
               .width('100%')
               .width('100%')
+              .height(174)
               .objectFit(ImageFit.Cover)
               .objectFit(ImageFit.Cover)
               .borderRadius(4)
               .borderRadius(4)
               .id('iv_id')
               .id('iv_id')
@@ -159,7 +160,7 @@ export struct TabLiveItemComponent {
           .margin({
           .margin({
             top: 8,
             top: 8,
           })
           })
-          .aspectRatio(this.getAspectRation())
+          .height(174)
           .onClick(() => {
           .onClick(() => {
             this.gotoVideoPlayPage()
             this.gotoVideoPlayPage()
           })
           })