Merge remote-tracking branch 'origin/main'

@@ -32,6 +32,7 @@ let preferenceTheme: dataPreferences.Preferences | null = null
 struct LiveMorePage {
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   type: number = 1;
   pageSize: number = 20;
   operDataList: ContentDTO[] = [];
@@ -100,6 +101,7 @@ struct LiveMorePage {
       right: $r('app.float.card_comp_pagePadding_lf'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
+    .margin({bottom:px2vp(this.bottomSafeHeight)})
     .onClick(() => {
       ProcessUtils.processPage(this.contentDTO)
     })

@@ -321,8 +321,8 @@ export struct MultiPictureDetailPageComponent {
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
       .zIndex(1)
-      .onChange((index: number) => {
-        this.swiperIndex = index
+      .onAnimationStart((index: number, targetIndex: number, extraInfo: SwiperAnimationEvent) => {
+        this.swiperIndex = targetIndex
       })
       .onClick(() => {
         this.showDownload = !this.showDownload