修复视频频道状态栏颜色

zhenghy
Commit 89d544601429c5e08c974edb82f010818489e2bb 89d54460 1 parent db520167
Showing 2 changed files with 51 additions and 48 deletions
sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponent.ets
sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/VideoChannelDetail.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponent.ets
View file @89d5446
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponent.ets
View file @89d5446
@@ -59,7 +59,6 @@ export struct TopNavigationComponent {
   @State autoRefresh2Page: number = 0
   // 当前底导index
   @State navIndex: number = 0
-
   @State animationDuration: number = 0
   @State indicatorLeftMargin: number = 0
   @State indicatorWidth: number = 0
@@ -93,7 +92,8 @@ export struct TopNavigationComponent {
     //defaultMyChannelList
     defaultList.forEach(item => {
-      if (item.defaultPermitted === 1 || item.movePermitted === 0 || item.delPermitted === 0 || item.headlinesOn === 1) {
+      if (item.defaultPermitted === 1 || item.movePermitted === 0 || item.delPermitted === 0 ||
+        item.headlinesOn === 1) {
         defaultMyChannelList.push(item);
       }
       if (item.defaultPermitted === 1) {
@@ -169,7 +169,6 @@ export struct TopNavigationComponent {
     return item.name === '版面'
   }
-
   build() {
     Column() {
       // 顶部搜索、日报logo、早晚报
@@ -216,51 +215,53 @@ export struct TopNavigationComponent {
       // 频道分类list
       Stack({ alignContent: Alignment.TopEnd }) {
         Tabs({ index: this.currentTopNavSelectedIndex, controller: this.tabsController }) {
-          ForEach(this.currentBottomNavName === '新闻' ? this.myChannelList : this.topNavList, (navItem: TopNavDTO, index: number) => {
-            TabContent() {
-              if (this.currentBottomNavName === '视频' && navItem.name === '视频') {
-                VideoChannelDetail({
-                  bottomNavIndex: $_currentNavIndex,
-                  topNavIndex: $currentTopNavSelectedIndex,
-                  groupId: this.groupId + '',
-                  pageId: navItem.pageId + '',
-                  channelId: navItem.channelId + '',
-                })
-              }
-              else if (this.currentBottomNavName === '人民号' && navItem.name === '关注') {
-                PeopleShipMainComponent({
-                  currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
-                  navIndex: index,
-                  pageId: navItem.pageId + '',
-                  channelId: navItem.channelId + '',
-                })
-              }
-              else
-                if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
-                  PageComponent({
+          ForEach(this.currentBottomNavName === '新闻' ? this.myChannelList : this.topNavList,
+            (navItem: TopNavDTO, index: number) => {
+              TabContent() {
+                if (this.currentBottomNavName === '视频' && navItem.name === '视频') {
+                  VideoChannelDetail({
+                    bottomNavIndex: $_currentNavIndex,
+                    topNavIndex: $currentTopNavSelectedIndex,
+                    groupId: this.groupId + '',
+                    pageId: navItem.pageId + '',
+                    channelId: navItem.channelId + '',
+                  })
+                } else if (this.currentBottomNavName === '人民号' && navItem.name === '关注') {
+                  PeopleShipMainComponent({
                     currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                     navIndex: index,
                     pageId: navItem.pageId + '',
                     channelId: navItem.channelId + '',
-                    autoRefresh: this.autoRefresh2Page
                   })
-                }
-            }
-            .tabBar(this.tabBarBuilder(navItem, index))
+                } else
+                  if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
+                    PageComponent({
+                      currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
+                      navIndex: index,
+                      pageId: navItem.pageId + '',
+                      channelId: navItem.channelId + '',
+                      autoRefresh: this.autoRefresh2Page
+                    })
+                  }
+              }
+              .tabBar(this.tabBarBuilder(navItem, index))
-          }, (navItem: TopNavDTO) => JSON.stringify(navItem));
+            }, (navItem: TopNavDTO) => JSON.stringify(navItem));
         }
         .barHeight($r('app.float.top_tab_bar_height'))
         .barMode(BarMode.Scrollable)
         .vertical(false)
         .barBackgroundColor(this.barBackgroundColor)
-        .onAreaChange((oldValue: Area,newValue: Area)=> {
+        .backgroundColor(this.barBackgroundColor)
+        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+        .onAreaChange((oldValue: Area, newValue: Area) => {
           let width = Number.parseFloat(newValue.width.toString())
           this.tabsWidth = Number.isNaN(width) ? 0 : width
         })
         .animationDuration(this.animationDuration)
         .onChange((index: number) => {
-          this.currentTopNavName = this._currentNavIndex === 0 ? this.myChannelList[index].name : this.topNavList[index].name
+          this.currentTopNavName =
+            this._currentNavIndex === 0 ? this.myChannelList[index].name : this.topNavList[index].name
           Logger.info(TAG, `onChange index : ${index}`);
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
@@ -288,27 +289,27 @@ export struct TopNavigationComponent {
           let targetIndexInfo = this.getTextInfo(targetIndex)
           this.startAnimateTo(this.animationDuration, targetIndexInfo.left, targetIndexInfo.width)
         })
-        .onAnimationEnd((index: number,event: TabsAnimationEvent) => {
+        .onAnimationEnd((index: number, event: TabsAnimationEvent) => {
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
           ) {
             return
           }
-            // 切换动画结束时触发该回调。下划线动画停止。
-            let currentIndicatorInfo = this.getCurrentIndicatorInfo(index,event)
-            this.startAnimateTo(0,currentIndicatorInfo.left,currentIndicatorInfo.width)
+          // 切换动画结束时触发该回调。下划线动画停止。
+          let currentIndicatorInfo = this.getCurrentIndicatorInfo(index, event)
+          this.startAnimateTo(0, currentIndicatorInfo.left, currentIndicatorInfo.width)
         })
-        .onGestureSwipe((index: number,event: TabsAnimationEvent) => {
+        .onGestureSwipe((index: number, event: TabsAnimationEvent) => {
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
           ) {
             return
           }
-            // 在页面跟手滑动过程中，逐帧触发该回调。
-            let currentIndicatorInfo = this.getCurrentIndicatorInfo(index,event)
-            this.currentTopNavSelectedIndex = currentIndicatorInfo.index
-            this.indicatorLeftMargin = currentIndicatorInfo.left
-            this.indicatorWidth = currentIndicatorInfo.width
+          // 在页面跟手滑动过程中，逐帧触发该回调。
+          let currentIndicatorInfo = this.getCurrentIndicatorInfo(index, event)
+          this.currentTopNavSelectedIndex = currentIndicatorInfo.index
+          this.indicatorLeftMargin = currentIndicatorInfo.left
+          this.indicatorWidth = currentIndicatorInfo.width
         })
         // 分类列表最右侧频道设置
@@ -351,8 +352,9 @@ export struct TopNavigationComponent {
         .padding({ top: $r('app.float.top_tab_item_padding_top'), bottom: $r('app.float.top_tab_item_padding_bottom') })
         .maxLines(this.MAX_LINE)
         .id(index.toString())
-        .onAreaChange((oldValue: Area,newValue: Area) => {
-          if (this.currentTopNavSelectedIndex === index && (this.indicatorLeftMargin === 0 || this.indicatorWidth === 0)){
+        .onAreaChange((oldValue: Area, newValue: Area) => {
+          if (this.currentTopNavSelectedIndex === index &&
+            (this.indicatorLeftMargin === 0 || this.indicatorWidth === 0)) {
             if (newValue.position.x != undefined) {
               let positionX = Number.parseFloat(newValue.position.x.toString())
               this.indicatorLeftMargin = Number.isNaN(positionX) ? 0 : positionX
@@ -396,7 +398,8 @@ export struct TopNavigationComponent {
   }
   onTopNavigationDataUpdated() {
-    Logger.info(TAG, `onTopNavigationDataUpdated currentTopNavIndex: ${this.currentTopNavSelectedIndex},topNavList.length:${this.topNavList.length}`);
+    Logger.info(TAG,
+      `onTopNavigationDataUpdated currentTopNavIndex: ${this.currentTopNavSelectedIndex},topNavList.length:${this.topNavList.length}`);
   }
   onAutoRefresh() {
@@ -505,7 +508,7 @@ export struct TopNavigationComponent {
     let indexInfo = this.getTextInfo(index)
     let nextIndexInfo = this.getTextInfo(nextIndex)
     let swipeRatio = Math.abs(event.currentOffset / this.tabsWidth)
-    let currentIndex = swipeRatio > 0.5 ? nextIndex : index  // 页面滑动超过一半，tabBar切换到下一页。
+    let currentIndex = swipeRatio > 0.5 ? nextIndex : index // 页面滑动超过一半，tabBar切换到下一页。
     let currentLeft = indexInfo.left + (nextIndexInfo.left - indexInfo.left) * swipeRatio
     let currentWidth = indexInfo.width + (nextIndexInfo.width - indexInfo.width) * swipeRatio
     return { 'index': currentIndex, 'left': currentLeft, 'width': currentWidth }
--- a/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/VideoChannelDetail.ets
View file @89d5446
+++ b/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/VideoChannelDetail.ets
View file @89d5446
@@ -101,7 +101,7 @@ export struct VideoChannelDetail {
   openFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({
       statusBarContentColor: '#ffffff',
-      statusBarColor: '#000000',
+      // statusBarColor: '#000000',
       // navigationBarColor: '#000000',
       // navigationBarContentColor: '#ffffff'
     })
@@ -116,7 +116,7 @@ export struct VideoChannelDetail {
   closeFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({
       statusBarContentColor: '#000000',
-      statusBarColor: '#ffffff',
+      // statusBarColor: '#ffffff',
       // navigationBarColor: '#0x66000000',
       // navigationBarContentColor: '#0xE5FFFFFF'