视频频道页改成沉浸式

@@ -77,32 +77,30 @@ export struct BottomNavigationComponent {
     Tabs({ barPosition: BarPosition.End, index: this.currentNavIndex, controller: this.navController }) {
     Tabs({ barPosition: BarPosition.End, index: this.currentNavIndex, controller: this.navController }) {
       ForEach(this.bottomNavList, (navItem: BottomNavDTO, index: number) => {
       ForEach(this.bottomNavList, (navItem: BottomNavDTO, index: number) => {
         TabContent() {
         TabContent() {
-          Column() {
-            if (CompUtils.isMine(navItem)) {
-              // 我的页面组件数据列表
-              MinePageComponent()
-            } else if (navItem.name === '视频') {
-              // 视频频道，包含视频和直播
-              VideoChannelPage({
-                topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
-                _currentNavIndex: $currentNavIndex,
-              })
-            } else {
-              TopNavigationComponent({
-                groupId: navItem.id,
-                topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
-                _currentNavIndex: $currentNavIndex,
-                navIndex: index,
-                currentBottomNavName: navItem.name,
-                assignChannel: this.assignChannel,
-                autoRefresh: this.autoRefresh
-              })
-            }
-
+          if (CompUtils.isMine(navItem)) {
+            // 我的页面组件数据列表
+            MinePageComponent()
+          } else if (navItem.name === '视频') {
+            // 视频频道，包含视频和直播
+            VideoChannelPage({
+              topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
+              _currentNavIndex: $currentNavIndex,
+            })
+          } else {
+            TopNavigationComponent({
+              groupId: navItem.id,
+              topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
+              _currentNavIndex: $currentNavIndex,
+              navIndex: index,
+              currentBottomNavName: navItem.name,
+              assignChannel: this.assignChannel,
+              autoRefresh: this.autoRefresh
+            })
           }
           }
         }
         }
         .tabBar(this.tabBarBuilder(navItem, index))
         .tabBar(this.tabBarBuilder(navItem, index))
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+
+        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
       });
       });
 
 
     }
     }
@@ -113,7 +111,7 @@ export struct BottomNavigationComponent {
     .barBackgroundColor(this.barBackgroundColor)
     .barBackgroundColor(this.barBackgroundColor)
     // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
     // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
     .backgroundColor(this.barBackgroundColor)
     .backgroundColor(this.barBackgroundColor)
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+    .expandSafeArea([SafeAreaType.SYSTEM])
 
 
     // .padding({ bottom: this.bottomRectHeight + 'px', top: this.topRectHeight + 'px' }) // 此处margin具体数值在实际中应与导航条区域高度保持一致
     // .padding({ bottom: this.bottomRectHeight + 'px', top: this.topRectHeight + 'px' }) // 此处margin具体数值在实际中应与导航条区域高度保持一致
 
 

@@ -61,6 +61,7 @@ export struct VideoChannelPage {
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
     .align(Alignment.Top)
     .align(Alignment.Top)
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
   }
   }
 
 
   @Builder
   @Builder
@@ -133,6 +134,7 @@ export struct VideoChannelPage {
     .cachedCount(3)
     .cachedCount(3)
     .displayCount(1, true)
     .displayCount(1, true)
     .alignSelf(ItemAlign.Start)
     .alignSelf(ItemAlign.Start)
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
     .onChange((index: number) => {
     .onChange((index: number) => {
       this.currentTopNavSelectedIndex = index
       this.currentTopNavSelectedIndex = index
     })
     })