Merge remote-tracking branch 'origin/main'

@@ -292,12 +292,15 @@ export struct DetailPlayShortVideoPage {
   playerCoverBuilder() {
   playerCoverBuilder() {
     // 问题：画面会闪一下
     // 问题：画面会闪一下
     Image(this.contentDetailData?.firstFrameImageUri)
     Image(this.contentDetailData?.firstFrameImageUri)
-      .width('100%')
-      .height(this.windowWidth / this.ratio + 'px')
-      .opacity(this.imageVisible ? 0.8 : 0)
-      .animation({
-        duration: 350, curve: Curve.EaseInOut
-      })
+      .width(this.playerWidth)
+      .height(this.playerHeight)// .opacity(this.imageVisible ? 0.7 : 0)
+        // .animation({
+        //   // duration: 350,
+        //   curve: Curve.EaseInOut,
+        //   expectedFrameRateRange: { min: 30, max: 120, expected: 60 }
+        // })
+      .visibility(this.imageVisible ? Visibility.Visible : Visibility.None)
+
   }
   }
 
 
   @Builder
   @Builder

@@ -30,7 +30,6 @@ export struct VideoChannelPage {
   @State indicatorWidth: number = 0
   @State indicatorWidth: number = 0
   // 传递给page的自动刷新通知
   // 传递给page的自动刷新通知
   @State autoRefresh2Page: number = 0
   @State autoRefresh2Page: number = 0
-
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.setBarBackgroundColor()
     this.setBarBackgroundColor()
     console.log(TAG, 'aboutToAppear')
     console.log(TAG, 'aboutToAppear')
@@ -131,14 +130,14 @@ export struct VideoChannelPage {
       .onClick(() => {
       .onClick(() => {
         TrackingButton.searchClick(TrackConstants.PageName.Search, "VIDEOS")
         TrackingButton.searchClick(TrackConstants.PageName.Search, "VIDEOS")
         let params = { 'tabName': "VIDEOS" } as Record<string, string>
         let params = { 'tabName': "VIDEOS" } as Record<string, string>
-        WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params)
+        WDRouterRule.jumpWithPage(WDRouterPage.searchPage, params)
       })
       })
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)
 
 
     }
     }
     .zIndex(20)
     .zIndex(20)
     .height($r('app.float.top_tab_bar_height_common'))
     .height($r('app.float.top_tab_bar_height_common'))
-    .margin({top:10})
+    .margin({ top: 10 })
     .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
     .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
 
 
   }
   }
@@ -170,10 +169,12 @@ export struct VideoChannelPage {
       }, (item: TopNavDTO) => item.channelId + '')
       }, (item: TopNavDTO) => item.channelId + '')
     }
     }
     .indicator(false)
     .indicator(false)
+    .disableSwipe(true)
     .loop(false)
     .loop(false)
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
     .cachedCount(-1)
     .cachedCount(-1)
+    .disableSwipe(this.displayDirection === DisplayDirection.VERTICAL ? false : true)
     .displayCount(1, true)
     .displayCount(1, true)
     .alignSelf(ItemAlign.Start)
     .alignSelf(ItemAlign.Start)
     .effectMode(EdgeEffect.None)
     .effectMode(EdgeEffect.None)