布局优化

@@ -72,68 +72,70 @@ export struct TopNavigationComponentNew {
   private tabsWidth: number = 0
   private tabsWidth: number = 0
 
 
   build() {
   build() {
-    // 频道分类list
-    RelativeContainer() {
-      this.tabBar()
-      Swiper(this.swiperController) {
-        ForEach(this.currentBottomNavName === '新闻' ? this.myChannelList : this.topNavList,
-          (navItem: TopNavDTO, index: number) => {
-            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({
+    Column() {
+      // 频道分类list
+      RelativeContainer() {
+        this.tabBar()
+        Swiper(this.swiperController) {
+          ForEach(this.currentBottomNavName === '新闻' ? this.myChannelList : this.topNavList,
+            (navItem: TopNavDTO, index: number) => {
+              if (this.currentBottomNavName === '人民号' && navItem.name === '关注') {
+                PeopleShipMainComponent({
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   navIndex: index,
                   navIndex: index,
                   pageId: navItem.pageId + '',
                   pageId: navItem.pageId + '',
                   channelId: navItem.channelId + '',
                   channelId: navItem.channelId + '',
-                  autoRefresh: this.autoRefresh2Page
                 })
                 })
-              } else {
-              channelSkeleton()
+              } else
+                if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
+                  PageComponent({
+                    currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
+                    navIndex: index,
+                    pageId: navItem.pageId + '',
+                    channelId: navItem.channelId + '',
+                    autoRefresh: this.autoRefresh2Page
+                  })
+                } else {
+                channelSkeleton()
+              }
+            })
+        }
+        .loop(false)
+        .indicator(false)
+        .effectMode(EdgeEffect.None)
+        .index(this.currentTopNavSelectedIndex)
+        .cachedCount(0)
+        .id('pageContent')
+        .alignRules({
+          'top': { 'anchor': 'tabList', 'align': VerticalAlign.Bottom },
+          'middle': { 'anchor': '__container__', 'align': HorizontalAlign.Center },
+          'bottom': { 'anchor': '__container__', 'align': VerticalAlign.Bottom }
+        })
+        .onChange((index) => {
+          Logger.info(TAG, `onChange index : ${index}`);
+          if (this.isBroadcastByIndex(index)) {
+            // 跳转到播报页面
+            ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
+            let nextIndex = this.currentTopNavSelectedIndex > index ? index - 1 : index + 1
+            if (nextIndex < this.myChannelList.length) {
+              this.changePage(nextIndex)
             }
             }
-          })
-      }
-      .loop(false)
-      .indicator(false)
-      .effectMode(EdgeEffect.None)
-      .index(this.currentTopNavSelectedIndex)
-      .cachedCount(0)
-      .id('pageContent')
-      .alignRules({
-        'top': { 'anchor': 'tabList', 'align': VerticalAlign.Bottom },
-        'middle': { 'anchor': '__container__', 'align': HorizontalAlign.Center },
-        'bottom': { 'anchor': '__container__', 'align': VerticalAlign.Bottom }
-      })
-      .onChange((index) => {
-        Logger.info(TAG, `onChange index : ${index}`);
-        if (this.isBroadcastByIndex(index)) {
-          // 跳转到播报页面
-          ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
-          let nextIndex = this.currentTopNavSelectedIndex > index ? index - 1 : index + 1
-          if (nextIndex < this.myChannelList.length) {
-            this.changePage(nextIndex)
-          }
-        } else if (this.isLayoutByIndex(index)) {
-          ProcessUtils.gotoENewsPaper()
-          let nextIndex = this.currentTopNavSelectedIndex > index ? index - 1 : index + 1
-          if (nextIndex < this.myChannelList.length) {
-            this.changePage(nextIndex)
+          } else if (this.isLayoutByIndex(index)) {
+            ProcessUtils.gotoENewsPaper()
+            let nextIndex = this.currentTopNavSelectedIndex > index ? index - 1 : index + 1
+            if (nextIndex < this.myChannelList.length) {
+              this.changePage(nextIndex)
+            }
+          } else {
+            this.currentTopNavSelectedIndex = index;
+            this.changePage(this.currentTopNavSelectedIndex)
           }
           }
-        } else {
-          this.currentTopNavSelectedIndex = index;
-          this.changePage(this.currentTopNavSelectedIndex)
-        }
 
 
-      })
+        })
+      }
+      .width('100%')
+      .height('100%')
     }
     }
-    .width('100%')
-    .height('100%')
   }
   }
 
 
   @Builder
   @Builder
@@ -316,7 +318,7 @@ export struct TopNavigationComponentNew {
       bottom: 2,
       bottom: 2,
     })
     })
     .id(`col_tabBar${index}`)
     .id(`col_tabBar${index}`)
-    .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
+    // .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
     .onClick(() => {
     .onClick(() => {
       Logger.debug(TAG, `onClick, index: ${index}`);
       Logger.debug(TAG, `onClick, index: ${index}`);
       if (this.currentTopNavSelectedIndex === index) {
       if (this.currentTopNavSelectedIndex === index) {
@@ -487,9 +489,19 @@ export struct TopNavigationComponentNew {
   }
   }
 
 
   /**
   /**
+   * 判断是否当前页面处理逻辑，如消息通知，只需要切换到当前底导的处理，过滤掉非当前。
+   */
+  private isCurrentPage(): boolean {
+    return this._currentNavIndex === this.bottomNavIndex
+  }
+
+  /**
    * 频道id变化，即指定频道跳转场景
    * 频道id变化，即指定频道跳转场景
    */
    */
   onAssignChannelChange() {
   onAssignChannelChange() {
+    if (!this.isCurrentPage()) {
+      return
+    }
     let channelId = this.assignChannel.channelId
     let channelId = this.assignChannel.channelId
     let index = -1
     let index = -1
     if (this._currentNavIndex === 0) {
     if (this._currentNavIndex === 0) {
@@ -537,7 +549,7 @@ export struct TopNavigationComponentNew {
   private getChannelByMine(channelId: string) {
   private getChannelByMine(channelId: string) {
     for (let i = 0; i < this.myChannelList.length; i++) {
     for (let i = 0; i < this.myChannelList.length; i++) {
       let topNavDTO: TopNavDTO = this.myChannelList[i]
       let topNavDTO: TopNavDTO = this.myChannelList[i]
-      if (topNavDTO.channelId?.toString() === channelId) {
+      if (topNavDTO?.channelId?.toString() === channelId) {
         return i
         return i
       }
       }
     }
     }