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

@@ -13,7 +13,7 @@
       "arkOptions": {
         "obfuscation": {
           "ruleOptions": {
-            "enable": true,
+            "enable": false,
             "files": [
               "./obfuscation-rules.txt"
             ]

@@ -129,7 +129,11 @@ export struct DynamicDetailComponent {
     })
 
   }
+
   aboutToDisappear() {
+    if (this.lastTimeoutId) {
+      clearTimeout(this.lastTimeoutId)
+    }
     this.viewBlogInsightIntentShare()
 
   }

@@ -75,6 +75,7 @@ export struct FeedBackActivity {
       Stack({ alignContent: Alignment.Bottom }) {
         Scroll(this.scroller) {
           Column() {
+            Column() {
               Text($r('app.string.feedback_opinion_type'))
                 .fontColor($r('app.color.color_222222'))
                 .fontSize($r('app.float.font_size_14_5'))
@@ -87,12 +88,11 @@ export struct FeedBackActivity {
                 .margin({ top: $r('app.float.vp_12') })
                 .backgroundColor($r('app.color.color_EDEDED'))
               GridRow({
-              columns:3,
+                columns: 3,
               }) {
                 ForEach(this.feedbackTypeBeans, (feedbackTypeBean: FeedbackTypeBean, index: number) => {
-                GridCol({
-                }) {
-                  Row(){
+                  GridCol({}) {
+                    Row() {
                       Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))
                         .width(17)
                         .height(17)
@@ -103,31 +103,37 @@ export struct FeedBackActivity {
                     }
                     .width($r('app.float.margin_115'))
                     .height($r('app.float.vp_22'))
-                  .margin({bottom:$r('app.float.margin_16')})
+                    .margin({ bottom: $r('app.float.margin_16') })
                     .backgroundColor($r('app.color.color_fff'))
                     .onClick(() => {
                       let temp = {} as FeedbackTypeBean
                       temp.id = feedbackTypeBean.id
                       temp.classifyName = feedbackTypeBean.classifyName
-                    if(feedbackTypeBean.isSelect){
+                      if (feedbackTypeBean.isSelect) {
                         temp.isSelect = false
-                    }else{
+                      } else {
                         temp.isSelect = true
                       }
                       this.feedbackTypeBeans[index] = temp
                       this.canSubmit = this.checkSubmit()
-                    TrackingButton.click('submit_feedback',TrackConstants.PageName.FeedbackPage,TrackConstants.PageName.FeedbackPage,{
-                      'feedback_type':feedbackTypeBean.id+''
+                      TrackingButton.click('submit_feedback', TrackConstants.PageName.FeedbackPage,
+                        TrackConstants.PageName.FeedbackPage, {
+                          'feedback_type': feedbackTypeBean.id + ''
                         })
                     })
                   }
                 })
               }
               .width('90%')
-            .margin({top:$r('app.float.vp_16')})
+              .margin({ top: $r('app.float.vp_16') })
+            }
+            .padding({left: 6, right: 6})
+
             Blank()
               .height($r('app.float.margin_5'))
               .backgroundColor($r('app.color.color_F5F5F5'))
+
+            Column() {
               Text($r('app.string.feedback_opinion_tv'))
                 .fontColor($r('app.color.color_222222'))
                 .fontSize($r('app.float.font_size_14_5'))
@@ -290,6 +296,8 @@ export struct FeedBackActivity {
               .margin({top: $r('app.float.margin_16')})
               Blank().layoutWeight(1)
             }
+            .padding({left: 6, right: 6})
+          }
         }
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
@@ -313,6 +321,7 @@ export struct FeedBackActivity {
             })
             .margin({ bottom: 64+64+15 })
         }
+        .padding({left: 6, right: 6})
       }
     }
     .backgroundColor($r('app.color.color_fff'))

@@ -558,6 +558,9 @@ export struct ImageAndTextPageComponent {
   }
 
   aboutToDisappear() {
+    if (this.lastTimeoutId) {
+      clearTimeout(this.lastTimeoutId)
+    }
     //意图上报
     this.viewBlogInsightIntentShare()
   }

@@ -140,7 +140,7 @@ export struct AppointmentListUI {
     .cachedCount(4)
     .scrollBar(BarState.Off)
     .edgeEffect(EdgeEffect.None)
-    .margin({ top: 4, left: 12, right: 12})
+    .margin({ top: 4, left: 16, right: 16})
     .layoutWeight(1)
   }
 

@@ -269,7 +269,6 @@ export struct BottomNavigationComponent {
 
   // 底导切换函数
   async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
-    // Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`);
 
     if (navItem.name === '我的') {
       this.barBackgroundColor = Color.White
@@ -306,10 +305,12 @@ export struct BottomNavigationComponent {
       }
     }
     if (index >= 0 && index != this.currentNavIndex) {
+      this.onBottomNavigationIndexChange(this.bottomNavList[index], index)
       // 切底导
       this.currentNavIndex = index
     }
 
+
     setTimeout(() => {
       // 底导切换后，触发顶导切换
       this.assignChannel = new AssignChannelParam()