desc:搜索 查看更多相似

@@ -95,6 +95,7 @@ export class ContentDTO implements BaseDTO {
   extra: string = ''
   sameContentList:ContentDTO[] = []
   sameContentListJson:string = ""
+  sameContentListSize:number = 0
   /*
      本地辅助字段
    */

 /**
  *   More_Comp
  */
-import { ContentDTO } from 'wdBean/Index';
+import { ContentDTO , contentListParams, FullColumnImgUrlDTO,
+} from 'wdBean/Index';
+import MinePageDatasModel from '../../model/MinePageDatasModel';
+import SearcherAboutDataModel from '../../model/SearcherAboutDataModel';
+import { SearchDescription } from '../../viewmodel/SearchResultContentItem';
 
 const TAG: string = 'More_Comp';
 
@@ -10,17 +14,89 @@ const TAG: string = 'More_Comp';
 export struct MoreComponent {
   @State contentDTO: ContentDTO = new ContentDTO();
 
+  aboutToAppear(): void {
+    this.dealSearchSameList()
+  }
+
   build() {
     Row() {
       Text('点击展开更多相似')
         .fontSize(16)
+      Text(`(${this.contentDTO.sameContentListSize})`)
+        .fontSize(16)
       Image($r('app.media.comment_unfold'))
         .width(16)
         .height(16)
+
     }
     .justifyContent(FlexAlign.Center)
     .width('100%')
     .height(48)
     .backgroundColor(0xffffff)
   }
+
+  dealSearchSameList() {
+    let resultData : SearchDescription[] = JSON.parse(this.contentDTO.sameContentListJson) as SearchDescription[]
+
+    let data: contentListParams = {
+      contentList: []
+    }
+    resultData.forEach((item) => {
+      data.contentList.push({
+        contentId: item.id + '',
+        contentType: Number.parseInt(item.type)
+      })
+    })
+
+    SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
+      newValue.forEach((item) => {
+        resultData.forEach((data) => {
+          if (item.contentId == data.id) {
+            data.collectNum = item.collectNum + ""
+            data.commentNum = item.commentNum + ""
+            data.likeNum = item.likeNum + ""
+            data.readNum = item.readNum + ""
+            data.shareNum = item.shareNum + ""
+          }
+        })
+      })
+      // 批量号主信息
+      let creatorIdList: string[] = []
+      resultData.forEach((value:SearchDescription) => {
+        creatorIdList.push(value.creatorId)
+      })
+      SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => {
+        resultData.forEach((value: SearchDescription) => {
+          const landscape = value.landscape
+          let photos: FullColumnImgUrlDTO[] = []
+          value.appStyleImages.split("&&").forEach((value) => {
+            let resizeParams = MinePageDatasModel.extractResizeParams(value)
+            if(resizeParams && resizeParams.length === 2){
+              photos.push(
+                {
+                  fullUrl: value,
+                  weight:resizeParams[0],
+                  height:resizeParams[1],
+                  landscape: Number(landscape),
+                } as FullColumnImgUrlDTO
+              )
+            }
+          })
+          let contentDTO = MinePageDatasModel.dataTransform(rem,value, photos);
+          if(value.type != "13"){
+            this.contentDTO.sameContentList.push(contentDTO)
+            console.log("ycg","123")
+          }
+        })
+      }).catch((err: Error) => {
+        console.log(TAG, JSON.stringify(err))
+      })
+    }).catch((err: Error) => {
+      console.log(TAG, "请求失败")
+    })
+
+  }
+
 }
+
+

@@ -188,39 +188,37 @@ export struct SearchResultContentComponent {
       resultData.list.forEach((value:SearchResultContentItem) => {
         creatorIdList.push(value.data.creatorId)
       })
-      let isRemain : boolean = false
       SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => {
         resultData.list.forEach((value: SearchResultContentItem) => {
           const landscape = value.data.landscape
           let photos: FullColumnImgUrlDTO[] = []
           // if (value.data.appStyle === 4) {
             value.data.appStyleImages.split("&&").forEach((value) => {
-              const resizeParams = this.extractResizeParams(value)
+              let resizeParams = MinePageDatasModel.extractResizeParams(value)
+              if(resizeParams && resizeParams.length === 2){
                 photos.push(
                   {
                     fullUrl: value,
-                  weight:resizeParams.width,
-                  height:resizeParams.height,
+                    weight:resizeParams[0],
+                    height:resizeParams[1],
                     landscape: Number(landscape),
                   } as FullColumnImgUrlDTO
                 )
+              }
             })
           // }
           let contentDTO = this.dataTransform(rem,value, photos);
           if(value.data.type != "13"){
-            this.tempList.push(contentDTO)
+            this.data.push(contentDTO)
             if(value.data.sameContentList != null && value.data.sameContentList.length > 0) {
               let contentDTO2 = new ContentDTO();
               contentDTO2.sameContentListJson = JSON.stringify(value.data.sameContentList)
-              isRemain = true
-              this.tempList.push(contentDTO2)
+              contentDTO2.sameContentListSize = value.data.sameContentList.length
+              this.data.push(contentDTO2)
             }
           }
         })
-        if(!isRemain){
-          this.tempList.forEach((value) => {
-            this.data.push(value)
-          })
+
           this.tempList = []
           this.data.notifyDataReload()
           this.count = this.data.totalCount()
@@ -230,9 +228,6 @@ export struct SearchResultContentComponent {
             this.hasMore = false
           }
           this.isLoading = false
-        }else{
-          this.dealSameContent(resultData.totalCount)
-        }
       }).catch((err: Error) => {
         console.log(TAG, JSON.stringify(err))
       })
@@ -243,65 +238,6 @@ export struct SearchResultContentComponent {
     })
   }
 
-  async dealSameContent(count:number){
-    this.tempList.forEach(async (tempValue) => {
-      if(StringUtils.isNotEmpty(tempValue.sameContentListJson)){
-        let data: contentListParams = {
-          contentList: []
-        }
-        let resultData : SearchDescription[] = JSON.parse(tempValue.sameContentListJson) as SearchDescription[]
-        if(resultData!=null){
-          resultData.forEach((item) => {
-            data.contentList.push({
-              contentId: item.id + '',
-              contentType: Number.parseInt(item.type)
-            })
-          })
-
-          let newValue = await SearcherAboutDataModel.getInteractListData(data, getContext(this))
-          newValue.forEach((item) => {
-            resultData.forEach((data) => {
-              if (item.contentId == data.id) {
-                data.collectNum = item.collectNum + ""
-                data.commentNum = item.commentNum + ""
-                data.likeNum = item.likeNum + ""
-                data.readNum = item.readNum + ""
-                data.shareNum = item.shareNum + ""
-              }
-            })
-          })
-          let creatorIdList: string[] = []
-          resultData.forEach((value:SearchDescription) => {
-            creatorIdList.push(value.creatorId)
-          })
-          let rem = await SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList})
-          resultData.forEach((value) => {
-            let photos: FullColumnImgUrlDTO[] = []
-            value.appStyleImages.split("&&").forEach((value) => {
-              const resizeParams = this.extractResizeParams(value)
-              photos.push({ fullUrl: value,weight:resizeParams.width,height:resizeParams.height, } as FullColumnImgUrlDTO)
-            })
-            let contentDTO = this.dataTransform2(rem,value, photos);
-            tempValue.sameContentList.push(contentDTO)
-          })
-        }
-      }
-    })
-
-    this.tempList.forEach((value) => {
-      this.data.push(value)
-    })
-    this.tempList = []
-    this.data.notifyDataReload()
-    this.count = this.data.totalCount()
-    if (this.count < count) {
-      this.curPageNum++
-    } else {
-      this.hasMore = false
-    }
-    this.isLoading = false
-  }
-
   build() {
     Column() {
       if (this.count == 0) {
@@ -326,7 +262,7 @@ export struct SearchResultContentComponent {
               Column() {
                 if (this.searchType == "activity") {
                   ActivityItemComponent({ contentDTO: item })
-                }else if(item.sameContentList != null && item.sameContentList.length > 0){
+                }else if(item.sameContentListSize > 0){
                   MoreComponent({ contentDTO: item })
                 } else {
                   CardParser({compDTO:new CompDTO, contentDTO: item })
@@ -553,92 +489,6 @@ export struct SearchResultContentComponent {
         return contentDTO;
   }
 
-  private dataTransform2(rem:CreatorDetailResponseItem[],value: SearchDescription, photos: FullColumnImgUrlDTO[]): ContentDTO {
-    let rmhInfo = this.getRmhInfo2(rem,value)
-    console.log('获取photos',JSON.stringify(photos))
-    console.log('获取value2',JSON.stringify(value))
-    let contentDTO = new ContentDTO();
-    contentDTO.appStyle = value.appStyle + ""
-    contentDTO.cityCode = value.cityCode
-    contentDTO.coverSize = ""
-    contentDTO.coverType = value.type == "5" ? 1 : -1
-    contentDTO.coverUrl =
-      this.searchType == "activity" ? value.zhChannelPageImg : value.appStyleImages.split("&&")[0];
-    contentDTO.description = value.description
-    contentDTO.districtCode = value.districtCode
-    contentDTO.endTime = value.endTime
-    contentDTO.hImageUrl = ""
-    contentDTO.heatValue = ""
-    contentDTO.innerUrl = ""
-    contentDTO.landscape = Number.parseInt(value.landscape)
-    contentDTO.linkUrl = value.linkUrl
-    contentDTO.openLikes = Number.parseInt(value.openLikes)
-    contentDTO.openUrl = ""
-    contentDTO.pageId = value.pageId
-    contentDTO.programAuth = ""
-    contentDTO.programId = ""
-    contentDTO.programName = ""
-    contentDTO.programSource = -1
-    contentDTO.programType = Number.parseInt(value.status)
-    contentDTO.provinceCode = value.provinceCode
-    contentDTO.showTitleEd = value.showTitleEd
-    contentDTO.showTitleIng = value.showTitleIng
-    contentDTO.showTitleNo = value.showTitleNo
-    contentDTO.startTime = value.startTime
-    contentDTO.subType = ""
-    contentDTO.subtitle = ""
-    contentDTO.title = value.title
-    contentDTO.vImageUrl = ""
-    contentDTO.screenType = ""
-    contentDTO.source = StringUtils.isEmpty(value.creatorName) ? value.sourceName : value.creatorName
-    contentDTO.objectId = value.id
-    contentDTO.objectType = value.type
-    contentDTO.channelId = value.channelId
-    contentDTO.relId = value.relId
-    contentDTO.relType = value.relType
-    contentDTO.newsTitle = value.titleLiteral;
-    contentDTO.publishTime =
-      StringUtils.isNotEmpty(value.firstPublishTime) ? value.firstPublishTime : value.publishTime
-    contentDTO.visitorComment = -1
-    contentDTO.fullColumnImgUrls = photos
-    contentDTO.newsSummary = ""
-    contentDTO.hasMore = -1
-    contentDTO.slideShows = []
-    contentDTO.voiceInfo = {} as VoiceInfoDTO
-    contentDTO.tagWord = -1
-    contentDTO.isSelect = true
-    contentDTO.rmhInfo = {} as RmhInfoDTO
-    contentDTO.photoNum = -1
-    contentDTO.liveInfo = {} as LiveInfoDTO;
-    contentDTO.videoInfo = {
-      videoDuration: Number.parseInt(value.duration)
-    } as VideoInfoDTO;
-
-    let interact = new InteractDataDTO()
-    interact.collectNum = value.collectNum
-    interact.commentNum = value.commentNum
-    interact.contentId = value.id
-    interact.contentType = Number.parseInt(value.type)
-    interact.likeNum = value.likeNum
-    interact.readNum = Number.parseInt(value.readNum)
-    interact.shareNum = Number.parseInt(value.shareNum)
-    contentDTO.interactData = interact
-    contentDTO.corner = ''
-    contentDTO.rmhPlatform = 0
-    contentDTO.newTags = ''
-    contentDTO.isSearch = true
-    contentDTO.publishTimestamp = ""
-    contentDTO.bottomNavId = '';
-    contentDTO.openType = '';
-    contentDTO.extra = '';
-    contentDTO.titleShow = value.type == "5" ? 1 : 0;
-    contentDTO.rmhInfo = rmhInfo
-    contentDTO.shareFlag =  value.shareFlag
-    contentDTO.contentText = value.contentText
-    return contentDTO;
-  }
-
-
     // 搜索数据转化rmhInfo
     private getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchResultContentItem){
       let obj = value.data
@@ -695,88 +545,4 @@ export struct SearchResultContentComponent {
       return rmhInfo
     }
 
-  // 搜索数据转化rmhInfo
-  private getRmhInfo2(rem:CreatorDetailResponseItem[],value:SearchDescription){
-    let obj = value
-    let rmhInfo:RmhInfoDTO =  {
-      rmhHeadUrl:obj.headerPhotoUrl,
-      rmhName:obj.creatorName,
-      rmhId:obj.creatorId,
-      authIcon:obj.authIcon,
-      authTitle: obj.authTitle,
-      authTitle2: '',
-      banControl: 0,
-      cnIsAttention: 0,
-      cnAttention: 0,
-      cnlsComment: 0,
-      cnlsLike: 0,
-      cnMainControl: 0,
-      cnShareControl: 0,
-      cnIsComment: 0,
-      cnIsLike:0,
-      posterShareControl: 0,
-      rmhDesc: obj.introduction,
-      userId: obj.userId,
-      userType: obj.userType,
-      honoraryIcon:''
-    }
-    if(rem.length>0){
-      rem.forEach(item=>{
-        if(item.creatorId === obj.creatorId){
-          rmhInfo = {
-            rmhHeadUrl:item.headPhotoUrl,
-            rmhName:item.userName,
-            rmhId:item.creatorId,
-            authIcon:item.authIcon,
-            authTitle: item.authTitle,
-            authTitle2: '',
-            banControl: 0,
-            cnIsAttention:item.isAttention,
-            cnAttention: 0,
-            cnlsComment: 0,
-            cnlsLike: 0,
-            cnMainControl: 0,
-            cnShareControl: 0,
-            cnIsComment: 0,
-            cnIsLike:0,
-            posterShareControl: 0,
-            rmhDesc: item.introduction,
-            userId: item.userId,
-            userType: item.userType,
-            honoraryIcon:''
-          }
-        }
-      })
-    }
-    return rmhInfo
-  }
-
-
-
-  private extractResizeParams(url: string) {
-    const heightRegex = /h_(\d+)/; // 匹配高度参数，如h_450
-    const widthRegex = /w_(\d+)/;  // 匹配宽度参数，如w_800
-    const heightMatch = url.match(heightRegex);
-    const widthMatch = url.match(widthRegex);
-      let height = heightMatch ? `h_${heightMatch[1]}` : undefined
-      let width = widthMatch ? `w_${widthMatch[1]}` : undefined
-      let h:number =0
-      let w:number =0
-      if(height){
-        h = Number(height.split('_')[1])
-      }
-      if(width){
-        w = Number(width.split('_')[1])
-      }
-    interface Obj{
-      width:number;
-      height:number
-    }
-    let obj:Obj = {
-      width:w,
-      height:h
-    }
-    return obj
-  }
-
 }
\ No newline at end of file

@@ -28,6 +28,10 @@ import { MessageUnReadItem } from '../viewmodel/MessageUnReadItem';
 import { HistoryPushDataItem } from '../viewmodel/HistoryPushDataItem';
 import { HashMap } from '@kit.ArkTS';
 import { InteractMessageMItem } from './InteractMessageModel';
+import { FullColumnImgUrlDTO, ContentDTO, RmhInfoDTO, LiveInfoDTO, VideoInfoDTO, InteractDataDTO } from 'wdBean/Index';
+import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO';
+import { CreatorDetailResponseItem } from '../viewmodel/CreatorDetailResponseItem';
+import { SearchDescription } from '../viewmodel/SearchResultContentItem';
 
 const TAG = "MinePageDatasModel"
 
@@ -749,6 +753,169 @@ class MinePageDatasModel{
     return WDHttp.get<ResponseDTO<String>>(url)
   };
 
+
+  extractResizeParams(url: string) :number[]{
+    const heightRegex = /h_(\d+)/; // 匹配高度参数，如h_450
+    const widthRegex = /w_(\d+)/;  // 匹配宽度参数，如w_800
+    const heightMatch = url.match(heightRegex);
+    const widthMatch = url.match(widthRegex);
+    let height = heightMatch ? `h_${heightMatch[1]}` : undefined
+    let width = widthMatch ? `w_${widthMatch[1]}` : undefined
+    let h:number =0
+    let w:number =0
+    if(height){
+      h = Number(height.split('_')[1])
+    }
+    if(width){
+      w = Number(width.split('_')[1])
+    }
+    let arr:number[] = []
+    arr.push(w)
+    arr.push(h)
+
+    return arr
+  }
+
+  dataTransform(rem:CreatorDetailResponseItem[],value: SearchDescription, photos: FullColumnImgUrlDTO[]): ContentDTO {
+    let rmhInfo = this.getRmhInfo(rem,value)
+    console.log('获取photos',JSON.stringify(photos))
+    console.log('获取value2',JSON.stringify(value))
+    let contentDTO = new ContentDTO();
+    contentDTO.appStyle = value.appStyle + ""
+    contentDTO.cityCode = value.cityCode
+    contentDTO.coverSize = ""
+    contentDTO.coverType = value.type == "5" ? 1 : -1
+    contentDTO.coverUrl = value.appStyleImages.split("&&")[0];
+    contentDTO.description = value.description
+    contentDTO.districtCode = value.districtCode
+    contentDTO.endTime = value.endTime
+    contentDTO.hImageUrl = ""
+    contentDTO.heatValue = ""
+    contentDTO.innerUrl = ""
+    contentDTO.landscape = Number.parseInt(value.landscape)
+    contentDTO.linkUrl = value.linkUrl
+    contentDTO.openLikes = Number.parseInt(value.openLikes)
+    contentDTO.openUrl = ""
+    contentDTO.pageId = value.pageId
+    contentDTO.programAuth = ""
+    contentDTO.programId = ""
+    contentDTO.programName = ""
+    contentDTO.programSource = -1
+    contentDTO.programType = Number.parseInt(value.status)
+    contentDTO.provinceCode = value.provinceCode
+    contentDTO.showTitleEd = value.showTitleEd
+    contentDTO.showTitleIng = value.showTitleIng
+    contentDTO.showTitleNo = value.showTitleNo
+    contentDTO.startTime = value.startTime
+    contentDTO.subType = ""
+    contentDTO.subtitle = ""
+    contentDTO.title = value.title
+    contentDTO.vImageUrl = ""
+    contentDTO.screenType = ""
+    contentDTO.source = StringUtils.isEmpty(value.creatorName) ? value.sourceName : value.creatorName
+    contentDTO.objectId = value.id
+    contentDTO.objectType = value.type
+    contentDTO.channelId = value.channelId
+    contentDTO.relId = value.relId
+    contentDTO.relType = value.relType
+    contentDTO.newsTitle = value.titleLiteral;
+    contentDTO.publishTime =
+      StringUtils.isNotEmpty(value.firstPublishTime) ? value.firstPublishTime : value.publishTime
+    contentDTO.visitorComment = -1
+    contentDTO.fullColumnImgUrls = photos
+    contentDTO.newsSummary = ""
+    contentDTO.hasMore = -1
+    contentDTO.slideShows = []
+    contentDTO.voiceInfo = {} as VoiceInfoDTO
+    contentDTO.tagWord = -1
+    contentDTO.isSelect = true
+    contentDTO.rmhInfo = {} as RmhInfoDTO
+    contentDTO.photoNum = -1
+    contentDTO.liveInfo = {} as LiveInfoDTO;
+    contentDTO.videoInfo = {
+      videoDuration: Number.parseInt(value.duration)
+    } as VideoInfoDTO;
+
+    let interact = new InteractDataDTO()
+    interact.collectNum = value.collectNum
+    interact.commentNum = value.commentNum
+    interact.contentId = value.id
+    interact.contentType = Number.parseInt(value.type)
+    interact.likeNum = value.likeNum
+    interact.readNum = Number.parseInt(value.readNum)
+    interact.shareNum = Number.parseInt(value.shareNum)
+    contentDTO.interactData = interact
+    contentDTO.corner = ''
+    contentDTO.rmhPlatform = 0
+    contentDTO.newTags = ''
+    contentDTO.isSearch = true
+    contentDTO.publishTimestamp = ""
+    contentDTO.bottomNavId = '';
+    contentDTO.openType = '';
+    contentDTO.extra = '';
+    contentDTO.titleShow = value.type == "5" ? 1 : 0;
+    contentDTO.rmhInfo = rmhInfo
+    contentDTO.shareFlag =  value.shareFlag
+    contentDTO.contentText = value.contentText
+    return contentDTO;
+  }
+
+  // 搜索数据转化rmhInfo
+  getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchDescription){
+    let obj = value
+    let rmhInfo:RmhInfoDTO =  {
+      rmhHeadUrl:obj.headerPhotoUrl,
+      rmhName:obj.creatorName,
+      rmhId:obj.creatorId,
+      authIcon:obj.authIcon,
+      authTitle: obj.authTitle,
+      authTitle2: '',
+      banControl: 0,
+      cnIsAttention: 0,
+      cnAttention: 0,
+      cnlsComment: 0,
+      cnlsLike: 0,
+      cnMainControl: 0,
+      cnShareControl: 0,
+      cnIsComment: 0,
+      cnIsLike:0,
+      posterShareControl: 0,
+      rmhDesc: obj.introduction,
+      userId: obj.userId,
+      userType: obj.userType,
+      honoraryIcon:''
+    }
+    if(rem.length>0){
+      rem.forEach(item=>{
+        if(item.creatorId === obj.creatorId){
+          rmhInfo = {
+            rmhHeadUrl:item.headPhotoUrl,
+            rmhName:item.userName,
+            rmhId:item.creatorId,
+            authIcon:item.authIcon,
+            authTitle: item.authTitle,
+            authTitle2: '',
+            banControl: 0,
+            cnIsAttention:item.isAttention,
+            cnAttention: 0,
+            cnlsComment: 0,
+            cnlsLike: 0,
+            cnMainControl: 0,
+            cnShareControl: 0,
+            cnIsComment: 0,
+            cnIsLike:0,
+            posterShareControl: 0,
+            rmhDesc: item.introduction,
+            userId: item.userId,
+            userType: item.userType,
+            honoraryIcon:''
+          }
+        }
+      })
+    }
+    return rmhInfo
+  }
+
 }
 
 const minePageDatasModel = MinePageDatasModel.getInstance()