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

@@ -29,7 +29,9 @@ export struct WdWebLocalComponent {
   @State sliderStartTime: string = '';
   @State sliderStartTime: string = '';
   @State currentTime: number = 0;
   @State currentTime: number = 0;
   @State durationTime: number = 0;
   @State durationTime: number = 0;
+  @State progressOpacity: number = 1
   @State durationStringTime: string = '';
   @State durationStringTime: string = '';
+  private progressTimerNumber: number = 0
   @State isPause: boolean = true;
   @State isPause: boolean = true;
   controller: VideoController = new VideoController()
   controller: VideoController = new VideoController()
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
@@ -172,7 +174,7 @@ export struct WdWebLocalComponent {
       this.positionLeft = Number(data?.data?.positionLeft) || 0
       this.positionLeft = Number(data?.data?.positionLeft) || 0
       this.positionTop = Number(data?.data?.positionTop) || 0
       this.positionTop = Number(data?.data?.positionTop) || 0
       this.videoLandscape = data?.data?.videoLandscape || '1'
       this.videoLandscape = data?.data?.videoLandscape || '1'
-      this.controller.start()
+      this.startPlay()
     }
     }
   }
   }
   /**
   /**
@@ -206,6 +208,26 @@ export struct WdWebLocalComponent {
     }
     }
   }
   }
 
 
+  startPlay() {
+    this.cancelProgressTimer()
+    this.controller.start()
+    this.startProgressTimer()
+  }
+
+  startProgressTimer() {
+    this.progressTimerNumber = setTimeout(() => {
+      animateTo({duration: 1000}, () => {
+        this.progressOpacity = 0
+      })
+    }, 3000)
+  }
+  cancelProgressTimer() {
+    if (this.progressTimerNumber > 0) {
+      clearTimeout(this.progressTimerNumber)
+      this.progressTimerNumber = 0
+    }
+  }
+
   @Builder
   @Builder
   videoComp(){
   videoComp(){
     Video({
     Video({
@@ -221,6 +243,7 @@ export struct WdWebLocalComponent {
       .objectFit(ImageFit.Contain)
       .objectFit(ImageFit.Contain)
       .onFinish(()=>{
       .onFinish(()=>{
         this.isEndPlay = true
         this.isEndPlay = true
+        this.currentTime = 0
       })
       })
       .onStart(() => {
       .onStart(() => {
         this.isPause = false
         this.isPause = false
@@ -248,13 +271,23 @@ export struct WdWebLocalComponent {
           WindowModel.shared.setPreferredOrientation(window.Orientation.PORTRAIT)
           WindowModel.shared.setPreferredOrientation(window.Orientation.PORTRAIT)
         }
         }
       })
       })
+      .onClick(() => {
+        animateTo({duration: 1000}, () => {
+          if (this.progressOpacity <= 0) {
+            this.progressOpacity = 1
+          } else {
+            this.progressOpacity = 0
+          }
+        })
+      })
 
 
     if (this.isEndPlay){
     if (this.isEndPlay){
       Column(){
       Column(){
         Image($r('app.media.icon_replay')).width(40).height(40)
         Image($r('app.media.icon_replay')).width(40).height(40)
           .onClick(() => {
           .onClick(() => {
             this.isEndPlay = false
             this.isEndPlay = false
-            this.controller.start()
+            this.progressOpacity = 1
+            this.startPlay()
           })
           })
 
 
         Text('重播').fontColor(Color.White).fontSize(14)
         Text('重播').fontColor(Color.White).fontSize(14)
@@ -271,9 +304,10 @@ export struct WdWebLocalComponent {
           .height(24)
           .height(24)
           .onClick(() => {
           .onClick(() => {
             if (this.isPause) {
             if (this.isPause) {
-              this.controller.start()
+              this.startPlay()
             } else {
             } else {
               this.controller.pause()
               this.controller.pause()
+              this.cancelProgressTimer()
             }
             }
           })
           })
         Row() {
         Row() {
@@ -298,6 +332,13 @@ export struct WdWebLocalComponent {
             .blockSize({ width: 18, height: 12 })
             .blockSize({ width: 18, height: 12 })
             .onChange((value: number, mode: SliderChangeMode) => {
             .onChange((value: number, mode: SliderChangeMode) => {
               this.controller.setCurrentTime(value);
               this.controller.setCurrentTime(value);
+              if (mode == SliderChangeMode.End) {
+                if (this.isPause) {
+                  this.startPlay()
+                } else {
+                  this.startProgressTimer()
+                }
+              }
             })
             })
           Text(DateTimeUtils.getFormattedDuration(this.durationTime * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.durationTime * 1000))
             .fontSize(12)
             .fontSize(12)
@@ -313,7 +354,11 @@ export struct WdWebLocalComponent {
         //     this.controller.requestFullscreen(true)
         //     this.controller.requestFullscreen(true)
         //   })
         //   })
       }
       }
-      .opacity(0.8)
+      .opacity(this.progressOpacity)
+      .linearGradient({
+        direction: GradientDirection.Top, // 渐变方向
+        colors: [[0x20000000, 0.0], [Color.Transparent, 1.0]] // [0x80000000, 0.5],
+      })
       .width("100%")
       .width("100%")
       .justifyContent(FlexAlign.SpaceAround)
       .justifyContent(FlexAlign.SpaceAround)
     }
     }

@@ -578,48 +578,53 @@ struct footerExpandedView {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      if (this.item.expanded) {
-        Row() {
-          Text().backgroundColor($r('app.color.color_EDEDED')).width(24).height(1)
-          if (this.item.childsHasMore) {
+      Row() {
+        if (this.item.expanded) {
+          Row() {
+            Text().backgroundColor($r('app.color.color_EDEDED')).width(24).height(1)
+            if (this.item.childsHasMore) {
+              Row() {
+                Text('查看更多回复').fontColor($r('app.color.color_222222')).fontSize(14)
+                Image($r('app.media.comment_unfold')).width(12).height(12)
+              }.margin({ left: 6 })
+              .onClick(() => {
+                if (this.item.isLoading) {
+                  return
+                }
+                this.item.isLoading = true
+                fetchChildContentCommentList(this.contentId, this.contentType, this.item)
+              })
+            }
             Row() {
             Row() {
-              Text('查看更多回复').fontColor($r('app.color.color_222222')).fontSize(14)
-              Image($r('app.media.comment_unfold')).width(12).height(12)
+              Text('收起').fontColor($r('app.color.color_222222')).fontSize(14)
+              Image($r('app.media.comment_pickUp')).width(12).height(12)
             }.margin({ left: 6 })
             }.margin({ left: 6 })
             .onClick(() => {
             .onClick(() => {
-              if (this.item.isLoading) {
-                return
-              }
-              this.item.isLoading = true
-              fetchChildContentCommentList(this.contentId, this.contentType, this.item)
+              this.item.pageNum = 1
+              this.item.expanded = false
+              this.item.childComments = []
+              this.item.childCommentsLazyDataSource.clear()
             })
             })
-          }
+          }.margin({ left: 53 })
+        } else {
           Row() {
           Row() {
-            Text('收起').fontColor($r('app.color.color_222222')).fontSize(14)
-            Image($r('app.media.comment_pickUp')).width(12).height(12)
-          }.margin({ left: 6 })
+            Text().backgroundColor($r('app.color.color_EDEDED')).width(24).height(1)
+            Text('查看更多回复').fontColor($r('app.color.color_222222')).fontSize(14).margin({ left: 6 })
+            Image($r('app.media.comment_unfold')).width(12).height(12)
+          }.margin({ left: 53 })
           .onClick(() => {
           .onClick(() => {
-            this.item.pageNum = 1
-            this.item.expanded = false
-            this.item.childComments = []
-            this.item.childCommentsLazyDataSource.clear()
+            if (this.item.isLoading) {
+              return
+            }
+            this.item.isLoading = true
+            fetchChildContentCommentList(this.contentId, this.contentType, this.item)
           })
           })
-        }.margin({ left: 53 })
-      } else {
-        Row() {
-          Text().backgroundColor($r('app.color.color_EDEDED')).width(24).height(1)
-          Text('查看更多回复').fontColor($r('app.color.color_222222')).fontSize(14).margin({ left: 6 })
-          Image($r('app.media.comment_unfold')).width(12).height(12)
-        }.margin({ left: 53 })
-        .onClick(() => {
-          if (this.item.isLoading) {
-            return
-          }
-          this.item.isLoading = true
-          fetchChildContentCommentList(this.contentId, this.contentType, this.item)
-        })
-      }
-    }.height(30)
+        }
+      }.height(20)
+      // .backgroundColor(Color.Green)
+    }.height(24)
+    .alignItems(VerticalAlign.Top)
+    // .backgroundColor(Color.Gray)
   }
   }
 }
 }