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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  首页，页面滑动顶导按钮联动，时机修改。减少时延。
  图集布局调整

@@ -113,9 +113,11 @@ export struct TopNavigationComponentNew {
           'middle': { 'anchor': '__container__', 'align': HorizontalAlign.Center },
           'middle': { 'anchor': '__container__', 'align': HorizontalAlign.Center },
           'bottom': { 'anchor': '__container__', 'align': VerticalAlign.Bottom }
           'bottom': { 'anchor': '__container__', 'align': VerticalAlign.Bottom }
         })
         })
-        .onChange((index) => {
-          Logger.info(TAG, `onChange index : ${index}`);
-
+        .onAnimationStart((curIndex: number, index: number)=>{
+          Logger.info(TAG, `onAnimationStart ${curIndex} ${index}`);
+          if (curIndex === index) {
+            return
+          }
           if (this.isBroadcastByIndex(index)) {
           if (this.isBroadcastByIndex(index)) {
             // 跳转到播报页面
             // 跳转到播报页面
             ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
             ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
@@ -133,7 +135,12 @@ export struct TopNavigationComponentNew {
             this.currentTopNavSelectedIndex = index;
             this.currentTopNavSelectedIndex = index;
             this.changePage(this.currentTopNavSelectedIndex)
             this.changePage(this.currentTopNavSelectedIndex)
           }
           }
-
+        })
+        // .onAnimationEnd((index: number)=>{
+        //   Logger.info(TAG, `onAnimationEnd ${index}`);
+        // })
+        .onChange((index) => {
+          Logger.info(TAG, `onChange index : ${index}`);
         })
         })
       }
       }
       .width('100%')
       .width('100%')

@@ -241,7 +241,7 @@ export struct OperRowListView {
       .padding({
       .padding({
         top: 10,
         top: 10,
         // bottom: 10
         // bottom: 10
-        bottom: `${this.bottomSafeHeight}px`
+        bottom: px2vp(this.bottomSafeHeight)
         // bottom: 50
         // bottom: 50
       })
       })
     }
     }

@@ -32,7 +32,6 @@ struct MultiPictureDetailPage {
             relType: this.relType
             relType: this.relType
           })
           })
       }
       }
-      .padding({top: `${this.topSafeHeight}px`,bottom:`${this.bottomSafeHeight}px`})
 
 
     }
     }
     .backgroundColor(Color.Black)
     .backgroundColor(Color.Black)

@@ -45,8 +45,8 @@ export struct MultiPictureDetailPageComponent {
   @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowHeight: number = AppStorage.get<number>('windowHeight') || 0
   @Provide windowHeight: number = AppStorage.get<number>('windowHeight') || 0
-  @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
-  @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @Consume bottomSafeHeight: number
+  @Consume topSafeHeight: number
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   private swiperControllerItem: SwiperController = new SwiperController()
   private swiperControllerItem: SwiperController = new SwiperController()
@@ -119,7 +119,7 @@ export struct MultiPictureDetailPageComponent {
         currentIndex: $currentIndex,
         currentIndex: $currentIndex,
         showCommentList: $showCommentList,
         showCommentList: $showCommentList,
         publishCommentModel: $publishCommentModel,
         publishCommentModel: $publishCommentModel,
-        interactData:$interactData
+        interactData: this.interactData
       })
       })
 
 
     }
     }