Merge remote-tracking branch 'origin/main'

@@ -7,6 +7,7 @@ import MinePageDatasModel from '../../model/MinePageDatasModel';
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel';
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel';
 import { SearchDescription } from '../../viewmodel/SearchResultContentItem';
 import { SearchDescription } from '../../viewmodel/SearchResultContentItem';
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
+import { Card9Component } from './Card9Component';
 
 
 const TAG: string = 'More_Comp';
 const TAG: string = 'More_Comp';
 
 
@@ -23,7 +24,11 @@ export struct MoreComponent {
   build() {
   build() {
     if (this.showDetail) {
     if (this.showDetail) {
       ForEach(this.contentDTO.sameContentList, (item: ContentDTO, index: number) => {
       ForEach(this.contentDTO.sameContentList, (item: ContentDTO, index: number) => {
+        if (item.appStyle !== "9") {
           CardParser({compDTO:new CompDTO, contentDTO: item })
           CardParser({compDTO:new CompDTO, contentDTO: item })
+        } else {
+          Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
+        }
       })
       })
     } else {
     } else {
       Column() {
       Column() {

@@ -43,7 +43,8 @@ export struct SearchComponent {
     this.getSearchHistoryData()
     this.getSearchHistoryData()
 
 
     let intervalID = setInterval(() => {
     let intervalID = setInterval(() => {
-      sendEventByKey("searchId", 10, "")
+      // sendEventByKey("searchId", 10, "")  //这个报错 暂时替换下面这个
+      focusControl.requestFocus('searchId')
       clearInterval(intervalID);
       clearInterval(intervalID);
     }, 1000);
     }, 1000);
   }
   }

@@ -10,7 +10,7 @@ import {
 } from 'wdBean/Index'
 } from 'wdBean/Index'
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
-import { LazyDataSource, Logger, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
+import { LazyDataSource,  StringUtils,  UserDataLocal } from 'wdKit/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
@@ -21,7 +21,6 @@ import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusReq
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import {
 import {
-  SearchDescription,
   SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
   SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
 import { FollowChildComponent } from '../mine/follow/FollowChildComponent'
 import { FollowChildComponent } from '../mine/follow/FollowChildComponent'
@@ -30,6 +29,7 @@ import { ActivityItemComponent } from './ActivityItemComponent'
 import { SearchCreatorComponent } from './SearchCreatorComponent'
 import { SearchCreatorComponent } from './SearchCreatorComponent'
 import { JSON } from '@kit.ArkTS'
 import { JSON } from '@kit.ArkTS'
 import { MoreComponent } from '../cardview/MoreComponent'
 import { MoreComponent } from '../cardview/MoreComponent'
+import { Card9Component } from '../cardview/Card9Component'
 
 
 const TAG = "SearchResultContentComponent"
 const TAG = "SearchResultContentComponent"
 
 
@@ -264,6 +264,11 @@ export struct SearchResultContentComponent {
                   ActivityItemComponent({ contentDTO: item })
                   ActivityItemComponent({ contentDTO: item })
                 }else if(item.sameContentListSize > 0){
                 }else if(item.sameContentListSize > 0){
                   MoreComponent({ contentDTO: item })
                   MoreComponent({ contentDTO: item })
+                }else if(item.appStyle == "9"){
+                  Column(){
+                    Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
+                    Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+                  }
                 } else {
                 } else {
                   CardParser({compDTO:new CompDTO, contentDTO: item })
                   CardParser({compDTO:new CompDTO, contentDTO: item })
                 }
                 }
@@ -482,7 +487,7 @@ export struct SearchResultContentComponent {
         contentDTO.bottomNavId = '';
         contentDTO.bottomNavId = '';
         contentDTO.openType = '';
         contentDTO.openType = '';
         contentDTO.extra = '';
         contentDTO.extra = '';
-        contentDTO.titleShow = value.data.type == "5" ? 1 : 0;
+        contentDTO.titleShow = value.data.titleShow == "1" ? 0 : 1
         contentDTO.rmhInfo = rmhInfo
         contentDTO.rmhInfo = rmhInfo
         contentDTO.shareFlag =  value.data.shareFlag
         contentDTO.shareFlag =  value.data.shareFlag
         contentDTO.contentText = value.data.contentText
         contentDTO.contentText = value.data.contentText

@@ -853,7 +853,7 @@ class MinePageDatasModel{
     contentDTO.bottomNavId = '';
     contentDTO.bottomNavId = '';
     contentDTO.openType = '';
     contentDTO.openType = '';
     contentDTO.extra = '';
     contentDTO.extra = '';
-    contentDTO.titleShow = value.type == "5" ? 1 : 0;
+    contentDTO.titleShow = value.titleShow == "1" ? 0 : 1
     contentDTO.rmhInfo = rmhInfo
     contentDTO.rmhInfo = rmhInfo
     contentDTO.shareFlag =  value.shareFlag
     contentDTO.shareFlag =  value.shareFlag
     contentDTO.contentText = value.contentText
     contentDTO.contentText = value.contentText