Merge remote-tracking branch 'origin/main'

@@ -7,13 +7,12 @@ const TAG = 'LiveEmptyComponent';
  * WDViewDefaultType 缺省页
  * WDViewDefaultType 缺省页
  */
  */
 export const enum WDViewDefaultType {
 export const enum WDViewDefaultType {
-  /// 1.默认
+   /// 1.默认
   WDViewDefaultType_Default,
   WDViewDefaultType_Default,
   /// 16.直播结束
   /// 16.直播结束
   WDViewDefaultType_NoLiveEnd,
   WDViewDefaultType_NoLiveEnd,
   /// 17.直播暂停
   /// 17.直播暂停
   WDViewDefaultType_NoLiveSuspend,
   WDViewDefaultType_NoLiveSuspend,
-
 }
 }
 
 
 /**
 /**
@@ -21,11 +20,13 @@ export const enum WDViewDefaultType {
  */
  */
 @Preview
 @Preview
 @Component
 @Component
-export struct LiveEmptyComponent {
+export struct EmptyComponent {
   // 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 = WDViewDefaultType.WDViewDefaultType_Default; // 缺省图类型，传枚举
+  @State emptyButton: boolean = false
+  @State timeNum: number = 10
   /**
   /**
    * The empty image width percentage setting.
    * The empty image width percentage setting.
    */
    */
@@ -42,6 +43,42 @@ export struct LiveEmptyComponent {
    * The empty data text opacity.
    * The empty data text opacity.
    */
    */
   readonly TEXT_OPACITY: number = 0.4;
   readonly TEXT_OPACITY: number = 0.4;
+  private timer: number = -1
+  retry: () => void = () => {
+  }
+
+  createTimer() {
+    if (this.emptyType === 8) {
+      this.timer = setInterval(() => {
+        this.timeNum--;
+        if (this.timeNum === 0) {
+          clearInterval(this.timer);
+        }
+      }, 1000);
+    }
+  }
+
+  destroyTimer() {
+    if (this.emptyType === 8) {
+      clearInterval(this.timer);
+    }
+  }
+
+  onPageShow(): void {
+    this.createTimer()
+  }
+
+  aboutToAppear(): void {
+    this.createTimer()
+  }
+
+  onPageHide(): void {
+    this.destroyTimer()
+  }
+
+  aboutToDisappear() {
+    this.destroyTimer()
+  }
 
 
   build() {
   build() {
     this.noProgrammeData();
     this.noProgrammeData();
@@ -54,24 +91,64 @@ export struct LiveEmptyComponent {
   noProgrammeData() {
   noProgrammeData() {
     Column() {
     Column() {
       Image(this.buildNoDataTipImage())
       Image(this.buildNoDataTipImage())
-        .width('this.EMPTY_IMAGE_WIDTH')
-        .height(this.EMPTY_IMAGE_HEIGHT)
+        .width(160)
+        .height(112)
         .objectFit(ImageFit.Contain)
         .objectFit(ImageFit.Contain)
       // .border({ width: 1, color: Color.Red, radius: 6 })
       // .border({ width: 1, color: Color.Red, radius: 6 })
+      // .width('this.EMPTY_IMAGE_WIDTH')
+      // .height(this.EMPTY_IMAGE_HEIGHT)
 
 
-      Text(this.buildNoDataTip())
-        .fontSize($r('app.float.normal_text_size'))
-        .fontColor('#000000')
+      Text(this.emptyType !== 8 ? this.buildNoDataTip() : `${this.buildNoDataTip()}(${this.timeNum}s)`)
+        .fontSize($r('app.float.font_size_14'))
+        .fontColor('#FF999999')
         .fontWeight(FontWeight.Normal)
         .fontWeight(FontWeight.Normal)
         .opacity(this.TEXT_OPACITY)
         .opacity(this.TEXT_OPACITY)
         .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
         .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
           Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
         })
         })
+
+      if (this.isShowButton()) {
+        if (this.emptyType !== 15) {
+          Button('点击重试')
+            .type(ButtonType.Normal)
+            .width(80)
+            .height(28)
+            .backgroundColor('#fffffff')
+            .fontColor('#FF666666')
+            .border({ width: 1 })
+            .borderColor('#FFEDEDED')
+            .borderRadius(4)
+            .fontSize($r('app.float.font_size_12'))
+            .margin({ top: 16 })
+            .padding(0)
+            .onClick(() => {
+              this.retry()
+            })
+        } else {
+          Button('点击重试')
+            .type(ButtonType.Normal)
+            .width(80)
+            .height(28)
+            .backgroundColor(Color.Black)
+            .fontColor('#FFCCCCCC')
+            .border({ width: 1 })
+            .borderColor('#4DFFFFFF')
+            .borderRadius(4)
+            .fontSize($r('app.float.font_size_12'))
+            .margin({ top: 16 })
+            .padding(0)
+            .onClick(() => {
+              this.retry()
+            })
+        }
+      }
     }
     }
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .width(this.emptyWidth)
     .width(this.emptyWidth)
     .height(this.emptyHeight)
     .height(this.emptyHeight)
+
+    // .backgroundColor(Color.Black)
   }
   }
 
 
   buildNoDataTip(): string {
   buildNoDataTip(): string {
@@ -84,15 +161,22 @@ export struct LiveEmptyComponent {
     }
     }
     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 === WDViewDefaultType.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 === WDViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
       imageString = $r('app.media.icon_no_liver')
       imageString = $r('app.media.icon_no_liver')
     }
     }
     return imageString
     return imageString
   }
   }
-}
+
+  isShowButton() {
+    if (this.emptyType === 1 || this.emptyType === 9 || this.emptyType === 15) {
+      return true
+    } else {
+      return false
+    }
+  }
+}