Merge remote-tracking branch 'origin/main'

@@ -204,14 +204,14 @@ export struct SpacialTopicPageComponent {
             this.showCommentList = true
           }
         })
-        //全部评论
-        CommentDialogView({
-          index: $index,
-          currentIndex: $currentIndex,
-          showCommentList: $showCommentList,
-          publishCommentModel: $publishCommentModel,
-          interactData: $interactData,
-        })
+        // //全部评论
+        // CommentDialogView({
+        //   index: $index,
+        //   currentIndex: $currentIndex,
+        //   showCommentList: $showCommentList,
+        //   publishCommentModel: $publishCommentModel,
+        //   interactData: $interactData,
+        // })
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }

@@ -87,9 +87,43 @@ struct ChannelSubscriptionLayout {
       if (index > -1) {
         this.currentTopNavSelectedIndex = index
       }
+    }else {
+       //检测删除频道后的当前频道是否是特殊频道
+      let item =  this.myChannelList[this.currentTopNavSelectedIndex]
+      if(this.isBroadcast(item) || this.isLayout(item)){
+
+        this.changeTab(this.currentTopNavSelectedIndex)
+        this.isShow = false
+
+        let index = this.myChannelList.findIndex(_item => _item?.channelId === this.indexSettingChannelId)
+        console.debug('TopNavigationComponent','index='+index)
+        if (index > -1) {
+          this.currentTopNavSelectedIndex = index
+          this.changeTab(this.currentTopNavSelectedIndex)
+        }
+      }
+
     }
   }
 
+  /**
+   *  频道是播报
+   * @param item
+   * @returns
+   */
+  private isBroadcast(item?: TopNavDTO): boolean {
+    return item?.channelId === 2066
+  }
+
+  /**
+   * 频道是电子报
+   * @param item
+   * @returns
+   */
+  private isLayout(item?: TopNavDTO): boolean {
+    return item?.channelId === 2006
+  }
+
   // 添加频道
   addChannelItem(item: TopNavDTO) {
     this.channelIds.push(item.channelId)

@@ -114,17 +114,8 @@ export struct TopNavigationComponentNew {
             return
           }
 
-          if (this.isBroadcastByIndex(index)) {
-            // 跳转到播报页面
-            ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
+          this.channelJumpToPage(index)
 
-          } else if (this.isLayoutByIndex(index)) {
-            // 跳转到电子报页面
-            ProcessUtils.gotoENewsPaper()
-
-          } else {
-            this.changePage(index)
-          }
         })
         .onAnimationEnd((index: number) => {
           Logger.info(TAG, `onAnimationEnd ${index}`);
@@ -151,7 +142,6 @@ export struct TopNavigationComponentNew {
               this.changePage(this.currentTopNavSelectedIndex)
             }
           } else {
-            //this.currentTopNavSelectedIndex = index
           }
 
         })
@@ -226,7 +216,7 @@ export struct TopNavigationComponentNew {
         moreChannelList: $moreChannelList,
         localChannelList: $localChannelList,
         changeTab: (index) => {
-          this.changePage(index)
+          this.channelJumpToPage(index)
         }
       })
         .id('channelManageBtn')
@@ -351,18 +341,29 @@ export struct TopNavigationComponentNew {
         // 当前tab，单击事件
         this.doAutoRefresh()
       } else {
-        if (this.isBroadcastByIndex(index)) {
-          // 跳转到播报页面
-          ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
-        } else if (this.isLayoutByIndex(index)) {
-          ProcessUtils.gotoENewsPaper()
-        } else {
-          this.changePage(index)
-        }
+        this.channelJumpToPage(index)
       }
     })
   }
 
+
+  /**
+   * 频道信息跳转页面方法
+   * @param index
+   */
+  private channelJumpToPage(index :number){
+    if (this.isBroadcastByIndex(index)) {
+      // 跳转到播报页面
+      ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
+    } else if (this.isLayoutByIndex(index)) {
+      // 跳转到电子报页面
+      ProcessUtils.gotoENewsPaper()
+    } else {
+      this.changePage(index)
+    }
+
+  }
+
   /**
    *  改变频道页
    * @param index  频道所在的序列号