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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 横屏视频，全屏播放后返回一级频道页，底部bar被底部导航条遮挡

@@ -2,7 +2,7 @@ import { ContentDetailDTO } from 'wdBean/Index'
 import { WDShare } from 'wdShare/Index'
 import { PlayerProgressFullScreenView } from './PlayerProgressFullScreenView'
 import { PlayerConstants, WDPlayerController } from 'wdPlayer/Index'
-import { DateTimeUtils, Logger, WindowModel } from 'wdKit/Index'
+import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger, WindowModel } from 'wdKit/Index'
 import { DisplayDirection } from 'wdConstant/Index'
 import { window } from '@kit.ArkUI'
 
@@ -93,6 +93,7 @@ export struct PlayerFullScreenView {
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             window.Orientation.PORTRAIT :
             window.Orientation.LANDSCAPE)
+            EmitterUtils.sendEvent(EmitterEventId.FULL_SCREEN, 0)
           })
         Text(this.getTitle())
           .fontSize(18)

@@ -74,10 +74,8 @@ export struct BottomNavigationComponent {
     })
     EmitterUtils.receiveEvent(EmitterEventId.FULL_SCREEN, (str?: string) => {
       Logger.debug(TAG, 'receiveEvent FULL_SCREEN: ' + str)
-      if (str) {
       // 跳转指定频道场景，传参底导id、频道id
       this.isLayoutFullScreen = str == '1' ? true : false
-      }
     })
   }
 
@@ -127,7 +125,11 @@ export struct BottomNavigationComponent {
       // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
       // .backgroundColor(this.barBackgroundColor)
       .layoutWeight(1)
-      Blank().width('100%').height(this.bottomRectHeight1).backgroundColor(this.barBackgroundColor).visibility(this.isLayoutFullScreen?Visibility.None:Visibility.Visible)
+      Blank()
+        .width('100%')
+        .height(this.bottomRectHeight1)
+        .backgroundColor(this.barBackgroundColor)
+        .visibility(this.isLayoutFullScreen ? Visibility.None : Visibility.Visible)
     }.height('100%').width('100%')
   }