Merge remote-tracking branch 'origin/main'

@@ -48,7 +48,8 @@ export struct ZhGridLayout02NewsContent {
         Image(this.loadImg ? item == undefined ? '' : item.fullColumnImgUrls[0].url : '')
         Image(this.loadImg ? item == undefined ? '' : item.fullColumnImgUrls[0].url : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .width('100%')
           .width('100%')
-          .height(95)
+          // .height(95)
+          .aspectRatio(167 / 95)
           .borderWidth(0.5)
           .borderWidth(0.5)
           .borderColor($r('app.color.color_0D000000'))
           .borderColor($r('app.color.color_0D000000'))
           .borderRadius(4)
           .borderRadius(4)

 import { DateFormatUtil, WDAliPlayerController } from 'wdPlayer/Index'
 import { DateFormatUtil, WDAliPlayerController } from 'wdPlayer/Index'
-import { LiveRoomDataBean } from 'wdBean/Index'
+import { ContentDetailDTO, LiveRoomDataBean } from 'wdBean/Index'
 import { WindowModel } from 'wdKit/Index'
 import { WindowModel } from 'wdKit/Index'
 import { window } from '@kit.ArkUI'
 import { window } from '@kit.ArkUI'
 import { DisplayDirection } from 'wdConstant/Index'
 import { DisplayDirection } from 'wdConstant/Index'
@@ -15,7 +15,7 @@ export struct PlayerVideoControlComponent {
   //是否处于播放状态中
   //是否处于播放状态中
   @State isPlayStatus: boolean = true
   @State isPlayStatus: boolean = true
   @Consume displayDirection: DisplayDirection
   @Consume displayDirection: DisplayDirection
-
+  @Consume contentDetailData: ContentDetailDTO
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     if (this.playerController) {
     if (this.playerController) {
@@ -39,6 +39,10 @@ export struct PlayerVideoControlComponent {
   getBottomUIComponent() {
   getBottomUIComponent() {
     Row() {
     Row() {
       this.playOrPauseBtn()
       this.playOrPauseBtn()
+
+      if(this.contentDetailData.liveInfo?.liveState == 'running'){
+        Blank().layoutWeight(1)
+      }else{
         Text(this.currentTime)
         Text(this.currentTime)
           .fontColor(Color.White)
           .fontColor(Color.White)
           .fontWeight(600)
           .fontWeight(600)
@@ -46,9 +50,7 @@ export struct PlayerVideoControlComponent {
           .margin({
           .margin({
             left: 16
             left: 16
           })
           })
-
         this.playProgressView()
         this.playProgressView()
-
         Text(this.totalTime)
         Text(this.totalTime)
           .fontColor(Color.White)
           .fontColor(Color.White)
           .fontWeight(600)
           .fontWeight(600)
@@ -56,6 +58,7 @@ export struct PlayerVideoControlComponent {
           .margin({
           .margin({
             right: 16
             right: 16
           })
           })
+      }
       //全屏按钮
       //全屏按钮
       Image($r('app.media.icon_live_player_full_screen'))
       Image($r('app.media.icon_live_player_full_screen'))
         .height(32)
         .height(32)