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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 20352 【UI】新闻频道，顶部频道区域，右侧缺少渐隐效果
  fix: lottie版本回退到"v2.0.11-rc.6"解决沉浸式视频引导动画问题

@@ -299,19 +299,27 @@ export struct TopNavigationComponentNew {
         })
         })
         .grayscale(this.GrayManage.get().isMourning() ? 1 : 0)
         .grayscale(this.GrayManage.get().isMourning() ? 1 : 0)
 
 
+      Stack({alignContent: Alignment.Start}){
         List({ scroller: this.listScroller }) {
         List({ scroller: this.listScroller }) {
           ForEach(this.myChannelList, (navItem: TopNavDTO, index: number) => {
           ForEach(this.myChannelList, (navItem: TopNavDTO, index: number) => {
             ListItem() {
             ListItem() {
               this.tabBarBuilder(navItem, index)
               this.tabBarBuilder(navItem, index)
-          }
+            }.blendMode(BlendMode.SRC_IN, BlendApplyType.OFFSCREEN)
             .grayscale(this.GrayManage.get().isNewsMourning(`${navItem.channelId}`) ? 1 : 0)
             .grayscale(this.GrayManage.get().isNewsMourning(`${navItem.channelId}`) ? 1 : 0)
           })
           })
         }
         }
         .listDirection(Axis.Horizontal)
         .listDirection(Axis.Horizontal)
+        .linearGradient({
+          angle: 90,
+          colors: [[0x01000000, 0.0], [0xff000000, 0.05], [0xff000000, 0.95], [0x01000000, 1.0]]
+        })
+        .blendMode(BlendMode.SRC_OVER, BlendApplyType.OFFSCREEN)
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
-      .padding({ left: 8, top: 0, right: 0 })
+        .constraintSize({ maxWidth: '100%' })
         .height($r('app.float.top_tab_bar_height'))
         .height($r('app.float.top_tab_bar_height'))
+      }
+      .padding({ left: 8, top: 0, right: 0 })
       .id('tabList')
       .id('tabList')
       .alignRules({
       .alignRules({
         'top': { 'anchor': 'topBar', 'align': VerticalAlign.Bottom },
         'top': { 'anchor': 'topBar', 'align': VerticalAlign.Bottom },

@@ -304,7 +304,7 @@ export struct DetailPlayShortVideoPage {
   }
   }
 
 
   showCommentListChanged() {
   showCommentListChanged() {
-    console.log('DetailVideoListPage showCommentListChanged this.showCommentList', this.showCommentList)
+    // console.log('DetailVideoListPage showCommentListChanged this.showCommentList', this.showCommentList)
     if (this.showCommentList) {
     if (this.showCommentList) {
       this.playerWidth = px2vp(this.windowWidth)
       this.playerWidth = px2vp(this.windowWidth)
       // this.playerHeight = px2vp(this.windowWidth) / (16 / 9.0)
       // this.playerHeight = px2vp(this.windowWidth) / (16 / 9.0)

@@ -11,7 +11,7 @@
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
     "@ohos/pulltorefresh": "^2.0.6-rc.0",
     "@ohos/pulltorefresh": "^2.0.6-rc.0",
-    "@ohos/lottie": "^v2.0.13",
+    "@ohos/lottie": "v2.0.11-rc.6",
     "@ohos/imageknife": "^2.1.2",
     "@ohos/imageknife": "^2.1.2",
   },
   },
   "dynamicDependencies": {}
   "dynamicDependencies": {}