Merge remote-tracking branch 'origin/main'

@@ -3,7 +3,7 @@
   "buildOption": {
   "buildOption": {
     "arkOptions": {
     "arkOptions": {
       "buildProfileFields": {
       "buildProfileFields": {
-        "BUILD_TIME": ""
+        "BUILD_VERSION": ""
       }
       }
     }
     }
   },
   },
@@ -20,7 +20,7 @@
           }
           }
         },
         },
         "buildProfileFields": {
         "buildProfileFields": {
-          "BUILD_TIME": ""
+          "BUILD_VERSION": ""
         }
         }
       }
       }
     },
     },

@@ -60,8 +60,8 @@ export struct TopNavigationComponentNew {
   // 传递给page的自动刷新通知
   // 传递给page的自动刷新通知
   @State autoRefresh2Page: number = 0
   @State autoRefresh2Page: number = 0
   @State animationDuration: number = 0
   @State animationDuration: number = 0
-  @State indicatorLeftMargin: number = 0
-  @State indicatorWidth: number = 0
+  // @State indicatorLeftMargin: number = 0
+  // @State indicatorWidth: number = 0
   @State isClickMorningEveningPaper: boolean = false
   @State isClickMorningEveningPaper: boolean = false
   // 顶部导航栏是否有临时跳转频道数据不
   // 顶部导航栏是否有临时跳转频道数据不
   @State haveTempTabData: boolean = false
   @State haveTempTabData: boolean = false
@@ -304,17 +304,17 @@ export struct TopNavigationComponentNew {
         .padding({ top: $r('app.float.top_tab_item_padding_top'), bottom: $r('app.float.top_tab_item_padding_bottom') })
         .padding({ top: $r('app.float.top_tab_item_padding_top'), bottom: $r('app.float.top_tab_item_padding_bottom') })
         .maxLines(this.MAX_LINE)
         .maxLines(this.MAX_LINE)
         .id(index.toString())
         .id(index.toString())
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          if (this.currentTopNavSelectedIndex === index &&
-            (this.indicatorLeftMargin === 0 || this.indicatorWidth === 0)) {
-            if (newValue.position.x != undefined) {
-              let positionX = Number.parseFloat(newValue.position.x.toString())
-              this.indicatorLeftMargin = Number.isNaN(positionX) ? 0 : positionX
-            }
-            let width = Number.parseFloat(newValue.width.toString())
-            this.indicatorWidth = Number.isNaN(width) ? 0 : width
-          }
-        })
+        // .onAreaChange((oldValue: Area, newValue: Area) => {
+        //   if (this.currentTopNavSelectedIndex === index &&
+        //     (this.indicatorLeftMargin === 0 || this.indicatorWidth === 0)) {
+        //     if (newValue.position.x != undefined) {
+        //       let positionX = Number.parseFloat(newValue.position.x.toString())
+        //       this.indicatorLeftMargin = Number.isNaN(positionX) ? 0 : positionX
+        //     }
+        //     let width = Number.parseFloat(newValue.width.toString())
+        //     this.indicatorWidth = Number.isNaN(width) ? 0 : width
+        //   }
+        // })
       if (this.currentTopNavSelectedIndex === index) {
       if (this.currentTopNavSelectedIndex === index) {
         Row()
         Row()
           .width(20)
           .width(20)

@@ -171,7 +171,10 @@ export struct BottomNavigationComponent {
       // 是否开启一级内存缓存
       // 是否开启一级内存缓存
       isCacheable: true,
       isCacheable: true,
       // 磁盘缓存
       // 磁盘缓存
-      strategy: new ALL()
+      strategy: new ALL(),
+      gif: {
+        playTimes: 1
+      }
     };
     };
     return imageKnifeOption
     return imageKnifeOption
   }
   }