Merge remote-tracking branch 'origin/main'

@@ -65,16 +65,9 @@ export struct FeedBackActivity {
                 GridCol({
                 GridCol({
                 }) {
                 }) {
                   Row(){
                   Row(){
-                    Toggle({ type: ToggleType.Checkbox, isOn: feedbackTypeBean.isSelect })
-                      .onChange((select) => {
-                        feedbackTypeBean.isSelect = select
-                        this.canSubmit = this.checkSubmit()
-
-                        TrackingButton.click('submit_feedback',TrackConstants.PageName.FeedbackPage,TrackConstants.PageName.FeedbackPage,{
-                          'feedback_type':feedbackTypeBean.id+''
-                        })
-
-                      })
+                    Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))
+                      .width(17)
+                      .height(17)
                     Text(feedbackTypeBean.classifyName)
                     Text(feedbackTypeBean.classifyName)
                       .fontColor($r('app.color.color_222222'))
                       .fontColor($r('app.color.color_222222'))
                       .fontSize($r('app.float.font_size_14'))
                       .fontSize($r('app.float.font_size_14'))
@@ -84,6 +77,21 @@ export struct FeedBackActivity {
                   .height($r('app.float.vp_22'))
                   .height($r('app.float.vp_22'))
                   .margin({bottom:$r('app.float.margin_16')})
                   .margin({bottom:$r('app.float.margin_16')})
                   .backgroundColor($r('app.color.color_fff'))
                   .backgroundColor($r('app.color.color_fff'))
+                  .onClick(() => {
+                    let temp = {} as FeedbackTypeBean
+                    temp.id = feedbackTypeBean.id
+                    temp.classifyName = feedbackTypeBean.classifyName
+                    if(feedbackTypeBean.isSelect){
+                      temp.isSelect = false
+                    }else{
+                      temp.isSelect = true
+                    }
+                    this.feedbackTypeBeans[index] = temp
+                    this.canSubmit = this.checkSubmit()
+                    TrackingButton.click('submit_feedback',TrackConstants.PageName.FeedbackPage,TrackConstants.PageName.FeedbackPage,{
+                      'feedback_type':feedbackTypeBean.id+''
+                    })
+                  })
                 }
                 }
               })
               })
             }
             }

@@ -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

@@ -130,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)
 
 
   }
   }
@@ -169,6 +169,7 @@ 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%')