fix:

1)编辑我的频道-编辑中_退出页面，再次进入不该仍为编辑中状态

@@ -12,7 +12,9 @@ const MORE_CHANNEL: string = '更多频道'
 const LOCAL_CHANNEL: string = '地方频道'
 
 const TAG: string = 'ChannelSubscriptionLayout'
+
 export { ChannelSubscriptionLayout }
+
 @Component
 struct ChannelSubscriptionLayout {
   @State indexSettingArray: string [] = ['推荐', '热点']
@@ -20,14 +22,13 @@ struct ChannelSubscriptionLayout {
   @Link currentTopNavSelectedIndex: number;
   @Prop homeChannelList: TopNavDTO []
   // 我的频道栏目的频道信息数组
-  @Link myChannelList: TopNavDTO []
+  @Link @Watch('changeMyChannelData') myChannelList: TopNavDTO []
   // 更多频道栏目频道信息数组
   @Link moreChannelList: TopNavDTO []
   // 地方频道栏目频道信息数组
   @Link localChannelList: TopNavDTO []
   // 收集到的我的频道栏目中的频道id
   @State channelIds: number [] = []
-
   @State isShow: boolean = false
   @State dragItem: number = -1
   private dragRefOffsetX: number = 0
@@ -38,17 +39,14 @@ struct ChannelSubscriptionLayout {
   private FIX_VP_Y: number = 48
   @State indexSettingChannelId: number = AppStorage.get<number>('indexSettingChannelId') || 2002
   @State isEditIng: boolean = false
- // @State currentTopNavSelectedItem: TopNavDTO = {} as TopNavDTO
   changeTab: (index: number) => void = () => {
   }
 
   aboutToAppear() {
-   // this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex]
-    this.myChannelList.forEach(item => {
-      if(item != undefined && item.channelId != undefined){
-        this.channelIds.push(item.channelId)
-      }
-    })
+    this.changeMyChannelData()
+  }
+
+  aboutToDisappear(): void {
   }
 
   //交换我的频道数组中的位置
@@ -79,24 +77,22 @@ struct ChannelSubscriptionLayout {
 
 
     // 删除频道的索引值大于 我的栏目中频道最大索引值
-    if(this.currentTopNavSelectedIndex > this.channelIds.length-1){
+    if (this.currentTopNavSelectedIndex > this.channelIds.length - 1) {
       //使用默认频道
       //缓存首页频道
       let index = this.myChannelList.findIndex(_item => _item?.channelId === this.indexSettingChannelId)
-      console.debug('TopNavigationComponent','index='+index)
       if (index > -1) {
         this.currentTopNavSelectedIndex = index
       }
-    }else {
-       //检测删除频道后的当前频道是否是特殊频道
-      let item =  this.myChannelList[this.currentTopNavSelectedIndex]
-      if(this.isBroadcast(item) || this.isLayout(item)){
+    } 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)
@@ -128,7 +124,12 @@ struct ChannelSubscriptionLayout {
   addChannelItem(item: TopNavDTO) {
     this.channelIds.push(item.channelId)
     this.myChannelList.push(item)
+
+
     AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
+
+    let storageChannelIds: string = AppStorage.get<string>('channelIds') || ''
+    console.debug('TopNavigationComponent', 'addChannelItem==>' + storageChannelIds)
   }
 
   itemMove(index: number, newIndex: number): void {
@@ -273,6 +274,7 @@ struct ChannelSubscriptionLayout {
           .width(24)
           .onClick(() => {
             this.isShow = false
+            this.isEditIng = false
           })
       }
       .width('100%')
@@ -569,5 +571,20 @@ struct ChannelSubscriptionLayout {
     })
     .bindContentCover(this.isShow, this.sheetBuilder())
   }
+
+  /**
+   * 改变我的频道栏目中频道id数据
+   */
+  changeMyChannelData() {
+
+    this.channelIds = []
+    this.myChannelList.forEach(item => {
+      if (item != undefined && item.channelId != undefined) {
+        this.channelIds.push(item.channelId)
+      }
+    })
+
+    console.debug('TopNavigationComponent', '--changeMyChannelData  channelIds--->' + this.channelIds.join(','))
+  }
 }
 

@@ -346,12 +346,11 @@ export struct TopNavigationComponentNew {
     })
   }
 
-
   /**
    * 频道信息跳转页面方法
    * @param index
    */
-  private channelJumpToPage(index :number){
+  private channelJumpToPage(index: number) {
     if (this.isBroadcastByIndex(index)) {
       // 跳转到播报页面
       ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
@@ -375,104 +374,6 @@ export struct TopNavigationComponentNew {
     this.listScroller.scrollToIndex(index, true, ScrollAlign.CENTER)
   }
 
-  //处理新闻tab顶导频道数据
-  topNavListHandle() {
-    let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
-    let _myChannelList: TopNavDTO [] = []
-    let _storageChannelIds: string [] = [] //list1
-    let defaultMyChannelList: TopNavDTO[] = []
-    let defaultList = [...this.topNavList]
-    defaultList.sort((a, b) => {
-      return a.num - b.num;
-    });
-
-    //defaultMyChannelList
-    defaultList.forEach(item => {
-      if (item.defaultPermitted === 1 || item.movePermitted === 0 || item.delPermitted === 0 ||
-        item.headlinesOn === 1) {
-        defaultMyChannelList.push(item);
-      }
-      if (item.defaultPermitted === 1) {
-        this.homeChannelList.push(item)
-      }
-    })
-
-    //有缓存频道id
-    if (this.storageChannelIds) {
-      _storageChannelIds = this.storageChannelIds.split(',')
-    }
-
-    defaultMyChannelList.forEach(item => {
-      item.myChannel = '1'
-      if (item.defaultPermitted === 1) {
-        item.homeChannel = '1'
-      }
-      let index = defaultList.findIndex(_item => _item.channelId === item.channelId)
-      if (index !== -1) {
-        defaultList.splice(index, 1)
-      }
-    })
-    defaultList.unshift(...defaultMyChannelList)
-    defaultList.forEach((item, index) => {
-      if (item.channelType === 2) {
-        if (cityName.includes(item.name)) {
-          item.myChannel = '1'
-        }
-        item.localChannel = '1'
-      }
-      if (index >= 11) {
-        if (item.channelType === 1) {
-          item.moreChannel = '1'
-        }
-      } else {
-        if (item.channelType === 1 && item.myChannel !== '1') {
-          item.moreChannel = '1'
-        }
-      }
-      if (this.storageChannelIds && _storageChannelIds.includes(String(item.channelId))) {
-        item.myChannel = '1'
-      }
-      //频道分类
-      //TODO 暂时隐藏播报
-      if (item.name !== '播报') {
-        if (item.myChannel === '1') {
-          _myChannelList.push(item)
-        }
-        if (item.moreChannel === '1' && item.myChannel !== '1') {
-          this.moreChannelList.push(item)
-        }
-        if (item.localChannel === '1' && item.myChannel !== '1') {
-          this.localChannelList.push(item)
-        }
-      }
-    })
-
-    //根据缓存数组排序
-    if (this.storageChannelIds) {
-      let sortedyChannelList = _myChannelList.sort((item1, item2) => {
-        let index1 = this.storageChannelIds.indexOf(String(item1.channelId));
-        let index2 = this.storageChannelIds.indexOf(String(item2.channelId));
-        return index1 - index2;
-      });
-      _myChannelList = sortedyChannelList
-    }
-
-
-    if (cityName) {
-      let index = _myChannelList.findIndex(ele => cityName.includes(ele.name))
-      const localChannelitem = _myChannelList.splice(index, 1)[0];
-      // 将当前地区频道插入到第四个
-      _myChannelList.splice(3, 0, localChannelitem);
-    }
-
-    this.myChannelList = _myChannelList
-
-    //缓存首页频道
-    let index = this.myChannelList.findIndex(_item => _item?.channelId === this.indexSettingChannelId)
-    if (index > -1) {
-      this.currentTopNavSelectedIndex = index
-    }
-  }
 
   /**
    *  频道是播报
@@ -517,12 +418,24 @@ export struct TopNavigationComponentNew {
     return item?.channelType === 3
   }
 
-  aboutToAppear() {
-    //处理新闻tab顶导频道数据
-    this.topNavListHandle()
-    this.changePage(this.currentTopNavSelectedIndex)
+  async aboutToAppear() {
+
+
+    if (CompUtils.isNews(this.navItem)) {
+
+      // 请求顶导网络数据
+      this.getTopNavList(this.navItem.id)
+
+    } else {
+      // if(CompUtils.isNews(this.navItem)){
+      //   //处理新闻tab顶导频道数据
+      //   this.topNavListHandle()
+      // }
+
+      this.changePage(this.currentTopNavSelectedIndex)
+    }
+
 
-    this.getTopNavList(this.navItem.id)
   }
 
   onTopNavigationDataUpdated() {
@@ -534,7 +447,6 @@ export struct TopNavigationComponentNew {
    *
    */
   updateCurrentTopNavSelectedIndex() {
-    console.debug(TAG, 'updateCurrentTopNavSelectedIndex=>' + this.currentTopNavSelectedIndex)
     if (CompUtils.isNews(this.navItem)) {
       const tab = this.myChannelList[this.currentTopNavSelectedIndex]
       // 埋点
@@ -659,7 +571,6 @@ export struct TopNavigationComponentNew {
     return null
   }
 
-
   /**
    *  进入早晚报专题
    */
@@ -704,11 +615,128 @@ export struct TopNavigationComponentNew {
 
   //请求顶导数据
   async getTopNavList(id: number) {
-    let bottomNavDetail = await ChannelViewModel.getBottomNavDetailData(id)
+
+    Logger.debug(TAG, 'getTopNavList==>' + this.storageChannelIds)
+
+    let bottomNavDetail = await ChannelViewModel.getBottomNavDetailData(id, this.storageChannelIds)
     let topNavList = bottomNavDetail?.topNavChannelList || []
-    // for (let topNav of topNavList) {
-    //   console.debug(TAG, 'getTopNavList=>' + JSON.stringify(topNav))
-    //
+
+    let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
+    let _myChannelList: TopNavDTO [] = []
+    let _storageChannelIds: string [] = [] //list1
+    let defaultMyChannelList: TopNavDTO[] = []
+    let defaultList = [...topNavList]
+
+    Logger.debug(TAG, 'cityName=>' + cityName)
+    // 排序
+    defaultList.sort((a, b) => {
+      return a.num - b.num;
+    });
+
+    //defaultMyChannelList
+    defaultList.forEach(item => {
+      if (item.defaultPermitted === 1 || item.movePermitted === 0 || item.delPermitted === 0 ||
+        item.headlinesOn === 1) {
+        defaultMyChannelList.push(item);
+      }
+      if (item.defaultPermitted === 1) {
+        this.homeChannelList.push(item)
+      }
+    })
+
+    //有缓存频道id
+    if (this.storageChannelIds) {
+      _storageChannelIds = this.storageChannelIds.split(',')
+
+    }
+
+    defaultMyChannelList.forEach(item => {
+      item.myChannel = '1'
+      if (item.defaultPermitted === 1) {
+        item.homeChannel = '1'
+      }
+      let index = defaultList.findIndex(_item => _item.channelId === item.channelId)
+      if (index !== -1) {
+        defaultList.splice(index, 1)
+      }
+    })
+    defaultList.unshift(...defaultMyChannelList)
+
+    defaultList.forEach((item, index) => {
+      if (item.channelType === 2) {
+        if (cityName.includes(item.name)) {
+          item.myChannel = '1'
+        }
+        item.localChannel = '1'
+      }
+      if (index >= 11) {
+        if (item.channelType === 1) {
+          item.moreChannel = '1'
+        }
+      } else {
+        if (item.channelType === 1 && item.myChannel !== '1') {
+          item.moreChannel = '1'
+        }
+      }
+      if (this.storageChannelIds && _storageChannelIds.includes(String(item.channelId))) {
+        item.myChannel = '1'
+      }
+      //频道分类
+      //TODO 暂时隐藏播报
+      if (item.name !== '播报') {
+        if (item.myChannel === '1') {
+          _myChannelList.push(item)
+        }
+        if (item.moreChannel === '1' && item.myChannel !== '1') {
+          this.moreChannelList.push(item)
+        }
+        if (item.localChannel === '1' && item.myChannel !== '1') {
+          this.localChannelList.push(item)
+        }
+      }
+    })
+
+    //根据缓存数组排序
+    if (this.storageChannelIds) {
+
+      // let sortedyChannelList: TopNavDTO [] = []
+      //
+      // _storageChannelIds.forEach((channelId) => {
+      //   console.debug(TAG, 'getTopNavList=0=>' + channelId)
+      //   for (let a of _myChannelList) {
+      //
+      //     console.debug(TAG,
+      //       'getTopNavList=1=>' + channelId + '  ' + a.channelId + '  ' + (channelId == String(a.channelId)))
+      //     if (channelId == String(a.channelId)) {
+      //       sortedyChannelList.push(a)
+      //       break;
+      //     }
+      //   }
+      //
+      // })
+
+      let sortedyChannelList = _myChannelList.sort((item1, item2) => {
+        let index1 = this.storageChannelIds.indexOf(String(item1.channelId));
+        let index2 = this.storageChannelIds.indexOf(String(item2.channelId));
+        return index1 - index2;
+      });
+      _myChannelList = sortedyChannelList
+    }
+
+    // if (cityName) {
+    //   let index = _myChannelList.findIndex(ele => cityName.includes(ele.name))
+    //   const localChannelitem = _myChannelList.splice(index, 1)[0];
+    //   // 将当前地区频道插入到第四个
+    //   _myChannelList.splice(3, 0, localChannelitem);
     // }
+
+    this.myChannelList = _myChannelList
+
+
+    //缓存首页频道
+    let index = this.myChannelList.findIndex(_item => _item?.channelId === this.indexSettingChannelId)
+    if (index > -1) {
+      this.currentTopNavSelectedIndex = index
+    }
   }
 }
\ No newline at end of file

@@ -226,8 +226,25 @@ export class PageRepository {
     return WDHttp.get<ResponseDTO<NavigationBodyDTO>>(url)
   };
 
-  static fetchNavigationDetailDataApi(id:number = 210) {
+  /**
+   * 获取顶导详情
+   * @param id
+   * @returns
+   */
+  static fetchNavigationDetailDataApi(id: number = 210, myChannelIds?: string) {
     let url = PageRepository.getBottomNavGroupDetailUrl() + `?id=${id}`;
+
+    let provinceCode = HttpUtils.getProvinceCode()
+    if (provinceCode) {
+      url = url + "&districtCode=" + HttpUtils.getDistrictCode()
+        + "&provinceCode=" + HttpUtils.getProvinceCode()
+        + "&cityCode=" + HttpUtils.getCityCode()
+    }
+    if (myChannelIds) {
+      url = url + `&channelIds=${myChannelIds}`
+    }
+
+
     return WDHttp.get<ResponseDTO<NavigationDetailDTO>>(url)
   };
 
@@ -486,5 +503,4 @@ export class PageRepository {
     url = url + "?mliveId=" + mLiveId
     return WDHttp.get<ResponseDTO<boolean>>(url)
   }
-
 }

@@ -75,9 +75,9 @@ export class ChannelViewModel {
   /**
    * 获取底导详情（顶导）接口数据
    */
-  async getBottomNavDetailData(id: number): Promise<NavigationDetailDTO> {
+  async getBottomNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO> {
     Logger.info(TAG, `getBottomNavDetailData start`);
-    return this.getNavDetailData(id);
+    return this.getNavDetailData(id,myChannelIds);
   }
 
   private getNavData(): Promise<NavigationBodyDTO> {
@@ -105,10 +105,16 @@ export class ChannelViewModel {
     })
   }
 
-  private getNavDetailData(id: number): Promise<NavigationDetailDTO> {
+  /**
+   * 请求获取顶部导航栏数据
+   * @param id
+   * @param myChannelIds
+   * @returns
+   */
+  private getNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO> {
     return new Promise<NavigationDetailDTO>((success, error) => {
       Logger.info(TAG, `getNavData start`);
-      PageRepository.fetchNavigationDetailDataApi(id).then((navResDTO: ResponseDTO<NavigationDetailDTO>) => {
+      PageRepository.fetchNavigationDetailDataApi(id,myChannelIds).then((navResDTO: ResponseDTO<NavigationDetailDTO>) => {
         if (!navResDTO || !navResDTO.data) {
           Logger.error(TAG, 'getNavData then navResDTO is empty');
           error('navResDTO is empty');

@@ -24,17 +24,18 @@ export class Tracking {
     //   Logger.error('yyyy','event track failed')
     // })
 
-    let publicParams = new PublicParams()
-    publicParams.getPublicParams().then((pubParams) => {
-
-      if (params) {
-        for (const obj of Object.entries(params)) {
-          // Logger.info(TAG, ` ${obj[0]} => ` + `${obj[1]}`);
-          pubParams[obj[0]] = obj[1]
-        }
-      }
-      sensors.track(eventId, pubParams)
-    })
+    //TODO: 添加运行单独线程？
+    // let publicParams = new PublicParams()
+    // publicParams.getPublicParams().then((pubParams) => {
+    //
+    //   if (params) {
+    //     for (const obj of Object.entries(params)) {
+    //       // Logger.info(TAG, ` ${obj[0]} => ` + `${obj[1]}`);
+    //       pubParams[obj[0]] = obj[1]
+    //     }
+    //   }
+    //   sensors.track(eventId, pubParams)
+    // })
   }
 }