feat：1）直播详情信息横屏播放器和间接直播间UI逻辑修改

@@ -171,10 +171,12 @@ export interface LiveInfo {
   liveState: string
   liveState: string
   //2024-04-12 15:00:00 直播开始时间
   //2024-04-12 15:00:00 直播开始时间
   planStartTime: string
   planStartTime: string
-  mliveId:string
   vlive: Array<Vlive>
   vlive: Array<Vlive>
+  mlive:MLive
+}
+export interface MLive {
+  mliveId:string
 }
 }
-
 export interface FullColumnImgUrls {
 export interface FullColumnImgUrls {
   url: string
   url: string
 }
 }

@@ -10,13 +10,14 @@ import router from '@ohos.router';
 export struct DetailPlayLivePage {
 export struct DetailPlayLivePage {
   TAG: string = 'DetailPlayLivePage';
   TAG: string = 'DetailPlayLivePage';
   liveViewModel: LiveViewModel = new LiveViewModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
-  @State relId: string = ''
-  @State contentId: string = ''
-  @State relType: string = ''
+  @State relId: string = '500005302448'
+  @State contentId: string = '20000016340'
+  @State relType: string = '1'
   @Provide liveDetailsBean: LiveDetailsBean = {} as LiveDetailsBean
   @Provide liveDetailsBean: LiveDetailsBean = {} as LiveDetailsBean
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
+    //https://pdapis.pdnews.cn/api/rmrb-bff-display-zh/content/zh/c/content/detail?relId=500005302448&relType=1&contentId=20000016340
     let par: Action = router.getParams() as Action;
     let par: Action = router.getParams() as Action;
     let params = par?.params;
     let params = par?.params;
     this.relId = params?.extra?.relId || '';
     this.relId = params?.extra?.relId || '';

-import { LiveRoomItemBean } from 'wdBean/Index'
+import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
 import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
 import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
@@ -14,6 +14,7 @@ export struct TabChatComponent {
   @State private pageModel: PageModel = new PageModel()
   @State private pageModel: PageModel = new PageModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
   @State liveChatList: Array<LiveRoomItemBean> = []
   @State liveChatList: Array<LiveRoomItemBean> = []
+  @Consume liveDetailsBean: LiveDetailsBean
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.getLiveChatList()
     this.getLiveChatList()
@@ -77,7 +78,11 @@ export struct TabChatComponent {
 
 
   getLiveChatList() {
   getLiveChatList() {
     this.pageModel.currentPage = 1
     this.pageModel.currentPage = 1
-    this.liveViewModel.getLiveChatList(1, '20000016257', '20000016229', 20,)
+    this.liveViewModel.getLiveChatList(
+      1,
+      this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
+      this.liveDetailsBean?.newsId,
+      20,)
       .then(
       .then(
         (data) => {
         (data) => {
           if (data.barrageResponses && data.barrageResponses.length > 0) {
           if (data.barrageResponses && data.barrageResponses.length > 0) {

@@ -19,6 +19,7 @@ export struct TabInfoComponent {
       right: 16
       right: 16
     })
     })
     .height('100%')
     .height('100%')
+    .alignItems(HorizontalAlign.Start)
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {

@@ -39,7 +39,11 @@ export struct TabLiveComponent {
   }
   }
 
 
   getLiveList() {
   getLiveList() {
-    this.liveViewModel.getLiveList(1, '20000016257', '20000016229', 20,)
+    this.liveViewModel.getLiveList(
+      1,
+      this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
+      this.liveDetailsBean?.newsId,
+      20)
       .then(
       .then(
         (data) => {
         (data) => {
           /**
           /**

@@ -75,6 +75,8 @@ export struct TabLiveItemComponent {
           left: 32,
           left: 32,
           top: 6
           top: 6
         })
         })
+        .width('100%')
+        .textAlign(TextAlign.Start)
       List() {
       List() {
         ForEach(this.item.pictureUrls, (item: string, index: number) => {
         ForEach(this.item.pictureUrls, (item: string, index: number) => {
           ListItem() {
           ListItem() {

 import { window } from '@kit.ArkUI'
 import { window } from '@kit.ArkUI'
-import { DateTimeUtils, NumberFormatterUtils, WindowModel } from 'wdKit/Index'
+import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
 
 
 import { devicePLSensorManager } from 'wdDetailPlayApi/Index'
 import { devicePLSensorManager } from 'wdDetailPlayApi/Index'
+import { DateFormatUtil, WDPlayerController } from 'wdPlayer/Index'
 import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
-import { WDPlayerController } from 'wdPlayer/Index'
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -23,8 +23,8 @@ export struct PlayUIComponent {
   aboutToAppear(): void {
   aboutToAppear(): void {
     //播放进度监听
     //播放进度监听
     this.playerController.onTimeUpdate = (position: number, duration: number) => {
     this.playerController.onTimeUpdate = (position: number, duration: number) => {
-      this.currentTime = DateTimeUtils.secondToTime(position);
-      this.totalTime = DateTimeUtils.secondToTime(duration);
+      this.currentTime = DateFormatUtil.secondToTime(Math.floor(position / 1000));
+      this.totalTime = DateFormatUtil.secondToTime(Math.floor(duration / 1000));
       this.progressVal = Math.floor(position * 100 / duration);
       this.progressVal = Math.floor(position * 100 / duration);
     }
     }
   }
   }
@@ -67,13 +67,13 @@ export struct PlayUIComponent {
       .width('100%')
       .width('100%')
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .margin({
       .margin({
-        bottom: 5
+        bottom: 10
       })
       })
 
 
       this.getLiveStatusView()
       this.getLiveStatusView()
     }.width('100%')
     }.width('100%')
     .padding({
     .padding({
-      top: 10,
+      top: 20,
       bottom: 6,
       bottom: 6,
       left: 10,
       left: 10,
       right: 10
       right: 10
@@ -84,9 +84,35 @@ export struct PlayUIComponent {
 
 
   @Builder
   @Builder
   getLiveStatusView() {
   getLiveStatusView() {
-    //预约
-    //直播中
+    // 直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
+    // 预约
+    // 直播中
+    if (this.liveDetailsBean.liveInfo?.liveState == 'running') {
+      Row() {
+        Image($r('app.media.icon_live_status_running'))
+          .width(22)
+          .height(18)
+        Text('直播中')
+          .fontSize('11fp')
+          .fontWeight(400)
+          .fontColor(Color.White)
+        Image($r('app.media.icon_live_player_status_end'))
+          .width(12)
+          .height(12)
+        Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
+          .fontSize('11fp')
+          .fontWeight(400)
+          .fontColor(Color.White)
+      }
+      .backgroundColor('#4D000000')
+      .padding({
+        top: 1,
+        right: 4,
+        bottom: 1
+      })
+    }
     //回看
     //回看
+    else if (this.liveDetailsBean.liveInfo?.liveState == 'end') {
       Row() {
       Row() {
         Text('回看')
         Text('回看')
           .fontSize('11fp')
           .fontSize('11fp')
@@ -108,6 +134,7 @@ export struct PlayUIComponent {
         bottom: 1
         bottom: 1
       })
       })
     }
     }
+  }
 
 
   @Builder
   @Builder
   getMiddleUIComponent() {
   getMiddleUIComponent() {
@@ -122,6 +149,7 @@ export struct PlayUIComponent {
   @Builder
   @Builder
   getBottomUIComponent() {
   getBottomUIComponent() {
     Row() {
     Row() {
+      if (this.liveDetailsBean?.liveInfo?.liveState == 'end') {
         this.playOrPauseBtn()
         this.playOrPauseBtn()
         Text(this.currentTime)
         Text(this.currentTime)
           .fontColor(Color.White)
           .fontColor(Color.White)
@@ -140,6 +168,9 @@ export struct PlayUIComponent {
           .margin({
           .margin({
             right: 16
             right: 16
           })
           })
+      } else {
+        Blank()
+      }
       Image($r('app.media.icon_live_player_full_screen'))
       Image($r('app.media.icon_live_player_full_screen'))
         .width(24)
         .width(24)
         .height(24)
         .height(24)
@@ -183,16 +214,19 @@ export struct PlayUIComponent {
     Slider({
     Slider({
       value: this.progressVal,
       value: this.progressVal,
       step: 1,
       step: 1,
-      // style: SliderStyle.OutSet
-    })
-      .blockStyle({
-        type: SliderBlockType.IMAGE,
-        image: $r('app.media.ic_player_block')
+      style: SliderStyle.OutSet
     })
     })
+      .blockSize({
+        width: 18,
+        height: 12
+      })// .blockStyle({
+        //   type: SliderBlockType.IMAGE,
+        //   image: $r('app.media.ic_player_block')
+        // })
       .blockColor(Color.White)
       .blockColor(Color.White)
       .trackColor('#4DFFFFFF')
       .trackColor('#4DFFFFFF')
       .selectedColor('#FFED2800')
       .selectedColor('#FFED2800')
-      .height(2)
+      .height(14)
       .trackThickness(1)
       .trackThickness(1)
       .layoutWeight(1)
       .layoutWeight(1)
       .margin({
       .margin({

@@ -14,8 +14,14 @@ export struct TopPlayComponent {
   }
   }
 
 
   updateData() {
   updateData() {
+    //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
     if (this.liveDetailsBean.liveInfo && this.liveDetailsBean.liveInfo.vlive.length > 0) {
     if (this.liveDetailsBean.liveInfo && this.liveDetailsBean.liveInfo.vlive.length > 0) {
-      let playUrl: string = this.liveDetailsBean.liveInfo.vlive[0].replayUri
+      let playUrl = ''
+      if (this.liveDetailsBean.liveInfo.liveState == 'running') {
+        playUrl = this.liveDetailsBean.liveInfo.vlive[0].liveUrl
+      } else if (this.liveDetailsBean.liveInfo.liveState == 'end') {
+        playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
+      }
       this.playerController.firstPlay(playUrl);
       this.playerController.firstPlay(playUrl);
     }
     }
   }
   }