直播缺省页

@@ -4,6 +4,8 @@ export { CompUtils } from "./src/main/ets/utils/CompUtils"
 
 
 export { EmptyComponent } from "./src/main/ets/components/view/EmptyComponent"
 export { EmptyComponent } from "./src/main/ets/components/view/EmptyComponent"
 
 
+export { LiveEmptyComponent } from './src/main/ets/components/view/LiveEmptyComponent'
+
 export { ErrorComponent } from "./src/main/ets/components/view/ErrorComponent"
 export { ErrorComponent } from "./src/main/ets/components/view/ErrorComponent"
 
 
 export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponent"
 export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponent"
@@ -75,3 +77,5 @@ export { LiveCommentComponent } from "./src/main/ets/components/comment/view/Liv
 
 
 export { WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"
 export { WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"
 
 
+export { WDLiveViewDefaultType } from "./src/main/ets/components/view/LiveEmptyComponent"
+

@@ -6,8 +6,8 @@ const TAG = 'LiveEmptyComponent';
 /**
 /**
  * WDViewDefaultType 缺省页
  * WDViewDefaultType 缺省页
  */
  */
-export const enum WDViewDefaultType {
-   /// 1.默认
+export const enum WDLiveViewDefaultType {
+  /// 1.默认
   WDViewDefaultType_Default,
   WDViewDefaultType_Default,
   /// 16.直播结束
   /// 16.直播结束
   WDViewDefaultType_NoLiveEnd,
   WDViewDefaultType_NoLiveEnd,
@@ -24,7 +24,7 @@ export struct LiveEmptyComponent {
   // private emptySize: SizeOptions = {};
   // private emptySize: SizeOptions = {};
   @State emptyWidth: string | number = CommonConstants.FULL_PARENT;
   @State emptyWidth: string | number = CommonConstants.FULL_PARENT;
   @State emptyHeight: string | number = CommonConstants.FULL_PARENT;
   @State emptyHeight: string | number = CommonConstants.FULL_PARENT;
-  @State emptyType: number = WDViewDefaultType.WDViewDefaultType_Default; // 缺省图类型，传枚举
+  @State emptyType: number = WDLiveViewDefaultType.WDViewDefaultType_Default; // 缺省图类型，传枚举
   @State emptyButton: boolean = false
   @State emptyButton: boolean = false
   @State timeNum: number = 10
   @State timeNum: number = 10
   /**
   /**
@@ -154,19 +154,20 @@ export struct LiveEmptyComponent {
   buildNoDataTip(): string {
   buildNoDataTip(): string {
     Logger.info(TAG, "buildNoDataTip");
     Logger.info(TAG, "buildNoDataTip");
     let contentString: string = '暂无内容'
     let contentString: string = '暂无内容'
-    if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
+    if (this.emptyType === WDLiveViewDefaultType.WDViewDefaultType_NoLiveEnd) {
       contentString = '直播已结束' // 前方拥堵，请耐心等待
       contentString = '直播已结束' // 前方拥堵，请耐心等待
-    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
+    } else if (this.emptyType === WDLiveViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
       contentString = '主播暂时离开，马上回来' // 前方拥堵，请耐心等待
       contentString = '主播暂时离开，马上回来' // 前方拥堵，请耐心等待
     }
     }
     return contentString
     return contentString
   }
   }
+
   buildNoDataTipImage(): Resource | string {
   buildNoDataTipImage(): Resource | string {
     Logger.info(TAG, "buildNoDataTip");
     Logger.info(TAG, "buildNoDataTip");
     let imageString: Resource | string = $r('app.media.icon_no_content')
     let imageString: Resource | string = $r('app.media.icon_no_content')
-     if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
+    if (this.emptyType === WDLiveViewDefaultType.WDViewDefaultType_NoLiveEnd) {
       imageString = $r('app.media.icon_no_end')
       imageString = $r('app.media.icon_no_end')
-    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
+    } else if (this.emptyType === WDLiveViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
       imageString = $r('app.media.icon_no_liver')
       imageString = $r('app.media.icon_no_liver')
     }
     }
     return imageString
     return imageString

@@ -6,6 +6,7 @@ import { PlayerComponent } from '../widgets/vertical/PlayerComponent';
 import { PlayerInfoComponent } from '../widgets/vertical/PlayerInfoComponent';
 import { PlayerInfoComponent } from '../widgets/vertical/PlayerInfoComponent';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
+import { LiveEmptyComponent, WDLiveViewDefaultType } from 'wdComponent/Index';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 const TAG = 'DetailPlayVLivePage'
 const TAG = 'DetailPlayVLivePage'
@@ -22,6 +23,7 @@ export struct DetailPlayVLivePage {
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
   @Provide isShowControl: boolean = false
   @Provide isShowControl: boolean = false
   @Provide liveState: string = ''
   @Provide liveState: string = ''
+  @Provide playUrl: string = ''
   @Provide displayDirection: DisplayDirection = DisplayDirection.VERTICAL //横竖屏,默认竖屏
   @Provide displayDirection: DisplayDirection = DisplayDirection.VERTICAL //横竖屏,默认竖屏
   @State relId: string = ''
   @State relId: string = ''
   @State contentId: string = ''
   @State contentId: string = ''
@@ -50,30 +52,45 @@ export struct DetailPlayVLivePage {
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Stack() {
-        PlayerComponent({
-          playerController: this.playerController
-        })
-
-        PlayerInfoComponent({
-          playerController: this.playerController,
-          swiperController: this.swiperController,
-          swiperIndex: $swiperIndex
+      // 直播结束且无回看
+      if (this.liveState === 'end' || !this.playUrl) {
+        LiveEmptyComponent({
+          emptyType: WDLiveViewDefaultType.WDViewDefaultType_NoLiveEnd
         })
         })
+      } else {
+        Stack() {
+          // 直播暂停，仍然可以评论
+          if (this.liveState === 'pause') {
+            LiveEmptyComponent({
+              emptyType: WDLiveViewDefaultType.WDViewDefaultType_NoLiveSuspend
+            })
+          } else {
+            PlayerComponent({
+              playerController: this.playerController
+            })
+          }
 
 
-        Image($r('app.media.icon_live_more'))
-          .width(40)
-          .aspectRatio(1)
-          .visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
-          .animation({ duration: 500 })
-          .position({ x: '100%', y: '100%' })
-          .markAnchor({ x: 56, y: 56 })
-          .onClick(() => {
-            this.swiperController.showNext()
+          PlayerInfoComponent({
+            playerController: this.playerController,
+            swiperController: this.swiperController,
+            swiperIndex: $swiperIndex
           })
           })
+
+          Image($r('app.media.icon_live_more'))
+            .width(40)
+            .aspectRatio(1)
+            .visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
+            .animation({ duration: 500 })
+            .position({ x: '100%', y: '100%' })
+            .markAnchor({ x: 56, y: 56 })
+            .onClick(() => {
+              this.swiperController.showNext()
+            })
+        }
+        .height('100%')
+        .width('100%')
       }
       }
-      .height('100%')
-      .width('100%')
+
 
 
     }
     }
     .height('100%')
     .height('100%')
@@ -86,7 +103,10 @@ export struct DetailPlayVLivePage {
         (data) => {
         (data) => {
           if (data.length > 0) {
           if (data.length > 0) {
             this.liveDetailsBean = data[0]
             this.liveDetailsBean = data[0]
-            this.liveState = this.liveDetailsBean.liveInfo?.liveState
+            this.liveState = this.liveDetailsBean.liveInfo?.liveState //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
+            if (this.liveDetailsBean.liveInfo.liveState == 'end') {
+              this.playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
+            }
             console.log(TAG, 'getLiveDetails', JSON.stringify((this.liveDetailsBean)))
             console.log(TAG, 'getLiveDetails', JSON.stringify((this.liveDetailsBean)))
           }
           }
         },
         },