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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 修复视频频道页面切换横竖屏出现底部tabbar问题

@@ -318,7 +318,7 @@ export struct DetailPlayShortVideoPage {
       this.playerHeight = px2vp(height)
       this.playerHeight = px2vp(height)
       this.playerWidth = px2vp(height * this.ratio)
       this.playerWidth = px2vp(height * this.ratio)
     }
     }
-    //console.log('cj2024 calculatePlayerRect=====', width, height,px2vp(this.windowHeight),this.playerHeight)
+    // console.log('cj2024 calculatePlayerRect=====', width, height,px2vp(this.windowHeight),this.playerHeight)
 
 
   }
   }
 
 
@@ -558,7 +558,7 @@ export struct DetailPlayShortVideoPage {
       WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
       WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
       window.Orientation.PORTRAIT :
       window.Orientation.PORTRAIT :
       window.Orientation.LANDSCAPE)
       window.Orientation.LANDSCAPE)
-      if (this.displayDirection === DisplayDirection.VERTICAL) {
+      if (this.displayDirection === DisplayDirection.VERTICAL) {//0:转成竖屏，1:转成横屏
         EmitterUtils.sendEvent(EmitterEventId.FULL_SCREEN, 0)
         EmitterUtils.sendEvent(EmitterEventId.FULL_SCREEN, 0)
       } else {
       } else {
         EmitterUtils.sendEvent(EmitterEventId.FULL_SCREEN, 1)
         EmitterUtils.sendEvent(EmitterEventId.FULL_SCREEN, 1)

@@ -71,7 +71,9 @@ export struct BottomNavigationComponent {
     EmitterUtils.receiveEvent(EmitterEventId.FULL_SCREEN, (str?: string) => {
     EmitterUtils.receiveEvent(EmitterEventId.FULL_SCREEN, (str?: string) => {
       Logger.debug(TAG, 'receiveEvent FULL_SCREEN: ' + str)
       Logger.debug(TAG, 'receiveEvent FULL_SCREEN: ' + str)
       // 跳转指定频道场景，传参底导id、频道id
       // 跳转指定频道场景，传参底导id、频道id
-      this.isLayoutFullScreen = str == '1' ? true : false
+      setTimeout(()=>{
+        this.isLayoutFullScreen = str == '1' ? true : false
+      },200)
     })
     })
   }
   }
 
 
@@ -115,8 +117,7 @@ export struct BottomNavigationComponent {
       .zIndex(10)
       .zIndex(10)
       .scrollable(false)
       .scrollable(false)
       .animationDuration(0)
       .animationDuration(0)
-      .barHeight(this.displayDirection === DisplayDirection.VERTICAL ? $r('app.float.bottom_navigation_barHeight') :
-        0.001)
+      .barHeight(this.isLayoutFullScreen ? 0.001 : $r('app.float.bottom_navigation_barHeight'))
       .barMode(BarMode.Fixed)
       .barMode(BarMode.Fixed)
       .barBackgroundColor(this.barBackgroundColor)
       .barBackgroundColor(this.barBackgroundColor)
       // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
       // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
@@ -127,7 +128,7 @@ export struct BottomNavigationComponent {
         .height(this.bottomRectHeight1)
         .height(this.bottomRectHeight1)
         .backgroundColor(this.barBackgroundColor)
         .backgroundColor(this.barBackgroundColor)
         .visibility(this.isLayoutFullScreen ? Visibility.None : Visibility.Visible)
         .visibility(this.isLayoutFullScreen ? Visibility.None : Visibility.Visible)
-    }.height('100%').width('100%')
+    }.height('100%').width('100%').backgroundColor(this.barBackgroundColor)
   }
   }
 
 
   @Builder
   @Builder
@@ -152,7 +153,7 @@ export struct BottomNavigationComponent {
     .width('100%')
     .width('100%')
     .height($r('app.float.bottom_navigation_barHeight'))
     .height($r('app.float.bottom_navigation_barHeight'))
     .hoverEffect(HoverEffect.Highlight)
     .hoverEffect(HoverEffect.Highlight)
-    .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
+    .visibility(this.isLayoutFullScreen ? Visibility.Hidden : Visibility.Visible)
     // .hitTestBehavior(HitTestMode.Block)
     // .hitTestBehavior(HitTestMode.Block)
     .onClick(() => {
     .onClick(() => {
       // Logger.info(TAG, `onChange, index: ${index}`);
       // Logger.info(TAG, `onChange, index: ${index}`);