Merge remote-tracking branch 'origin/main'

@@ -146,7 +146,7 @@ export struct HomePageBottomComponent{
 
 
             LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
             LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
               ListItem() {
               ListItem() {
-                FollowChildComponent({data: item,type:1})
+                FollowChildComponent({data: item,type:2})
               }
               }
               .onClick(() => {
               .onClick(() => {
               })
               })

@@ -29,11 +29,19 @@ export struct FirstTabTopSearchComponent {
       if (value != null) {
       if (value != null) {
         this.searchTextData = value
         this.searchTextData = value
       }
       }
+      this.setDefaultHitData()
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))
+      this.setDefaultHitData()
     })
     })
   }
   }
 
 
+  setDefaultHitData(){
+    if(this.searchTextData.length === 0){
+      this.searchTextData.push("搜索")
+    }
+  }
+
   build() {
   build() {
     Row() {
     Row() {
       Image($r('app.media.icon_search'))
       Image($r('app.media.icon_search'))

@@ -13,14 +13,18 @@ const TAG = "SearchComponent"
 @Component
 @Component
 export struct SearchComponent {
 export struct SearchComponent {
   @State searchTextData: string[] = []
   @State searchTextData: string[] = []
+  @State hasNoSearchTextData: boolean = false
+  @State curHintSearchData: string = ""
   @State hasInputContent: boolean = false
   @State hasInputContent: boolean = false
   @State hasChooseSearch: boolean = false
   @State hasChooseSearch: boolean = false
-  @State isClickedHistory: boolean = false
-  @State isClickedHot: boolean = false
-  @State isClickedRelated: boolean = false
+  @State isClickedHistorySearch: boolean = false
+  @State isClickedHotSearch: boolean = false
+  @State isClickedRelatedSearch: boolean = false
+  @State isClickedInputSearch: boolean = false
+  @State isClickedHintSearch: boolean = false
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   @State searchText: string = ''
   @State searchText: string = ''
-  controller: TextInputController = new TextInputController()
+  controller: SearchController = new SearchController()
   @State searchHistoryData: SearchHistoryItem[] = []
   @State searchHistoryData: SearchHistoryItem[] = []
   @State relatedSearchContentsData: SearchRelatedItem[] = []
   @State relatedSearchContentsData: SearchRelatedItem[] = []
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
@@ -75,10 +79,18 @@ export struct SearchComponent {
       if (value != null) {
       if (value != null) {
         this.searchTextData = value
         this.searchTextData = value
       }
       }
+      this.setDefaultHitData()
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))
+      this.setDefaultHitData()
     })
     })
   }
   }
+  setDefaultHitData(){
+    if(this.searchTextData.length === 0){
+      this.hasNoSearchTextData = true
+      this.searchTextData.push("搜索感兴趣的内容")
+    }
+  }
 
 
   getSearchHistoryData() {
   getSearchHistoryData() {
     this.searchHistoryData = SearcherAboutDataModel.getSearchHistoryData()
     this.searchHistoryData = SearcherAboutDataModel.getSearchHistoryData()
@@ -131,7 +143,7 @@ export struct SearchComponent {
   getSearchHistoryResData(content:string,index:number){
   getSearchHistoryResData(content:string,index:number){
     //删除单条记录
     //删除单条记录
     SearcherAboutDataModel.delSearchSingleHistoryData(index)
     SearcherAboutDataModel.delSearchSingleHistoryData(index)
-    this.isClickedHistory = true
+    this.isClickedHistorySearch = true
     this.searchResData(content)
     this.searchResData(content)
   }
   }
 
 
@@ -148,6 +160,16 @@ export struct SearchComponent {
     //查询 操作 TODO
     //查询 操作 TODO
     this.hasChooseSearch = true
     this.hasChooseSearch = true
     this.getSearchResultCountData()
     this.getSearchResultCountData()
+    this.controller.stopEditing()
+  }
+
+  /**
+   * 点击hint搜索列表回调
+   * @param content
+   */
+  getSearchHintResData(content:string){
+    this.isClickedHintSearch = true
+    this.searchResData(content)
   }
   }
 
 
   /**
   /**
@@ -155,7 +177,7 @@ export struct SearchComponent {
    * @param content
    * @param content
    */
    */
   getSearchRelatedResData(content:string){
   getSearchRelatedResData(content:string){
-    this.isClickedRelated = true
+    this.isClickedRelatedSearch = true
     this.searchResData(content)
     this.searchResData(content)
   }
   }
 
 
@@ -164,10 +186,18 @@ export struct SearchComponent {
    * @param content
    * @param content
    */
    */
   getSearchHotResData(content:string){
   getSearchHotResData(content:string){
-    this.isClickedHot = true
+    this.isClickedHotSearch = true
     this.searchResData(content)
     this.searchResData(content)
   }
   }
 
 
+  /**
+   * 点击输入法搜索搜索列表回调
+   * @param content
+   */
+  getSearchInputResData(content:string){
+    this.isClickedInputSearch = true
+    this.searchResData(content)
+  }
 
 
   //搜索框
   //搜索框
   @Builder searchInputComponent() {
   @Builder searchInputComponent() {
@@ -185,7 +215,7 @@ export struct SearchComponent {
                 .textAlign(TextAlign.Start)
                 .textAlign(TextAlign.Start)
                 .maxLines(1)
                 .maxLines(1)
                 .textOverflow({ overflow: TextOverflow.Clip })
                 .textOverflow({ overflow: TextOverflow.Clip })
-                .margin({ left: '40lpx' })
+                .margin({ left: '70lpx' })
             })
             })
           }
           }
           .loop(true)
           .loop(true)
@@ -195,42 +225,57 @@ export struct SearchComponent {
           .vertical(true)
           .vertical(true)
           .enabled(false)
           .enabled(false)
           .focusable(false)
           .focusable(false)
+          .onChange((index: number) => {
+            this.curHintSearchData = this.searchTextData[index]
+          })
         }
         }
         Row(){
         Row(){
-          TextInput({ text: this.searchText, placeholder: '', controller: this.controller })
-          .caretColor(Color.Pink)
-          .fontSize('27lpx')
+          Search({ value: this.searchText, placeholder: '', controller: this.controller})
             .layoutWeight(1)
             .layoutWeight(1)
-          .fontColor(Color.Black)
-          .onChange((value: string) => {
-            this.searchText = value
-            if (this.searchText.length > 0) {
-              this.hasInputContent = true
-            } else {
-              this.hasInputContent = false
-            }
-            if(this.isClickedHistory || this.isClickedHot || this.isClickedRelated){
-              this.isClickedHistory = false
-              this.isClickedHot = false
-              this.isClickedRelated = false
-            }else{
-              this.getRelatedSearchContent()
-            }
-          })
-          .backgroundColor($r('app.color.color_transparent'))
-          .defaultFocus(true)
-          if(this.hasInputContent){
-            Image($r('app.media.search_input_del_icon'))
-              .width('31lpx')
-              .height('31lpx')
-              .objectFit(ImageFit.Cover)
-              .interpolation(ImageInterpolation.High)
-              .onClick(()=>{
-                this.searchText = ""
-                this.hasInputContent = false
+            .height('69lpx')
+            .backgroundColor($r('app.color.color_transparent'))
+            .textFont({ size: "27lpx", weight: "400lpx" })
+            .defaultFocus(true)
+            .caretStyle({color:Color.Pink})
+            .onSubmit((value: string) => {
+              if(StringUtils.isNotEmpty(this.searchText)){
+                SearcherAboutDataModel.putSearchHistoryData(this.searchText)
+                this.getSearchHistoryData()
+                this.getSearchInputResData(this.searchText)
+              }else{
+                if(!this.hasNoSearchTextData){
+                  if(StringUtils.isEmpty(this.curHintSearchData)){
+                    this.curHintSearchData =  this.searchTextData[0]
+                  }
+                  this.getSearchHintResData(this.curHintSearchData)
+                }else{
+                  ToastUtils.shortToast("请输入搜索关键词")
+                }
+              }
+            })
+            .onChange((value: string) => {
+              this.searchText = value
+              if(this.isClickedHistorySearch || this.isClickedHotSearch || this.isClickedRelatedSearch || this.isClickedInputSearch|| this.isClickedHintSearch){
+                this.hasChooseSearch = true
+              }else{
                 this.hasChooseSearch = false
                 this.hasChooseSearch = false
-              })
-          }
+              }
+
+              if (this.searchText.length > 0) {
+                this.hasInputContent = true
+              } else {
+                this.hasInputContent = false
+              }
+
+              if(this.isClickedHistorySearch || this.isClickedHotSearch || this.isClickedRelatedSearch || this.isClickedInputSearch|| this.isClickedHintSearch){
+                this.resetSearch()
+              }else{
+                if(this.hasInputContent){
+                  this.getRelatedSearchContent()
+                }
+              }
+            })
+
         }.padding({right:'30lpx'})
         }.padding({right:'30lpx'})
         .layoutWeight(1)
         .layoutWeight(1)
       }
       }
@@ -241,7 +286,7 @@ export struct SearchComponent {
 
 
       //TODO 需要修改输入法  换行
       //TODO 需要修改输入法  换行
       //右
       //右
-      Text(this.hasInputContent?"搜索":"取消")
+      Text("取消")
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
         .fontWeight('400lpx')
         .fontWeight('400lpx')
         .fontSize('31lpx')
         .fontSize('31lpx')
@@ -250,16 +295,7 @@ export struct SearchComponent {
         .width('125lpx')
         .width('125lpx')
         .height('58lpx')
         .height('58lpx')
         .onClick(() => {
         .onClick(() => {
-          if(this.hasInputContent){
-            if(StringUtils.isNotEmpty(this.searchText)){
-              SearcherAboutDataModel.putSearchHistoryData(this.searchText)
-              this.getSearchHistoryData()
-
-              this.getSearchHotResData(this.searchText)
-            }
-          }else{
-            router.back()
-          }
+          router.back()
         })
         })
     }
     }
     .height('85lpx')
     .height('85lpx')
@@ -289,9 +325,19 @@ export struct SearchComponent {
         }
         }
       }
       }
       this.isGetRequest = true
       this.isGetRequest = true
+     this.resetSearch()
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))
       this.isGetRequest = true
       this.isGetRequest = true
+      this.resetSearch()
     })
     })
   }
   }
+
+  resetSearch(){
+    this.isClickedHistorySearch = false
+    this.isClickedHotSearch = false
+    this.isClickedRelatedSearch = false
+    this.isClickedInputSearch = false
+    this.isClickedHintSearch = false
+  }
 }
 }

@@ -135,6 +135,6 @@ export struct SearchHistoryComponent{
   }
   }
 
 
   getCategoryViewHeight() {
   getCategoryViewHeight() {
-    return `${46 * this.getCategoryRowCount()}lpx`;
+    return `${50 * this.getCategoryRowCount()}lpx`;
   }
   }
 }
 }