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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 小视频横划卡边缘消失问题
  fix: 小视频横划卡边缘消失问题
  fix |> 修复语音输入，点击搜索后，弹窗未消失问题

@@ -96,7 +96,7 @@ export struct ZhSingleRow02 {
                 pageId: this.pageId,
                 pageId: this.pageId,
                 pageName: this.pageName
                 pageName: this.pageName
               })
               })
-                .margin({ right: 8, left: index === 0 ? 10 : 0 })
+                .margin({ right: 8, left: index === 0 ? 16 : 0 })
             })
             })
           }
           }
           if (this.compDTO.operDataList.length > 2 && this.showMore()) {
           if (this.compDTO.operDataList.length > 2 && this.showMore()) {
@@ -159,8 +159,8 @@ export struct ZhSingleRow02 {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .backgroundColor(0xffffff)
     .backgroundColor(0xffffff)
-    .width('100%')
-    .margin({ bottom: 8 })
+    .width('101%')
+    .margin({ bottom: 8, left: -6 })
   }
   }
 
 
   @Builder
   @Builder
@@ -206,7 +206,7 @@ export struct ZhSingleRow02 {
     }
     }
     .justifyContent(FlexAlign.SpaceBetween)
     .justifyContent(FlexAlign.SpaceBetween)
     .margin({ bottom: 10 })
     .margin({ bottom: 10 })
-    .padding({left: 10})
+    .padding({left: 16})
     .width('100%')
     .width('100%')
   }
   }
 }
 }

@@ -40,7 +40,7 @@ export struct SearchComponent {
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
   private breakpointSystem = new BreakpointSystem();
   @State percent: number = 1
   @State percent: number = 1
-  private commentInputDialogController?: CustomDialogController
+  private voiceInputDialogController?: CustomDialogController
 
 
   currentChanged() {
   currentChanged() {
     if (this.currentBreakpoint == "md" || this.currentBreakpoint == "lg") {
     if (this.currentBreakpoint == "md" || this.currentBreakpoint == "lg") {
@@ -419,16 +419,16 @@ export struct SearchComponent {
 
 
     VoiceRecoginizer.checkPemmission(getContext(this) as common.UIAbilityContext)
     VoiceRecoginizer.checkPemmission(getContext(this) as common.UIAbilityContext)
 
 
-    this.commentInputDialogController = new CustomDialogController({
+    this.voiceInputDialogController = new CustomDialogController({
       builder: VoiceSearchCustomDialog (
       builder: VoiceSearchCustomDialog (
         { onSearchBtnClick:((content:string) => {
         { onSearchBtnClick:((content:string) => {
-          this.commentInputDialogController?.close()
           this.searchText = content
           this.searchText = content
           if (StringUtils.isNotEmpty(this.searchText)) {
           if (StringUtils.isNotEmpty(this.searchText)) {
             SearcherAboutDataModel.putSearchHistoryData(this.searchText)
             SearcherAboutDataModel.putSearchHistoryData(this.searchText)
             this.getSearchHistoryData()
             this.getSearchHistoryData()
             this.getSearchInputResData(this.searchText)
             this.getSearchInputResData(this.searchText)
           }
           }
+          this.voiceInputDialogController?.close()
         })
         })
         }
         }
       ),
       ),
@@ -436,8 +436,8 @@ export struct SearchComponent {
       alignment: DialogAlignment.Bottom,
       alignment: DialogAlignment.Bottom,
       customStyle: true,
       customStyle: true,
       backgroundColor: "#50000000",
       backgroundColor: "#50000000",
-    }).open()
-
+    })
+    this.voiceInputDialogController.open()
   }
   }
 
 
   getSearchResultCountData() {
   getSearchResultCountData() {

@@ -137,7 +137,8 @@ export struct LiveHorizontalCardComponent {
             this.liveToMore();
             this.liveToMore();
           })
           })
         }
         }
-      }.justifyContent(FlexAlign.SpaceBetween)
+      }
+      .justifyContent(FlexAlign.SpaceBetween)
       // .padding({ left: 16, right: 16 })
       // .padding({ left: 16, right: 16 })
       .margin({ bottom: 10 })
       .margin({ bottom: 10 })
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)