Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  人民号文章稿件中的图片滑动时，图片和对应数字不能同步显示
  feat: 1)优化和整理首页底导和顶导航的业务逻辑

@@ -11,6 +11,7 @@ import { channelSkeleton } from '../skeleton/channelSkeleton';
 import { TrackConstants, TrackingButton } from 'wdTracking/Index';
 import { TrackConstants, TrackingButton } from 'wdTracking/Index';
 import DailyPaperTopicModel from '../../model/DailyPaperTopicModel'
 import DailyPaperTopicModel from '../../model/DailyPaperTopicModel'
 import { ParamType, Tracking } from 'wdTracking/Index';
 import { ParamType, Tracking } from 'wdTracking/Index';
+import { CompUtils } from '../../utils/CompUtils';
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
 
 
@@ -23,27 +24,16 @@ const storage = LocalStorage.getShared();
 @Component
 @Component
 export struct TopNavigationComponentNew {
 export struct TopNavigationComponentNew {
   private topRectHeight: string = AppStorage.get<number>('topSafeHeight') + 'px';
   private topRectHeight: string = AppStorage.get<number>('topSafeHeight') + 'px';
-  /**
-   * @deprecated
-   */
-  private groupId: number = 0
-  /**
-   * @deprecated TODO type判断
-   */
-  private currentBottomNavName: string = ''
   private pageName: string = ''
   private pageName: string = ''
   private pageId: number = 0
   private pageId: number = 0
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   private listScroller: Scroller = new Scroller()
   private listScroller: Scroller = new Scroller()
-  @Consume barBackgroundColor: Color
   /**
   /**
-   * @deprecated
+   *  首页 底导 某个tab 对象
    */
    */
-  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
-  /**
-   * @deprecated
-   */
-  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  navItem: BottomNavDTO = {} as BottomNavDTO
+  @Consume barBackgroundColor: Color
+
   @Link _currentNavIndex?: number;
   @Link _currentNavIndex?: number;
   // 顶导当前选中/焦点下标
   // 顶导当前选中/焦点下标
   @State @Watch('updateCurrentTopNavSelectedIndex') currentTopNavSelectedIndex: number = 0;
   @State @Watch('updateCurrentTopNavSelectedIndex') currentTopNavSelectedIndex: number = 0;
@@ -70,7 +60,6 @@ export struct TopNavigationComponentNew {
   @State animationDuration: number = 0
   @State animationDuration: number = 0
   @State indicatorLeftMargin: number = 0
   @State indicatorLeftMargin: number = 0
   @State indicatorWidth: number = 0
   @State indicatorWidth: number = 0
-  private tabsWidth: number = 0
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -78,9 +67,10 @@ export struct TopNavigationComponentNew {
       RelativeContainer() {
       RelativeContainer() {
         this.tabBar()
         this.tabBar()
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
-          ForEach(this.currentBottomNavName === '新闻' ? this.myChannelList : this.topNavList,
+          ForEach(CompUtils.isNews(this.navItem) ? this.myChannelList : this.topNavList,
             (navItem: TopNavDTO, index: number) => {
             (navItem: TopNavDTO, index: number) => {
-              if (this.currentBottomNavName === '人民号' && navItem.name === '关注') {
+              if (CompUtils.isRMH(this.navItem) && navItem.channelType === 3) {
+                // 人民号 -- 关注tab
                 PeopleShipMainComponent({
                 PeopleShipMainComponent({
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
                   navIndex: index,
                   navIndex: index,
@@ -203,8 +193,7 @@ export struct TopNavigationComponentNew {
 
 
   @Builder
   @Builder
   tabBar() {
   tabBar() {
-    // TODO 判断是否新闻tab，修改方法（，_currentNavIndex==0 都不对，需要用type）（用topStyle）
-    if (this.currentBottomNavName === '新闻') {
+    if (CompUtils.isNews(this.navItem)) {
       // 顶部搜索、日报logo、早晚报
       // 顶部搜索、日报logo、早晚报
       this.topBar()
       this.topBar()
       ChannelSubscriptionLayout({
       ChannelSubscriptionLayout({
@@ -233,13 +222,9 @@ export struct TopNavigationComponentNew {
       .listDirection(Axis.Horizontal)
       .listDirection(Axis.Horizontal)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
       .edgeEffect(EdgeEffect.None)
       .edgeEffect(EdgeEffect.None)
-      .padding({ left: 8, top:0, right: 0 })
+      .padding({ left: 8, top: 0, right: 0 })
       .height($r('app.float.top_tab_bar_height'))
       .height($r('app.float.top_tab_bar_height'))
       .backgroundColor(this.barBackgroundColor)
       .backgroundColor(this.barBackgroundColor)
-      .onAreaChange((oldValue: Area, newValue: Area) => {
-        let width = Number.parseFloat(newValue.width.toString())
-        this.tabsWidth = Number.isNaN(width) ? 0 : width
-      })
       .id('tabList')
       .id('tabList')
       .alignRules({
       .alignRules({
         'top': { 'anchor': 'topBar', 'align': VerticalAlign.Bottom },
         'top': { 'anchor': 'topBar', 'align': VerticalAlign.Bottom },
@@ -278,10 +263,6 @@ export struct TopNavigationComponentNew {
       .listDirection(Axis.Horizontal)
       .listDirection(Axis.Horizontal)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
       .edgeEffect(EdgeEffect.None)
       .edgeEffect(EdgeEffect.None)
-      .onAreaChange((oldValue: Area, newValue: Area) => {
-        let width = Number.parseFloat(newValue.width.toString())
-        this.tabsWidth = Number.isNaN(width) ? 0 : width
-      })
       .height($r('app.float.top_tab_bar_height_common'))
       .height($r('app.float.top_tab_bar_height_common'))
       .backgroundColor(this.barBackgroundColor)
       .backgroundColor(this.barBackgroundColor)
       .id('tabList')
       .id('tabList')
@@ -498,10 +479,9 @@ export struct TopNavigationComponentNew {
   }
   }
 
 
   updateCurrentTopNavSelectedIndex() {
   updateCurrentTopNavSelectedIndex() {
-    Logger.info(TAG, `currentTopNavSelectedIndex : ${this.currentTopNavSelectedIndex}、${this.currentBottomNavName}`);
 
 
     // 顶部tab埋点
     // 顶部tab埋点
-    if (this.currentBottomNavName === '新闻') {
+    if (CompUtils.isVideo(this.navItem)) {
       const tab = this.myChannelList[this.currentTopNavSelectedIndex]
       const tab = this.myChannelList[this.currentTopNavSelectedIndex]
       Logger.info(TAG, `新闻tab埋点: ${JSON.stringify(tab)}`);
       Logger.info(TAG, `新闻tab埋点: ${JSON.stringify(tab)}`);
 
 
@@ -511,7 +491,7 @@ export struct TopNavigationComponentNew {
         "pageId": tab.pageId,
         "pageId": tab.pageId,
       }
       }
       Tracking.event("home_page_tab_click ", params)
       Tracking.event("home_page_tab_click ", params)
-    } else if (this.currentBottomNavName === '人民号') {
+    } else if (CompUtils.isRMH(this.navItem)) {
       const tab = this.topNavList[this.currentTopNavSelectedIndex]
       const tab = this.topNavList[this.currentTopNavSelectedIndex]
       Logger.info(TAG, `人民号tab埋点: ${JSON.stringify(tab)}`);
       Logger.info(TAG, `人民号tab埋点: ${JSON.stringify(tab)}`);
 
 

@@ -74,9 +74,9 @@ export struct MultiPictureListPage {
           center: { anchor: "__container__", align: VerticalAlign.Center },
           center: { anchor: "__container__", align: VerticalAlign.Center },
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         })
-        .onChange((index: number) => {
-          this.swiperIndex = index
-          this.currentUrl = this.photoList[index]?.picPath
+        .onAnimationStart((index: number, targetIndex: number, extraInfo: SwiperAnimationEvent) => {
+          this.swiperIndex = targetIndex
+          this.currentUrl = this.photoList[targetIndex]?.picPath
         })
         })
 
 
         Row() {
         Row() {

@@ -32,6 +32,45 @@ export class CompUtils {
   }
   }
 
 
   /**
   /**
+   *  是视频tab
+   * @param navItem
+   * @returns
+   */
+  static isVideo(navItem: BottomNavDTO) : boolean{
+    if (navItem == null) {
+      return false;
+
+    }
+    return navItem.topStyle === '13';
+  }
+
+  /**
+   *  是新闻tab
+   * @param navItem
+   * @returns
+   */
+  static isNews(navItem: BottomNavDTO) : boolean{
+    if (navItem == null) {
+      return false;
+
+    }
+    return navItem.topStyle === '11';
+  }
+
+  /**
+   *  是人民号tab
+   * @param navItem
+   * @returns
+   */
+  static isRMH(navItem: BottomNavDTO) : boolean{
+    if (navItem == null) {
+      return false;
+
+    }
+    return navItem.topStyle === '12';
+  }
+
+  /**
    * 获取Label标题
    * 获取Label标题
    *
    *
    * @param component 组件bean
    * @param component 组件bean

@@ -81,7 +81,7 @@ export struct BottomNavigationComponent {
             if (CompUtils.isMine(navItem)) {
             if (CompUtils.isMine(navItem)) {
               // 我的页面组件数据列表
               // 我的页面组件数据列表
               MinePageComponent({ isMinePage: this.currentNavIndex === this.bottomNavList.length - 1 })
               MinePageComponent({ isMinePage: this.currentNavIndex === this.bottomNavList.length - 1 })
-            } else if (navItem.name === '视频') {
+            } else if (CompUtils.isVideo(navItem)) {
               // 视频频道，包含视频和直播
               // 视频频道，包含视频和直播
               VideoChannelPage({
               VideoChannelPage({
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
@@ -89,14 +89,14 @@ export struct BottomNavigationComponent {
                 autoRefresh: this.autoRefresh
                 autoRefresh: this.autoRefresh
               })
               })
             } else {
             } else {
+              // 其它带顶到的页面，如 新闻、人民号、服务
               TopNavigationComponentNew({
               TopNavigationComponentNew({
-                groupId: navItem.id,
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
                 topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
                 _currentNavIndex: $currentNavIndex,
                 _currentNavIndex: $currentNavIndex,
                 bottomNavIndex: index,
                 bottomNavIndex: index,
-                currentBottomNavName: navItem.name,
                 assignChannel: this.assignChannel,
                 assignChannel: this.assignChannel,
-                autoRefresh: this.autoRefresh
+                autoRefresh: this.autoRefresh,
+                navItem: navItem
               })
               })
             }
             }
           }
           }
@@ -246,7 +246,7 @@ export struct BottomNavigationComponent {
   }
   }
 
 
   onBottomNavigationDataUpdated() {
   onBottomNavigationDataUpdated() {
-    Logger.error('yyyy','onBottomNavigationDataUpdated '+JSON.stringify(this.bottomNavList))
+    Logger.error('yyyy', 'onBottomNavigationDataUpdated ' + JSON.stringify(this.bottomNavList))
     // Logger.info(TAG, `onBottomNavigationDataUpdated currentNavIndex: ${this.currentNavIndex},length:${this.bottomNavItemList.length}`);
     // Logger.info(TAG, `onBottomNavigationDataUpdated currentNavIndex: ${this.currentNavIndex},length:${this.bottomNavItemList.length}`);
   }
   }
 
 
@@ -353,11 +353,20 @@ export struct BottomNavigationComponent {
       list = list.filter(item => item.name !== '服务');
       list = list.filter(item => item.name !== '服务');
       list.forEach(item => {
       list.forEach(item => {
         switch (item.name) {
         switch (item.name) {
-          case '新闻': item.pageName = 'NEWS'; break;
-          case '人民号': item.pageName = 'PEOPLE'; break;
-          case '视频': item.pageName = 'VIDEOS'; break;
-          case '我的': item.pageName = 'MY'; break;
-          default : item.pageName = 'NEWS'; break;
+          case '新闻':
+            item.pageName = 'NEWS';
+            break;
+          case '人民号':
+            item.pageName = 'PEOPLE';
+            break;
+          case '视频':
+            item.pageName = 'VIDEOS';
+            break;
+          case '我的':
+            item.pageName = 'MY';
+            break;
+          default:
+            item.pageName = 'NEWS'; break;
         }
         }
       })
       })
       this.bottomNavList = list
       this.bottomNavList = list

@@ -58,7 +58,7 @@ export struct VideoChannelPage {
    * TODO:根据顶导配置获取颜色展示效果不对，待确认
    * TODO:根据顶导配置获取颜色展示效果不对，待确认
    */
    */
   getTopNavFontColor(item: TopNavDTO, index: number): Color | string {
   getTopNavFontColor(item: TopNavDTO, index: number): Color | string {
-    if (item.name === '视频' && this.currentBottomNavInfo.name === '视频') {
+    if (item.channelStyle === 1) {
       return this.currentTopNavSelectedIndex === index ? Color.White : '#949494'
       return this.currentTopNavSelectedIndex === index ? Color.White : '#949494'
     } else {
     } else {
       return this.currentTopNavSelectedIndex === index ? Color.Black : "#B2B2B2"
       return this.currentTopNavSelectedIndex === index ? Color.Black : "#B2B2B2"