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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 19275 功能缺陷-【uat】进入直播，点击月度排行/乡村振兴，进入缺省页，返回，月度排行显示异常
  fix: 19265 UI还原问题-【uat】进入评论卡，超长，没有省略
  fix(19282)： UI还原问题-【uat】进入横屏直播详情页，点击暂停后，再次点击播放，进度条消失，预期显示4秒后消失
  fix(18285)： UI还原问题-【uat】进入“在线中国拉流-浮动按钮”直播间，“直播加载中，请稍后重试” 文案未居中

@@ -121,7 +121,7 @@ export struct ZhSingleRow06 {
           .borderColor(0xf4f4f4)
           .borderColor(0xf4f4f4)
           .visibility(this.compDTO.operDataList[0]?.commentInfo?.commentPics ? Visibility.Visible : Visibility.None)
           .visibility(this.compDTO.operDataList[0]?.commentInfo?.commentPics ? Visibility.Visible : Visibility.None)
 
 
-        Row() {
+        Flex({justifyContent: FlexAlign.Start}) {
           Image($r('app.media.icon_clip'))
           Image($r('app.media.icon_clip'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
@@ -132,7 +132,6 @@ export struct ZhSingleRow06 {
             .fontSize(14)
             .fontSize(14)
             .fontColor(0x666666)
             .fontColor(0x666666)
         }
         }
-        .justifyContent(FlexAlign.Start)
         .width('100%')
         .width('100%')
       }
       }
       .width("100%")
       .width("100%")

@@ -84,11 +84,11 @@ export struct LiveHorizontalCardComponent {
             }
             }
           } as Params,
           } as Params,
         };
         };
-        this.compDTO.operDataList = []
-        console.log('LiveHorizontalCardComponent', JSON.stringify(this.compDTO))
-        console.log('LiveHorizontalCardComponent', this.compDTO.relId)
-        console.log('LiveHorizontalCardComponent', this.compDTO.relType)
-        console.log('LiveHorizontalCardComponent', JSON.stringify(taskAction))
+        // this.compDTO.operDataList = []
+        // console.log('LiveHorizontalCardComponent', JSON.stringify(this.compDTO))
+        // console.log('LiveHorizontalCardComponent', this.compDTO.relId)
+        // console.log('LiveHorizontalCardComponent', this.compDTO.relType)
+        // console.log('LiveHorizontalCardComponent', JSON.stringify(taskAction))
         WDRouterRule.jumpWithAction(taskAction)
         WDRouterRule.jumpWithAction(taskAction)
       } else {
       } else {
         // console.log('LiveHorizontalCardComponent', 'jumpToLiveMorePage')
         // console.log('LiveHorizontalCardComponent', 'jumpToLiveMorePage')

@@ -56,7 +56,11 @@ export struct PlayUIComponent {
       this.playerController.onStatusChangeForPlayUIComponent = (status: number) => {
       this.playerController.onStatusChangeForPlayUIComponent = (status: number) => {
         if(1 == status){
         if(1 == status){
           this.ispause = false
           this.ispause = false
-          this.isMenuVisible = false
+          if(this.isMenuVisible){
+            this.onChangeMenuVisible()
+          }else{
+            this.isMenuVisible = true
+          }
         }else if(2 == status){
         }else if(2 == status){
           this.ispause = true
           this.ispause = true
         }
         }

@@ -282,6 +282,7 @@ export struct TopPlayComponent {
           })
           })
       }.width('100%').visibility(this.isPlayerError ? Visibility.Visible :
       }.width('100%').visibility(this.isPlayerError ? Visibility.Visible :
       Visibility.None)
       Visibility.None)
+      .margin({top:40})
 
 
     }
     }
     .width('100%')
     .width('100%')