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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 修复横版直播间直播间Tab和大家聊占位图多了一个返回按钮问题
  fix: 沉浸式视频进度条左右边距修改

@@ -63,6 +63,8 @@ export struct EmptyComponent {
   @State emptyButton: boolean = false
   @State emptyButton: boolean = false
   @State isBlack: boolean = false // 背景是否为黑色 默认白色
   @State isBlack: boolean = false // 背景是否为黑色 默认白色
   @State timeNum: number = 10
   @State timeNum: number = 10
+  ///占位图上是否显示返回按钮
+  @State showBackButton: boolean = true
   /**
   /**
    * The empty image width percentage setting.
    * The empty image width percentage setting.
    */
    */
@@ -111,16 +113,18 @@ export struct EmptyComponent {
   build() {
   build() {
     Stack({alignContent:Alignment.Bottom}) {
     Stack({alignContent:Alignment.Bottom}) {
       this.noProgrammeData();
       this.noProgrammeData();
-      Image($r("app.media.icon_arrow_left_white"))
-        .width(24)
-        .height(24)
-        .onClick(() => {
-          router.back();
-        })
-        .position({
-          bottom: 15,
-          left: 16
-        })
+      if (this.showBackButton) {
+        Image($r("app.media.icon_arrow_left_white"))
+          .width(24)
+          .height(24)
+          .onClick(() => {
+            router.back();
+          })
+          .position({
+            bottom: 15,
+            left: 16
+          })
+      }
     }
     }
   }
   }
 
 

@@ -78,7 +78,7 @@ export struct TabChatComponent {
       } else if (this.pageModel.viewType == ViewType.ERROR) {
       } else if (this.pageModel.viewType == ViewType.ERROR) {
         ErrorComponent()
         ErrorComponent()
       } else if (this.pageModel.viewType == ViewType.EMPTY) {
       } else if (this.pageModel.viewType == ViewType.EMPTY) {
-        EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoComment1 })
+        EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoComment1, showBackButton:false})
       } else {
       } else {
 
 
         CustomPullToRefresh({
         CustomPullToRefresh({

@@ -75,7 +75,7 @@ export struct TabLiveComponent {
       } else if (this.pageModel.viewType == ViewType.ERROR) {
       } else if (this.pageModel.viewType == ViewType.ERROR) {
         ErrorComponent()
         ErrorComponent()
       } else if (this.pageModel.viewType == ViewType.EMPTY) {
       } else if (this.pageModel.viewType == ViewType.EMPTY) {
-        EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoContent1 })
+        EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoContent1, showBackButton:false })
       } else {
       } else {
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata: this.liveList,
           alldata: this.liveList,

@@ -130,11 +130,12 @@ export struct PlayerProgressView {
                   this.isDragging = false
                   this.isDragging = false
                 }
                 }
                 this.playerController?.setSeekTime(value, mode);
                 this.playerController?.setSeekTime(value, mode);
-                console.log('slider onChange:', value, mode)
+                // console.log('slider onChange:', value, mode)
 
 
               })
               })
           }
           }
           .width('100%')
           .width('100%')
+          .padding({ left: 6, right: 6 })
           .height(24)
           .height(24)
           .justifyContent(FlexAlign.Center)
           .justifyContent(FlexAlign.Center)
 
 

@@ -94,7 +94,7 @@ export struct PlayerTitleView {
       }
       }
       clipStr += strArr[i]
       clipStr += strArr[i]
     }
     }
-    console.log(TAG, 'clipStr:', clipStr)
+    // console.log(TAG, 'clipStr:', clipStr)
     return clipStr
     return clipStr
   }
   }
 
 
@@ -130,7 +130,7 @@ export struct PlayerTitleView {
       }
       }
       clipStr += strArr[i]
       clipStr += strArr[i]
     }
     }
-    console.log(TAG, 'clipTitleText clipStr:', clipStr)
+    // console.log(TAG, 'clipTitleText clipStr:', clipStr)
     return clipStr
     return clipStr
   }
   }
 
 
@@ -145,8 +145,8 @@ export struct PlayerTitleView {
 
 
     })
     })
     this.titleHeight = info?.height as number || 0
     this.titleHeight = info?.height as number || 0
-    console.log('titleHeight:', this.titleHeight,)
-    console.log(TAG, 'this.contentDetailData:', JSON.stringify(this.contentDetailData))
+    // console.log('titleHeight:', this.titleHeight,)
+    // console.log(TAG, 'this.contentDetailData:', JSON.stringify(this.contentDetailData))
     this.summary = this.getSummary()
     this.summary = this.getSummary()
   }
   }