fix:1）搜索 输入wuhuhuan，人民号提示暂无内容，android显示对应结果

@@ -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,  StringUtils,  UserDataLocal } from 'wdKit/Index'
+import { LazyDataSource, StringUtils, UserDataLocal } from 'wdKit/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
@@ -19,8 +19,7 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem'
 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
-import {
-  SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
+import { 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'
 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
@@ -38,7 +37,7 @@ export struct SearchResultContentComponent {
   @State keywords: string = ""
   @State keywords: string = ""
   @State searchType: string = ""
   @State searchType: string = ""
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
-  tempList : ContentDTO[] = []
+  tempList: ContentDTO[] = []
   @State data_rmh: SearchRmhDescription[] = []
   @State data_rmh: SearchRmhDescription[] = []
   @State count: number = -1;
   @State count: number = -1;
   @State isLoading: boolean = false
   @State isLoading: boolean = false
@@ -48,14 +47,14 @@ export struct SearchResultContentComponent {
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
   private scroller2: Scroller = new Scroller()
   private scroller2: Scroller = new Scroller()
   @State ellipseW: number = 0
   @State ellipseW: number = 0
-  @State moreWidth:number = 20
+  @State moreWidth: number = 20
   @State listLeft: number = 0
   @State listLeft: number = 0
   @State isEnd: boolean = false
   @State isEnd: boolean = false
-  @Watch('updateData') @Prop sameSearch:number = 0
-  @Prop isCurrentShow:boolean = false;
+  @Watch('updateData') @Prop sameSearch: number = 0
+  @Prop isCurrentShow: boolean = false;
 
 
-  updateData(){
-    if(this.isCurrentShow){
+  updateData() {
+    if (this.isCurrentShow) {
       this.data_rmh = []
       this.data_rmh = []
 
 
       this.data.clearAllData()
       this.data.clearAllData()
@@ -115,7 +114,7 @@ export struct SearchResultContentComponent {
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
                       data.mainControl = item.mainControl + ""
                       data.mainControl = item.mainControl + ""
 
 
-                      if(data_temp.length === 1){
+                      if (data_temp.length === 1) {
                         this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0]
                         this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0]
                         this.bean.cnUserName = item.userName
                         this.bean.cnUserName = item.userName
                         this.bean.creatorId = item.creatorId
                         this.bean.creatorId = item.creatorId
@@ -133,8 +132,8 @@ export struct SearchResultContentComponent {
                         } else {
                         } else {
                           this.bean.cnFansNum = item.fansNum + ""
                           this.bean.cnFansNum = item.fansNum + ""
                         }
                         }
-                        let regex:RegExp = new RegExp('\n','g')
-                        this.bean.introduction = item.introduction.replace(regex,'')
+                        let regex: RegExp = new RegExp('\n', 'g')
+                        this.bean.introduction = item.introduction.replace(regex, '')
 
 
                         this.bean.mainControl = item.mainControl
                         this.bean.mainControl = item.mainControl
                         this.bean.banControl = item.banControl
                         this.bean.banControl = item.banControl
@@ -148,9 +147,13 @@ export struct SearchResultContentComponent {
               data_temp.forEach((data) => {
               data_temp.forEach((data) => {
                 this.data_rmh.push(data)
                 this.data_rmh.push(data)
               })
               })
+
+              if(this.data_rmh.length > 0){
+                this.count = 1
+              }
               //只有一条创作者，获取 创作者信息
               //只有一条创作者，获取 创作者信息
               if (this.data_rmh.length === 1) {
               if (this.data_rmh.length === 1) {
-                if(StringUtils.isNotEmpty(UserDataLocal.getUserId())){
+                if (StringUtils.isNotEmpty(UserDataLocal.getUserId())) {
                   //查询是否被关注
                   //查询是否被关注
                   let status = new FollowListStatusRequestItem()
                   let status = new FollowListStatusRequestItem()
                   status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId))
                   status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId))
@@ -159,7 +162,7 @@ export struct SearchResultContentComponent {
                   }).catch((err: Error) => {
                   }).catch((err: Error) => {
                     console.log(TAG, "请求失败")
                     console.log(TAG, "请求失败")
                   })
                   })
-                }else{
+                } else {
                   this.bean.status = ""
                   this.bean.status = ""
                 }
                 }
               }
               }
@@ -192,53 +195,55 @@ export struct SearchResultContentComponent {
       })
       })
     })
     })
 
 
-    SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
-      newValue.forEach((item) => {
-        resultData.list.forEach((data) => {
-          if (item.contentId == data.data.id) {
-            data.data.collectNum = item.collectNum + ""
-            data.data.commentNum = item.commentNum + ""
-            data.data.likeNum = item.likeNum + ""
-            data.data.readNum = item.readNum + ""
-            data.data.shareNum = item.shareNum + ""
-          }
+    if (data.contentList.length > 0) {
+
+      SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
+        newValue.forEach((item) => {
+          resultData.list.forEach((data) => {
+            if (item.contentId == data.data.id) {
+              data.data.collectNum = item.collectNum + ""
+              data.data.commentNum = item.commentNum + ""
+              data.data.likeNum = item.likeNum + ""
+              data.data.readNum = item.readNum + ""
+              data.data.shareNum = item.shareNum + ""
+            }
+          })
         })
         })
-      })
-      // 批量号主信息
-      let creatorIdList: string[] = []
-      resultData.list.forEach((value:SearchResultContentItem) => {
-        creatorIdList.push(value.data.creatorId)
-      })
-      SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => {
+        // 批量号主信息
+        let creatorIdList: string[] = []
         resultData.list.forEach((value: SearchResultContentItem) => {
         resultData.list.forEach((value: SearchResultContentItem) => {
-          const landscape = value.data.landscape
-          let photos: FullColumnImgUrlDTO[] = []
-          // if (value.data.appStyle === 4) {
+          creatorIdList.push(value.data.creatorId)
+        })
+        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) => {
             value.data.appStyleImages.split("&&").forEach((value) => {
               let resizeParams = MinePageDatasModel.extractResizeParams(value)
               let resizeParams = MinePageDatasModel.extractResizeParams(value)
-              if(resizeParams && resizeParams.length === 2){
+              if (resizeParams && resizeParams.length === 2) {
                 photos.push(
                 photos.push(
                   {
                   {
                     fullUrl: value,
                     fullUrl: value,
-                    weight:resizeParams[0],
-                    height:resizeParams[1],
+                    weight: resizeParams[0],
+                    height: resizeParams[1],
                     landscape: Number(landscape),
                     landscape: Number(landscape),
                   } as FullColumnImgUrlDTO
                   } as FullColumnImgUrlDTO
                 )
                 )
               }
               }
             })
             })
-          // }
-          let contentDTO = this.dataTransform(rem,value, photos);
-          if(value.data.type != "13"){
-            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)
-              contentDTO2.sameContentListSize = value.data.sameContentList.length
-              this.data.push(contentDTO2)
+            // }
+            let contentDTO = this.dataTransform(rem, value, photos);
+            if (value.data.type != "13") {
+              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)
+                contentDTO2.sameContentListSize = value.data.sameContentList.length
+                this.data.push(contentDTO2)
+              }
             }
             }
-          }
-        })
+          })
 
 
           this.tempList = []
           this.tempList = []
           this.data.notifyDataReload()
           this.data.notifyDataReload()
@@ -249,14 +254,17 @@ export struct SearchResultContentComponent {
             this.hasMore = false
             this.hasMore = false
           }
           }
           this.isLoading = false
           this.isLoading = false
+        }).catch((err: Error) => {
+          console.log(TAG, JSON.stringify(err))
+        })
       }).catch((err: Error) => {
       }).catch((err: Error) => {
-        console.log(TAG, JSON.stringify(err))
+        console.log(TAG, "请求失败")
+        this.isLoading = false
+        this.count = this.count === -1 ? 0 : this.count
       })
       })
-    }).catch((err: Error) => {
-      console.log(TAG, "请求失败")
-      this.isLoading = false
-      this.count = this.count === -1 ? 0 : this.count
-    })
+    }else {
+      this.hasMore = false
+    }
   }
   }
 
 
   build() {
   build() {
@@ -264,15 +272,15 @@ export struct SearchResultContentComponent {
       if (this.count == 0) {
       if (this.count == 0) {
         ListHasNoMoreDataUI({ style: 2 })
         ListHasNoMoreDataUI({ style: 2 })
       } else {
       } else {
-        List({scroller:this.scroller2}) {
-          if (this.data_rmh != null && this.data_rmh.length > 0){
-            if (this.data_rmh.length === 1){
-              ListItem(){
+        List({ scroller: this.scroller2 }) {
+          if (this.data_rmh != null && this.data_rmh.length > 0) {
+            if (this.data_rmh.length === 1) {
+              ListItem() {
                 FollowChildComponent({ data: this.bean, type: 1 })
                 FollowChildComponent({ data: this.bean, type: 1 })
-              }.padding({left:"31lpx",right:"31lpx"})
-            }else{
-              ListItem(){
-                Column(){
+              }.padding({ left: "31lpx", right: "31lpx" })
+            } else {
+              ListItem() {
+                Column() {
                   this.SearchListUI()
                   this.SearchListUI()
                 }
                 }
               }
               }
@@ -283,21 +291,26 @@ export struct SearchResultContentComponent {
               Column() {
               Column() {
                 if (this.searchType == "activity") {
                 if (this.searchType == "activity") {
                   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: "" })
+                } else if (item.appStyle == "9") {
+                  Column() {
+                    Card9Component({
+                      compDTO: new CompDTO,
+                      contentDTO: item,
+                      pageId: "",
+                      pageName: ""
+                    })
                     Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
                     Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
                   }
                   }
                 } else {
                 } else {
-                  if(this.data?.get(index + 1)?.sameContentListSize > 0) {
+                  if (this.data?.get(index + 1)?.sameContentListSize > 0) {
                     Divider()
                     Divider()
                       .width('100%')
                       .width('100%')
                       .color($r('app.color.color_F5F5F5'))
                       .color($r('app.color.color_F5F5F5'))
                       .strokeWidth(4)
                       .strokeWidth(4)
                   }
                   }
-                  CardParser({compDTO:new CompDTO, contentDTO: item })
+                  CardParser({ compDTO: new CompDTO, contentDTO: item })
                 }
                 }
                 if (index != this.data.totalCount() - 1) {
                 if (index != this.data.totalCount() - 1) {
                   Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
                   Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -312,7 +325,7 @@ export struct SearchResultContentComponent {
           }, (item: ContentDTO, index: number) => index.toString())
           }, (item: ContentDTO, index: number) => index.toString())
 
 
           //没有更多数据  显示提示
           //没有更多数据  显示提示
-          if (!this.hasMore && this.data.totalCount() > 0) {
+          if (!this.hasMore && (this.data.totalCount() > 0|| (this.data_rmh != null && this.data_rmh.length > 0))) {
             ListItem() {
             ListItem() {
               ListHasNoMoreDataUI()
               ListHasNoMoreDataUI()
             }
             }
@@ -320,6 +333,7 @@ export struct SearchResultContentComponent {
         }.cachedCount(5)
         }.cachedCount(5)
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)
+        .height('100%')
         .onReachEnd(() => {
         .onReachEnd(() => {
           console.log(TAG, "触底了");
           console.log(TAG, "触底了");
           if (!this.isLoading) {
           if (!this.isLoading) {
@@ -334,23 +348,23 @@ export struct SearchResultContentComponent {
 
 
   @Builder
   @Builder
   SearchListUI() {
   SearchListUI() {
-    List({initialIndex: 0,space:'8lpx',scroller: this.scroller}) {
-      ListItemGroup(){
+    List({ initialIndex: 0, space: '8lpx', scroller: this.scroller }) {
+      ListItemGroup() {
         ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
         ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
           ListItem() {
           ListItem() {
-            SearchCreatorComponent({item:item})
+            SearchCreatorComponent({ item: item })
           }
           }
           .width('150lpx')
           .width('150lpx')
           .height('100%')
           .height('100%')
         })
         })
       }.offset({ left: this.listLeft })
       }.offset({ left: this.listLeft })
 
 
-      ListItem(){
-        if (this.data_rmh.length === 10){
+      ListItem() {
+        if (this.data_rmh.length === 10) {
           this.itemEnd()
           this.itemEnd()
         }
         }
       }.height('100%')
       }.height('100%')
-      .margin({left:'23lpx'})
+      .margin({ left: '23lpx' })
     }
     }
     .edgeEffect(EdgeEffect.None)
     .edgeEffect(EdgeEffect.None)
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
@@ -359,10 +373,10 @@ export struct SearchResultContentComponent {
     .height('219lpx')
     .height('219lpx')
     .onReachEnd(() => {
     .onReachEnd(() => {
       this.isEnd = true
       this.isEnd = true
-      console.log(TAG,'is end')
+      console.log(TAG, 'is end')
     })
     })
     .onScrollFrameBegin((offset: number, state: ScrollState) => {
     .onScrollFrameBegin((offset: number, state: ScrollState) => {
-      console.log(TAG,'offset', offset)
+      console.log(TAG, 'offset', offset)
       if (!this.scroller.isAtEnd()) {
       if (!this.scroller.isAtEnd()) {
         this.isEnd = false
         this.isEnd = false
       }
       }
@@ -374,31 +388,35 @@ export struct SearchResultContentComponent {
     .parallelGesture(
     .parallelGesture(
       PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
       PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
         .onActionStart((event: GestureEvent) => {
         .onActionStart((event: GestureEvent) => {
-          console.info(TAG,'Pan start')
+          console.info(TAG, 'Pan start')
         })
         })
         .onActionUpdate((event: GestureEvent) => {
         .onActionUpdate((event: GestureEvent) => {
           ///小于10个不展示滑动
           ///小于10个不展示滑动
-          if (this.data_rmh.length < 10) return;
+          if (this.data_rmh.length < 10) {
+            return;
+          }
           if (event && this.isEnd) {
           if (event && this.isEnd) {
             // console.log('event.offsetX',event.offsetX)
             // console.log('event.offsetX',event.offsetX)
             this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
             this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
             this.ellipseW = (-this.listLeft) / 1.5
             this.ellipseW = (-this.listLeft) / 1.5
 
 
-            console.log(TAG,"this.ellipseW==>" + this.ellipseW)
+            console.log(TAG, "this.ellipseW==>" + this.ellipseW)
           }
           }
         })
         })
         .onActionEnd((event: GestureEvent) => {
         .onActionEnd((event: GestureEvent) => {
-          if (this.data_rmh.length < 10) return;
-          console.info(TAG,'Pan end')
+          if (this.data_rmh.length < 10) {
+            return;
+          }
+          console.info(TAG, 'Pan end')
           this.listLeft = 0
           this.listLeft = 0
           // this.moreWidth = 20
           // this.moreWidth = 20
 
 
-          if (event.offsetX < 0 && this.ellipseW >=20) {
-            console.log(TAG,'跳转')
+          if (event.offsetX < 0 && this.ellipseW >= 20) {
+            console.log(TAG, '跳转')
             let params: Params = {
             let params: Params = {
               pageID: this.keywords
               pageID: this.keywords
             }
             }
-            WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
+            WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage, params)
           }
           }
           this.ellipseW = 0
           this.ellipseW = 0
         })
         })
@@ -411,18 +429,17 @@ export struct SearchResultContentComponent {
       .strokeWidth('12lpx')
       .strokeWidth('12lpx')
   }
   }
 
 
-
   @Builder
   @Builder
   itemEnd() {
   itemEnd() {
     Row() {
     Row() {
       Ellipse()
       Ellipse()
-        .width(2* this.ellipseW)
+        .width(2 * this.ellipseW)
         .height('100%')
         .height('100%')
         .fill('rgb(240,235,238)')
         .fill('rgb(240,235,238)')
         .position({ left: -this.ellipseW, top: 0 })
         .position({ left: -this.ellipseW, top: 0 })
 
 
-      Column(){
-        Text(this.ellipseW === 0 ? '' : this.ellipseW < 20? '查看更多' : '松手查看')
+      Column() {
+        Text(this.ellipseW === 0 ? '' : this.ellipseW < 20 ? '查看更多' : '松手查看')
           .width('19lpx')
           .width('19lpx')
           .fontSize('19lpx')
           .fontSize('19lpx')
           .fontWeight('400lpx')
           .fontWeight('400lpx')
@@ -437,153 +454,153 @@ export struct SearchResultContentComponent {
     .height('100%')
     .height('100%')
   }
   }
 
 
-   private dataTransform(rem:CreatorDetailResponseItem[],value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
-        let rmhInfo = this.getRmhInfo(rem,value)
-     console.log('获取photos',JSON.stringify(photos))
-      console.log('获取value2',JSON.stringify(value))
-        let liveType = value.data?.liveType;
-        let seoTags = value.data?.seoTags
-        let cornerMark = value.data?.cornerMark
-        let contentDTO = new ContentDTO();
-        contentDTO.liveType = liveType?liveType: ""
-        contentDTO.seoTags = seoTags?seoTags: ""
-        contentDTO.cornerMark = cornerMark?cornerMark: ""
-        contentDTO.appStyle = value.data.appStyle + ""
-        contentDTO.cityCode = value.data.cityCode
-        contentDTO.coverSize = ""
-        contentDTO.coverType = value.data.type == "5" ? 1 : -1
-        contentDTO.coverUrl =
-          this.searchType == "activity" ? value.data.zhChannelPageImg : value.data.appStyleImages.split("&&")[0];
-        contentDTO.description = value.data.description
-        contentDTO.districtCode = value.data.districtCode
-        contentDTO.endTime = value.data.endTime
-        contentDTO.hImageUrl = ""
-        contentDTO.heatValue = ""
-        contentDTO.innerUrl = ""
-        contentDTO.landscape = Number.parseInt(value.data.landscape)
-        contentDTO.linkUrl = value.data.linkUrl
-        contentDTO.openLikes = Number.parseInt(value.data.openLikes)
-        contentDTO.openUrl = ""
-        contentDTO.pageId = value.data.pageId
-        contentDTO.programAuth = ""
-        contentDTO.programId = ""
-        contentDTO.programName = ""
-        contentDTO.programSource = -1
-        contentDTO.programType = Number.parseInt(value.data.status)
-        contentDTO.provinceCode = value.data.provinceCode
-        contentDTO.showTitleEd = value.data.showTitleEd
-        contentDTO.showTitleIng = value.data.showTitleIng
-        contentDTO.showTitleNo = value.data.showTitleNo
-        contentDTO.startTime = value.data.startTime
-        contentDTO.subType = ""
-        contentDTO.subtitle = ""
-        contentDTO.title = value.data.title
-        contentDTO.vImageUrl = ""
-        contentDTO.screenType = ""
-        contentDTO.source = StringUtils.isEmpty(value.data.creatorName) ? value.data.sourceName : value.data.creatorName
-        contentDTO.objectId = value.data.id
-        contentDTO.objectType = value.data.type
-        contentDTO.channelId = value.data.channelId
-        contentDTO.relId = value.data.relId
-        contentDTO.relType = value.data.relType
-        contentDTO.newsTitle = value.data.titleLiteral;
-        contentDTO.publishTime =
-          StringUtils.isNotEmpty(value.data.firstPublishTime) ? value.data.firstPublishTime : value.data.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 = StringUtils.isEmpty(value.data.picCount) ? 0 : Number(value.data.picCount)
-        contentDTO.liveInfo = {} as LiveInfoDTO;
-        contentDTO.videoInfo = {
-          videoDuration: Number.parseInt(value.data.duration)
-        } as VideoInfoDTO;
-
-        let interact = new InteractDataDTO()
-        interact.collectNum = value.data.collectNum
-        interact.commentNum = value.data.commentNum
-        interact.contentId = value.data.id
-        interact.contentType = Number.parseInt(value.data.type)
-        interact.likeNum = value.data.likeNum
-        interact.readNum = Number.parseInt(value.data.readNum)
-        interact.shareNum = Number.parseInt(value.data.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.data.titleShow == "1" ? 0 : 1
-        contentDTO.rmhInfo = rmhInfo
-        contentDTO.shareFlag =  value.data.shareFlag
-        contentDTO.contentText = value.data.contentText
-        return contentDTO;
+  private dataTransform(rem: CreatorDetailResponseItem[], value: SearchResultContentItem,
+    photos: FullColumnImgUrlDTO[]): ContentDTO {
+    let rmhInfo = this.getRmhInfo(rem, value)
+    console.log('获取photos', JSON.stringify(photos))
+    console.log('获取value2', JSON.stringify(value))
+    let liveType = value.data?.liveType;
+    let seoTags = value.data?.seoTags
+    let cornerMark = value.data?.cornerMark
+    let contentDTO = new ContentDTO();
+    contentDTO.liveType = liveType ? liveType : ""
+    contentDTO.seoTags = seoTags ? seoTags : ""
+    contentDTO.cornerMark = cornerMark ? cornerMark : ""
+    contentDTO.appStyle = value.data.appStyle + ""
+    contentDTO.cityCode = value.data.cityCode
+    contentDTO.coverSize = ""
+    contentDTO.coverType = value.data.type == "5" ? 1 : -1
+    contentDTO.coverUrl =
+      this.searchType == "activity" ? value.data.zhChannelPageImg : value.data.appStyleImages.split("&&")[0];
+    contentDTO.description = value.data.description
+    contentDTO.districtCode = value.data.districtCode
+    contentDTO.endTime = value.data.endTime
+    contentDTO.hImageUrl = ""
+    contentDTO.heatValue = ""
+    contentDTO.innerUrl = ""
+    contentDTO.landscape = Number.parseInt(value.data.landscape)
+    contentDTO.linkUrl = value.data.linkUrl
+    contentDTO.openLikes = Number.parseInt(value.data.openLikes)
+    contentDTO.openUrl = ""
+    contentDTO.pageId = value.data.pageId
+    contentDTO.programAuth = ""
+    contentDTO.programId = ""
+    contentDTO.programName = ""
+    contentDTO.programSource = -1
+    contentDTO.programType = Number.parseInt(value.data.status)
+    contentDTO.provinceCode = value.data.provinceCode
+    contentDTO.showTitleEd = value.data.showTitleEd
+    contentDTO.showTitleIng = value.data.showTitleIng
+    contentDTO.showTitleNo = value.data.showTitleNo
+    contentDTO.startTime = value.data.startTime
+    contentDTO.subType = ""
+    contentDTO.subtitle = ""
+    contentDTO.title = value.data.title
+    contentDTO.vImageUrl = ""
+    contentDTO.screenType = ""
+    contentDTO.source = StringUtils.isEmpty(value.data.creatorName) ? value.data.sourceName : value.data.creatorName
+    contentDTO.objectId = value.data.id
+    contentDTO.objectType = value.data.type
+    contentDTO.channelId = value.data.channelId
+    contentDTO.relId = value.data.relId
+    contentDTO.relType = value.data.relType
+    contentDTO.newsTitle = value.data.titleLiteral;
+    contentDTO.publishTime =
+      StringUtils.isNotEmpty(value.data.firstPublishTime) ? value.data.firstPublishTime : value.data.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 = StringUtils.isEmpty(value.data.picCount) ? 0 : Number(value.data.picCount)
+    contentDTO.liveInfo = {} as LiveInfoDTO;
+    contentDTO.videoInfo = {
+      videoDuration: Number.parseInt(value.data.duration)
+    } as VideoInfoDTO;
+
+    let interact = new InteractDataDTO()
+    interact.collectNum = value.data.collectNum
+    interact.commentNum = value.data.commentNum
+    interact.contentId = value.data.id
+    interact.contentType = Number.parseInt(value.data.type)
+    interact.likeNum = value.data.likeNum
+    interact.readNum = Number.parseInt(value.data.readNum)
+    interact.shareNum = Number.parseInt(value.data.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.data.titleShow == "1" ? 0 : 1
+    contentDTO.rmhInfo = rmhInfo
+    contentDTO.shareFlag = value.data.shareFlag
+    contentDTO.contentText = value.data.contentText
+    return contentDTO;
   }
   }
 
 
-    // 搜索数据转化rmhInfo
-    private getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchResultContentItem){
-      let obj = value.data
-      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:'',
-        rmhPlatform:0
-      }
-      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:'',
-              rmhPlatform:0
-            }
+  // 搜索数据转化rmhInfo
+  private getRmhInfo(rem: CreatorDetailResponseItem[], value: SearchResultContentItem) {
+    let obj = value.data
+    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: '',
+      rmhPlatform: 0
+    }
+    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: '',
+            rmhPlatform: 0
           }
           }
-        })
-      }
-      return rmhInfo
+        }
+      })
     }
     }
-
+    return rmhInfo
+  }
 }
 }