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

* 'main' of http://192.168.1.42/developOne/harmonyPool: pulltorefresh升级库；lottie库集成合并图集无网络缺省图修改 fix:1）搜索输入wuhuhuan，人民号提示暂无内容，android显示对应结果解决搜索页面，appfreeze、crash问题

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main
* 'main' of http://192.168.1.42/developOne/harmonyPool: pulltorefresh升级库；lottie库集成合并图集无网络缺省图修改 fix:1）搜索输入wuhuhuan，人民号提示暂无内容，android显示对应结果解决搜索页面，appfreeze、crash问题
wangliang_wd
Commit bdd325b2abfc8437b8c9420a0050b5806589c590 bdd325b2 2 parents 309836de cf278702
Showing 14 changed files with 137 additions and 448 deletions
sight_harmony/features/wdComponent/oh-package.json5
sight_harmony/features/wdComponent/src/main/ets/components/ImageDownloadComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailItemComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/EmptyComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/ImageItemView.ets
sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
sight_harmony/features/wdDetailPlayLive/oh-package.json5
sight_harmony/features/wdDetailPlayShortVideo/oh-package.json5
sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/DetailVideoListPage.ets
sight_harmony/oh-package.json5
sight_harmony/products/phone/oh-package.json5
sight_harmony/products/phone/src/main/ets/pages/view/MultiPictureDetailPageComponent.ets
--- a/sight_harmony/features/wdComponent/oh-package.json5
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/oh-package.json5
View file @bdd325b
@@ -7,7 +7,6 @@
   "main": "Index.ets",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/lottie": "2.0.10",
     "wdConstant": "file:../../commons/wdConstant",
     "wdPlayer": "file:../../features/wdPlayer",
     "wdLogin": "file:../../features/wdLogin",
--- a/sight_harmony/features/wdComponent/src/main/ets/components/ImageDownloadComponent.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/ImageDownloadComponent.ets
View file @bdd325b
@@ -5,6 +5,7 @@ import { promptAction } from '@kit.ArkUI';
 import { image } from '@kit.ImageKit';
 import { photoAccessHelper } from '@kit.MediaLibraryKit';
 import fs from '@ohos.file.fs';
+import { NetworkUtil } from 'wdKit';
 const PERMISSIONS: Array<Permissions> = [
   'ohos.permission.READ_IMAGEVIDEO',
@@ -47,8 +48,13 @@ export struct ImageDownloadComponent {
   }
   aboutToAppear(): void {
+    // 注册监听网络连接
+    let netStatus = NetworkUtil.isNetConnected()
+    if (netStatus) {
+      // 有网络
       this.onChangeUrl()
     }
+  }
   async onChangeUrl(): Promise<void> {
     console.info(`cj2024 图片下载 ${this.url}`)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailItemComponent.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailItemComponent.ets
View file @bdd325b
@@ -27,6 +27,7 @@ export struct MultiPictureDetailItemComponent {
   private MultiPictureDetailItem: PhotoListBean = {} as PhotoListBean
   //alt app.media.picture_loading 设计稿尺寸
   @State imageWidth:string | number = 167
+  private scroller: Scroller = new Scroller()
   async aboutToAppear() {
@@ -179,6 +180,7 @@ export struct MultiPictureDetailItemComponent {
   build() {
     Row() {
+      Scroll(this.scroller) {
         if(this.imageUri != null && (this.imageUri.includes('.gif') || this.imageUri.includes('.GIF'))){
           Image(this.imageUri)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
             .alt($r('app.media.datail_imageLoading_w'))
@@ -197,7 +199,7 @@ export struct MultiPictureDetailItemComponent {
               this.imageWidth = '100%'
             })
         }else{
-        Image(this.imagePixelMap)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
+          Image(this.imagePixelMap || 'app.media.datail_imageLoading_w')// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
             .alt($r('app.media.datail_imageLoading_w'))
             .width(this.imageWidth)
             .objectFit(ImageFit.Auto)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
@@ -215,6 +217,10 @@ export struct MultiPictureDetailItemComponent {
             })
         }
       }
+      .scrollable(ScrollDirection.Vertical)
+      .scrollBarWidth(0)
+      .height(this.imageDefaultSize.height || "100%")
+    }
     .onBlur(() => {
       this.resetCurrentImageInfo();
     })
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
View file @bdd325b
@@ -66,31 +66,31 @@ export struct SearchComponent {
     this.breakpointSystem.unregister();
   }
-  getRelatedSearchContent() {
-    if (StringUtils.isNotEmpty(this.searchText)) {
-      SearcherAboutDataModel.getRelatedSearchContentData(encodeURI(this.searchText), getContext(this)).then((value) => {
+  getRelatedSearchContent(searchText: string) {
+    if (StringUtils.isNotEmpty(searchText)) {
+      SearcherAboutDataModel.getRelatedSearchContentData(encodeURI(searchText), getContext(this)).then((value) => {
         if (value != null && value.length > 0) {
           this.relatedSearchContentsData = []
           value.forEach(item => {
             let tempValue: string = item
             let tempArr: string[] = []
-            if (tempValue.indexOf(this.searchText) === -1) {
+            if (tempValue.indexOf(searchText) === -1) {
               tempArr.push(item)
               this.relatedSearchContentsData.push(new SearchRelatedItem(item, tempArr))
             } else {
-              while (tempValue.indexOf(this.searchText) != -1) {
-                let index = tempValue.indexOf(this.searchText)
+              while (tempValue.indexOf(searchText) != -1) {
+                let index = tempValue.indexOf(searchText)
                 if (index === 0) {
                   try {
-                    tempArr.push(this.searchText)
-                    tempValue = tempValue.substring(this.searchText.length, tempValue.length)
+                    tempArr.push(searchText)
+                    tempValue = tempValue.substring(searchText.length, tempValue.length)
                   } catch (e) {
                   }
                 } else {
                   try {
                     tempArr.push(tempValue.substring(0, index))
-                    tempArr.push(this.searchText)
-                    tempValue = tempValue.substring(index + this.searchText.length, tempValue.length)
+                    tempArr.push(searchText)
+                    tempValue = tempValue.substring(index + searchText.length, tempValue.length)
                   } catch (e) {
                   }
                 }
@@ -356,7 +356,7 @@ export struct SearchComponent {
                 this.resetSearch()
               } else {
                 if (this.hasInputContent) {
-                  this.getRelatedSearchContent()
+                  this.getRelatedSearchContent(value)
                 }
               }
             })
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @bdd325b
@@ -19,8 +19,7 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem'
 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
-import {
-  SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
+import { SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 import { CardParser } from '../CardParser'
 import { FollowChildComponent } from '../mine/follow/FollowChildComponent'
 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
@@ -38,7 +37,7 @@ export struct SearchResultContentComponent {
   @State keywords: string = ""
   @State searchType: string = ""
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
-  tempList : ContentDTO[] = []
+  tempList: ContentDTO[] = []
   @State data_rmh: SearchRmhDescription[] = []
   @State count: number = -1;
   @State isLoading: boolean = false
@@ -48,14 +47,14 @@ export struct SearchResultContentComponent {
   scroller: Scroller = new Scroller()
   private scroller2: Scroller = new Scroller()
   @State ellipseW: number = 0
-  @State moreWidth:number = 20
+  @State moreWidth: number = 20
   @State listLeft: number = 0
   @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.clearAllData()
@@ -115,7 +114,7 @@ export struct SearchResultContentComponent {
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
                       data.mainControl = item.mainControl + ""
-                      if(data_temp.length === 1){
+                      if (data_temp.length === 1) {
                         this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0]
                         this.bean.cnUserName = item.userName
                         this.bean.creatorId = item.creatorId
@@ -133,8 +132,8 @@ export struct SearchResultContentComponent {
                         } else {
                           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.banControl = item.banControl
@@ -148,9 +147,13 @@ export struct SearchResultContentComponent {
               data_temp.forEach((data) => {
                 this.data_rmh.push(data)
               })
+
+              if(this.data_rmh.length > 0){
+                this.count = 1
+              }
               //只有一条创作者，获取 创作者信息
               if (this.data_rmh.length === 1) {
-                if(StringUtils.isNotEmpty(UserDataLocal.getUserId())){
+                if (StringUtils.isNotEmpty(UserDataLocal.getUserId())) {
                   //查询是否被关注
                   let status = new FollowListStatusRequestItem()
                   status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId))
@@ -159,7 +162,7 @@ export struct SearchResultContentComponent {
                   }).catch((err: Error) => {
                     console.log(TAG, "请求失败")
                   })
-                }else{
+                } else {
                   this.bean.status = ""
                 }
               }
@@ -192,6 +195,8 @@ export struct SearchResultContentComponent {
       })
     })
+    if (data.contentList.length > 0) {
+
       SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
         newValue.forEach((item) => {
           resultData.list.forEach((data) => {
@@ -206,32 +211,32 @@ export struct SearchResultContentComponent {
         })
         // 批量号主信息
         let creatorIdList: string[] = []
-      resultData.list.forEach((value:SearchResultContentItem) => {
+        resultData.list.forEach((value: SearchResultContentItem) => {
           creatorIdList.push(value.data.creatorId)
         })
-      SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => {
+        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) => {
               let resizeParams = MinePageDatasModel.extractResizeParams(value)
-              if(resizeParams && resizeParams.length === 2){
+              if (resizeParams && resizeParams.length === 2) {
                 photos.push(
                   {
                     fullUrl: value,
-                    weight:resizeParams[0],
-                    height:resizeParams[1],
+                    weight: resizeParams[0],
+                    height: resizeParams[1],
                     landscape: Number(landscape),
                   } as FullColumnImgUrlDTO
                 )
               }
             })
             // }
-          let contentDTO = this.dataTransform(rem,value, photos);
-          if(value.data.type != "13"){
+            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) {
+              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
@@ -257,6 +262,9 @@ export struct SearchResultContentComponent {
         this.isLoading = false
         this.count = this.count === -1 ? 0 : this.count
       })
+    }else {
+      this.hasMore = false
+    }
   }
   build() {
@@ -264,15 +272,15 @@ export struct SearchResultContentComponent {
       if (this.count == 0) {
         ListHasNoMoreDataUI({ style: 2 })
       } 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 })
-              }.padding({left:"31lpx",right:"31lpx"})
-            }else{
-              ListItem(){
-                Column(){
+              }.padding({ left: "31lpx", right: "31lpx" })
+            } else {
+              ListItem() {
+                Column() {
                   this.SearchListUI()
                 }
               }
@@ -283,21 +291,26 @@ export struct SearchResultContentComponent {
               Column() {
                 if (this.searchType == "activity") {
                   ActivityItemComponent({ contentDTO: item })
-                }else if(item.sameContentListSize > 0){
+                } else if (item.sameContentListSize > 0) {
                   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 })
                   }
                 } else {
-                  if(this.data?.get(index + 1)?.sameContentListSize > 0) {
+                  if (this.data?.get(index + 1)?.sameContentListSize > 0) {
                     Divider()
                       .width('100%')
                       .color($r('app.color.color_F5F5F5'))
                       .strokeWidth(4)
                   }
-                  CardParser({compDTO:new CompDTO, contentDTO: item })
+                  CardParser({ compDTO: new CompDTO, contentDTO: item })
                 }
                 if (index != this.data.totalCount() - 1) {
                   Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -312,7 +325,7 @@ export struct SearchResultContentComponent {
           }, (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() {
               ListHasNoMoreDataUI()
             }
@@ -320,6 +333,7 @@ export struct SearchResultContentComponent {
         }.cachedCount(5)
         .edgeEffect(EdgeEffect.None)
         .scrollBar(BarState.Off)
+        .height('100%')
         .onReachEnd(() => {
           console.log(TAG, "触底了");
           if (!this.isLoading) {
@@ -334,23 +348,23 @@ export struct SearchResultContentComponent {
   @Builder
   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) => {
           ListItem() {
-            SearchCreatorComponent({item:item})
+            SearchCreatorComponent({ item: item })
           }
           .width('150lpx')
           .height('100%')
         })
       }.offset({ left: this.listLeft })
-      ListItem(){
-        if (this.data_rmh.length === 10){
+      ListItem() {
+        if (this.data_rmh.length === 10) {
           this.itemEnd()
         }
       }.height('100%')
-      .margin({left:'23lpx'})
+      .margin({ left: '23lpx' })
     }
     .edgeEffect(EdgeEffect.None)
     .scrollBar(BarState.Off)
@@ -359,10 +373,10 @@ export struct SearchResultContentComponent {
     .height('219lpx')
     .onReachEnd(() => {
       this.isEnd = true
-      console.log(TAG,'is end')
+      console.log(TAG, 'is end')
     })
     .onScrollFrameBegin((offset: number, state: ScrollState) => {
-      console.log(TAG,'offset', offset)
+      console.log(TAG, 'offset', offset)
       if (!this.scroller.isAtEnd()) {
         this.isEnd = false
       }
@@ -374,31 +388,35 @@ export struct SearchResultContentComponent {
     .parallelGesture(
       PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
         .onActionStart((event: GestureEvent) => {
-          console.info(TAG,'Pan start')
+          console.info(TAG, 'Pan start')
         })
         .onActionUpdate((event: GestureEvent) => {
           ///小于10个不展示滑动
-          if (this.data_rmh.length < 10) return;
+          if (this.data_rmh.length < 10) {
+            return;
+          }
           if (event && this.isEnd) {
             // console.log('event.offsetX',event.offsetX)
             this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
             this.ellipseW = (-this.listLeft) / 1.5
-            console.log(TAG,"this.ellipseW==>" + this.ellipseW)
+            console.log(TAG, "this.ellipseW==>" + this.ellipseW)
           }
         })
         .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.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 = {
               pageID: this.keywords
             }
-            WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
+            WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage, params)
           }
           this.ellipseW = 0
         })
@@ -411,18 +429,17 @@ export struct SearchResultContentComponent {
       .strokeWidth('12lpx')
   }
-
   @Builder
   itemEnd() {
     Row() {
       Ellipse()
-        .width(2* this.ellipseW)
+        .width(2 * this.ellipseW)
         .height('100%')
         .fill('rgb(240,235,238)')
         .position({ left: -this.ellipseW, top: 0 })
-      Column(){
-        Text(this.ellipseW === 0 ? '' : this.ellipseW < 20? '查看更多' : '松手查看')
+      Column() {
+        Text(this.ellipseW === 0 ? '' : this.ellipseW < 20 ? '查看更多' : '松手查看')
           .width('19lpx')
           .fontSize('19lpx')
           .fontWeight('400lpx')
@@ -437,17 +454,18 @@ export struct SearchResultContentComponent {
     .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))
+  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.liveType = liveType ? liveType : ""
+    contentDTO.seoTags = seoTags ? seoTags : ""
+    contentDTO.cornerMark = cornerMark ? cornerMark : ""
     contentDTO.appStyle = value.data.appStyle + ""
     contentDTO.cityCode = value.data.cityCode
     contentDTO.coverSize = ""
@@ -529,13 +547,13 @@ export struct SearchResultContentComponent {
   }
   // 搜索数据转化rmhInfo
-    private getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchResultContentItem){
+  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,
+    let rmhInfo: RmhInfoDTO = {
+      rmhHeadUrl: obj.headerPhotoUrl,
+      rmhName: obj.creatorName,
+      rmhId: obj.creatorId,
+      authIcon: obj.authIcon,
       authTitle: obj.authTitle,
       authTitle2: '',
       banControl: 0,
@@ -546,44 +564,43 @@ export struct SearchResultContentComponent {
       cnMainControl: 0,
       cnShareControl: 0,
       cnIsComment: 0,
-        cnIsLike:0,
+      cnIsLike: 0,
       posterShareControl: 0,
       rmhDesc: obj.introduction,
       userId: obj.userId,
       userType: obj.userType,
-        honoraryIcon:'',
-        rmhPlatform:0
+      honoraryIcon: '',
+      rmhPlatform: 0
     }
-      if(rem.length>0){
-        rem.forEach(item=>{
-          if(item.creatorId === obj.creatorId){
+    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,
+            rmhHeadUrl: item.headPhotoUrl,
+            rmhName: item.userName,
+            rmhId: item.creatorId,
+            authIcon: item.authIcon,
             authTitle: item.authTitle,
             authTitle2: '',
             banControl: 0,
-              cnIsAttention:item.isAttention,
+            cnIsAttention: item.isAttention,
             cnAttention: 0,
             cnlsComment: 0,
             cnlsLike: 0,
             cnMainControl: 0,
             cnShareControl: 0,
             cnIsComment: 0,
-              cnIsLike:0,
+            cnIsLike: 0,
             posterShareControl: 0,
             rmhDesc: item.introduction,
             userId: item.userId,
             userType: item.userType,
-              honoraryIcon:'',
-              rmhPlatform:0
+            honoraryIcon: '',
+            rmhPlatform: 0
           }
         }
       })
     }
     return rmhInfo
   }
-
 }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/view/EmptyComponent.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/view/EmptyComponent.ets
View file @bdd325b
@@ -58,6 +58,7 @@ export struct EmptyComponent {
   @State emptyHeight: string | number = CommonConstants.FULL_PARENT;
   @State emptyType: number = WDViewDefaultType.WDViewDefaultType_Default; // 缺省图类型，传枚举
   @State emptyButton: boolean = false
+  @State isBlack: boolean = false // 背景是否为黑色 默认白色
   @State timeNum: number = 10
   /**
    * The empty image width percentage setting.
@@ -135,7 +136,7 @@ export struct EmptyComponent {
         })
       if (this.isShowButton()) {
-        if (this.emptyType !== 15) {
+        if (this.emptyType !== 15 && !this.isBlack) {
           Button('点击重试')
             .type(ButtonType.Normal)
             .width(80)
@@ -253,7 +254,7 @@ export struct EmptyComponent {
   }
   isShowButton() {
-    if (this.emptyType === 1 || this.emptyType === 9 || this.emptyType === 15) {
+    if (this.emptyType === 1 || this.emptyType === 9 || this.emptyType === 15 && this.emptyButton) {
       return true
     } else {
       return false
--- a/sight_harmony/features/wdComponent/src/main/ets/components/view/ImageItemView.ets deleted 100644 → 0
View file @309836d
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/view/ImageItemView.ets deleted 100644 → 0
View file @309836d
-import { image } from '@kit.ImageKit';
-import { matrix4, promptAction, window } from '@kit.ArkUI';
-import { BusinessError } from '@kit.BasicServicesKit';
-import { ScaleModel } from '../../model/ScaleModel';
-import { OffsetModel } from '../../model/OffsetModel';
-import { windowSizeManager } from '../../utils/Managers';
-import { runWithAnimation } from '../../utils/FuncUtils';
-import { PhotoListBean } from 'wdBean/Index';
-import { http } from '@kit.NetworkKit';
-
-// TODO：知识点：组件复用
-@Reusable
-@Component
-export struct ImageItemView {
-  // @Consume private bgc: Color;
-  @Link isEnableSwipe: boolean; // TODO：需求：多图切换
-  @State isEnableOffset: boolean = false;
-  @State imageScaleInfo: ScaleModel = new ScaleModel(1.0, 1.0, 1.5, 0.3);
-  @State imageOffsetInfo: OffsetModel = new OffsetModel(0, 0);
-  @State matrix: matrix4.Matrix4Transit = matrix4.identity().copy();
-  @State imagePixelMap: image.PixelMap | null = null; // 当前图片pixelMap，用于Image组件显示
-  @State fitWH: "width" | "height" | undefined = undefined; // 表示当前图片是根据宽度适配还是高度适配
-  @State imageDefaultSize: image.Size = { width: 0, height: 0 }; // 图片默认大小，即，与屏幕大小最适配的显示大小
-  imageUri: string = ""; // 当前图片uri
-  imageWHRatio: number = 0; // 图片原始宽高比
-  private MultiPictureDetailItem: PhotoListBean = {} as PhotoListBean
-  @State imageBuffer: ArrayBuffer | undefined = undefined; // 图片ArrayBuffer
-  //alt app.media.picture_loading 设计稿尺寸
-  @State imageWidth:string | number = 167
-  private scroller: Scroller = new Scroller()
-
-  aboutToAppear(): void {
-    this.imageUri = this.MultiPictureDetailItem.picPath
-    this.getPicture()
-  }
-
-  /**
-   * 通过http的request方法从网络下载图片资源
-   */
-  async getPicture() {
-    // 每一个httpRequest对应一个HTTP请求任务，不可复用
-    let httpRequest = http.createHttp();
-    // 用于订阅HTTP响应头事件
-    httpRequest.on('headersReceive', (header: Object) => {
-      console.info('header: ' + JSON.stringify(header));
-    });
-    // 用于订阅HTTP流式响应数据接收事件
-    let res = new ArrayBuffer(0);
-    httpRequest.on('dataReceive', (data: ArrayBuffer) => {
-      const newRes = new ArrayBuffer(res.byteLength + data.byteLength);
-      const resView = new Uint8Array(newRes);
-      resView.set(new Uint8Array(res));
-      resView.set(new Uint8Array(data), res.byteLength);
-      res = newRes;
-      // console.info('dataReceive res length: ' + res.byteLength);
-    });
-    // 用于订阅HTTP流式响应数据接收完毕事件
-    httpRequest.on('dataEnd', () => {
-      this.transcodePixelMap(res);
-      // 判断网络获取到的资源是否为ArrayBuffer类型
-      console.info(`dataEnd getPicture ${res}`)
-      if (res instanceof ArrayBuffer) {
-        console.info(`dataEnd getPicture`)
-        this.imageBuffer = res as ArrayBuffer;
-      }
-      console.info('No more data in response, data receive end');
-    });
-    httpRequest.requestInStream(this.imageUri,
-        (error: BusinessError, data: number) => {
-          if (error) {
-            // 下载失败时弹窗提示检查网络，不执行后续逻辑
-            promptAction.showToast({
-              message: $r('app.string.image_request_fail'),
-              duration: 2000
-            })
-            this.getPicture()
-            console.error(`http reqeust failed with. Code: ${error.code}, message: ${error.message}`);
-            return;
-          }
-          // 取消订阅HTTP响应头事件
-          httpRequest.off('headersReceive');
-          // 取消订阅HTTP流式响应数据接收事件
-          httpRequest.off('dataReceive');
-          // 取消订阅HTTP流式响应数据接收完毕事件
-          httpRequest.off('dataEnd');
-          // 当该请求使用完毕时，调用destroy方法主动销毁
-          httpRequest.destroy();
-        }
-      )
-  }
-
-  /**
-   * 使用createPixelMap将ArrayBuffer类型的图片装换为PixelMap类型
-   * @param data：网络获取到的资源
-   */
-  transcodePixelMap(data: ArrayBuffer) {
-    const imageData: ArrayBuffer = data;
-    // 通过ArrayBuffer创建图片源实例。
-    const imageSource: image.ImageSource = image.createImageSource(imageData);
-    this.initCurrentImageInfo(imageSource);
-  }
-
-  /**
-   * 根据图片宽高比及窗口大小计算图片的默认宽高，即，图片最适配屏幕的大小
-   * @param imageWHRatio：图片原始宽高比
-   * @param size：窗口大小{with:number,height:number}
-   * @returns image.Size
-   */
-  calcImageDefaultSize(imageWHRatio: number, size: window.Size): image.Size {
-    let width = 0
-    let height = 0;
-    width = size.width;
-    height = size.width / imageWHRatio;
-    return { width: width, height: height };
-  }
-
-  /**
-   * TODO：知识点：根据图片大小（宽高<=屏幕宽高）和屏幕大小计算图片放大适配屏幕进行显示的缩放倍率
-   * @param imageSize：图片当前大小
-   * @param windowSize：窗口大小
-   * @returns：缩放倍率
-   */
-  calcFitScaleRatio(imageSize: image.Size, windowSize: window.Size): number {
-    let ratio: number = 1.0;
-    if (windowSize.width > imageSize.width) {
-      ratio = windowSize.width / imageSize.width;
-    } else {
-      ratio = windowSize.height / imageSize.height;
-    }
-    return ratio;
-  }
-
-  /**
-   * 设置当前图片的相关信息：uri、whRatio、pixelMap、fitWH、defaultSize、maxScaleValue
-   * TODO：知识点：提前获取图片的信息，以进行Image组件的尺寸设置及后续的相关计算
-   */
-  initCurrentImageInfo(imageSource: image.ImageSource): void {
-    this.matrix = matrix4.identity().copy();
-    // const imageSource: image.ImageSource = image.createImageSource(this.imageUri);
-    imageSource.getImageInfo(0).then((data: image.ImageInfo) => {
-      this.imageWHRatio = data.size.width / data.size.height;
-      console.error(`this.imageDefaultSize this.imageWHRatio =  ${this.imageWHRatio}`);
-      console.error(`this.imageDefaultSize width =  ${data.size.width}`);
-      console.error(`this.imageDefaultSize height =  ${data.size.height}`);
-      this.imageDefaultSize = this.calcImageDefaultSize(this.imageWHRatio, windowSizeManager.get());
-      console.error(`this.imageDefaultSize =  ${JSON.stringify(windowSizeManager.get())}`);
-      console.error(`this.imageDefaultSize =  ${JSON.stringify(this.imageDefaultSize)}`);
-      if (this.imageDefaultSize.width === windowSizeManager.get().width) {
-        this.fitWH = "width";
-      } else {
-        this.fitWH = "height";
-      }
-      this.imageScaleInfo.maxScaleValue += this.fitWH === "width" ?
-        (windowSizeManager.get().height / this.imageDefaultSize.height) :
-        (windowSizeManager.get().width / this.imageDefaultSize.width);
-    }).catch((err: BusinessError) => {
-      console.error(`[error][getImageInfo]${err.message}`);
-    });
-    imageSource.createPixelMap().then((data: image.PixelMap) => {
-      this.imagePixelMap = data;
-    }).catch((err: BusinessError) => {
-      console.error(`[error][createPixelMap]${err.message}`);
-    });
-    this.isEnableOffset = false;
-    this.imageScaleInfo.reset();
-    this.imageOffsetInfo.reset();
-  }
-
-  /**
-   * 在图片消失时，将当前图片的信息设置为默认值
-   */
-  resetCurrentImageInfo(): void {
-    this.imageScaleInfo.reset();
-    this.imageOffsetInfo.reset();
-    this.matrix = matrix4.identity().copy();
-  }
-
-  /**
-   * TODO：需求：在偏移时评估是否到达边界，以便进行位移限制与图片的切换
-   * @returns：长度为4的boolean数组，表示上下左右是否到达边界
-   */
-  evaluateBound(): boolean[] {
-    return [false, false, false, false];
-  }
-
-  build() {
-    Stack() {
-      Scroll(this.scroller) {
-        if(this.imageUri != null && (this.imageUri.includes('.gif') || this.imageUri.includes('.GIF'))){
-          Image(this.imageUri)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
-            .alt($r('app.media.datail_imageLoading_w'))
-            .width(this.imageWidth)
-            .objectFit(ImageFit.Auto)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
-            .interpolation(ImageInterpolation.High)
-            .autoResize(false)
-            .transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
-            .defaultFocus(true)
-            .offset({
-              // TODO：知识点：通过offset控制图片的偏移
-              x: this.imageOffsetInfo.currentX,
-              y: this.imageOffsetInfo.currentY
-            })
-            .onComplete(event => {
-              this.imageWidth = '100%'
-            })
-        } else {
-          Image(this.imagePixelMap)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
-            .alt($r('app.media.datail_imageLoading_w'))
-            .width(this.imageWidth)
-            .objectFit(ImageFit.Auto)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
-            .interpolation(ImageInterpolation.High)
-            .autoResize(false)
-            .transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
-            .defaultFocus(true)
-            .offset({
-              // TODO：知识点：通过offset控制图片的偏移
-              x: this.imageOffsetInfo.currentX,
-              y: this.imageOffsetInfo.currentY
-            })
-            .onComplete(event => {
-              this.imageWidth = '100%'
-            })
-        }
-      }
-      .scrollable(ScrollDirection.Vertical)
-      .scrollBarWidth(0)
-      .constraintSize({
-        maxHeight: this.imageDefaultSize.height
-      })
-    }
-    .onBlur(() => {
-      this.resetCurrentImageInfo();
-    })
-    // .backgroundColor(this.bgc)
-    .alignContent(Alignment.Center)
-    .width("100%")
-    .height("100%")
-    .backgroundColor(Color.Black)
-    .gesture(
-      GestureGroup(
-        GestureMode.Exclusive,
-        // TODO：知识点：双击切换图片大小
-        TapGesture({ count: 2 })
-          .onAction(() => {
-            let fn: Function;
-            // 已经是放大状态下，双击缩小
-            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.defaultScaleValue) {
-              fn = () => {
-                this.isEnableSwipe = true;
-                this.imageScaleInfo.reset();
-                this.imageOffsetInfo.reset();
-                this.matrix = matrix4.identity().copy();
-              };
-            } else {
-              // 已经是缩小状态，双击放大
-              fn = () => {
-                this.isEnableSwipe = false;
-                const ratio: number = this.calcFitScaleRatio(this.imageDefaultSize, windowSizeManager.get());
-                this.imageScaleInfo.scaleValue = ratio;
-                this.imageOffsetInfo.reset();
-                this.matrix = matrix4.identity().scale({
-                  x: ratio,
-                  y: ratio,
-                }).copy();
-                this.imageScaleInfo.stash();
-              }
-            }
-            runWithAnimation(fn);
-          }),
-        // 单击切换背景色
-        // TapGesture({ count: 1 }).onAction(() => {
-        //   runWithAnimation(() => {
-        //     this.bgc = this.bgc === Color.White ? Color.Black : Color.White;
-        //   });
-        // }),
-        // TODO：知识点：双指捏合缩放图片
-        PinchGesture({ fingers: 2, distance: 1 })
-          .onActionUpdate((event: GestureEvent) => {
-            this.imageScaleInfo.scaleValue = this.imageScaleInfo.lastValue * event.scale;
-            // TODO：知识点：缩放时不允许大于最大缩放因子+额外缩放因子，不允许小于默认大小-额外缩放因子，额外缩放因子用于提升用户体验
-            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.maxScaleValue *
-              (1 + this.imageScaleInfo.extraScaleValue)
-            ) {
-              this.imageScaleInfo.scaleValue = this.imageScaleInfo.maxScaleValue *
-                (1 + this.imageScaleInfo.extraScaleValue);
-            }
-            if (this.imageScaleInfo.scaleValue < this.imageScaleInfo.defaultScaleValue *
-              (1 - this.imageScaleInfo.extraScaleValue)) {
-              this.imageScaleInfo.scaleValue = this.imageScaleInfo.defaultScaleValue *
-                (1 - this.imageScaleInfo.extraScaleValue);
-            }
-            // TODO：知识点：matrix默认缩放中心为组件中心
-            this.matrix = matrix4.identity().scale({
-              x: this.imageScaleInfo.scaleValue,
-              y: this.imageScaleInfo.scaleValue,
-            }).copy();
-            console.debug(this.imageScaleInfo.toString());
-          })
-          .onActionEnd((event: GestureEvent) => {
-            /**
-             * TODO：知识点：当小于默认大小时，恢复为默认大小
-             */
-            if (this.imageScaleInfo.scaleValue < this.imageScaleInfo.defaultScaleValue) {
-              runWithAnimation(() => {
-                this.imageScaleInfo.reset();
-                this.imageOffsetInfo.reset();
-                this.matrix = matrix4.identity().copy();
-              })
-            }
-            // TODO：知识点：当大于最大缩放因子时，恢复到最大
-            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.maxScaleValue) {
-              runWithAnimation(() => {
-                this.imageScaleInfo.scaleValue = this.imageScaleInfo.maxScaleValue;
-                this.matrix = matrix4.identity()
-                  .scale({
-                    x: this.imageScaleInfo.maxScaleValue,
-                    y: this.imageScaleInfo.maxScaleValue
-                  });
-              })
-            }
-            this.imageScaleInfo.stash();
-          }),
-        // // TODO：知识点：滑动图片
-        // PanGesture({ fingers: 1 })// TODO：需求：默认大小下左右滑动应当是切换图片
-        //   .onActionUpdate((event: GestureEvent) => {
-        //     if (this.imageScaleInfo.scaleValue === this.imageScaleInfo.defaultScaleValue) {
-        //       // 默认大小下不允许移动
-        //       return;
-        //     }
-        //     this.imageOffsetInfo.currentX = this.imageOffsetInfo.lastX + event.offsetX;
-        //     this.imageOffsetInfo.currentY = this.imageOffsetInfo.lastY + event.offsetY;
-        //   })
-        //   .onActionEnd((event: GestureEvent) => {
-        //     this.imageOffsetInfo.stash();
-        //   })
-      ),
-    )
-  }
-}
--- a/sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
View file @bdd325b
+++ b/sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
View file @bdd325b
 import { PhotoListBean } from 'wdBean/Index';
 import { display, router } from '@kit.ArkUI';
-import { ImageItemView } from '../components/view/ImageItemView';
 import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
+import { MultiPictureDetailItemComponent } from '../components/MultiPictureDetailItemComponent';
+
 import { Action } from 'wdBean';
 import { WindowModel } from 'wdKit/Index';
@@ -68,11 +69,10 @@ export struct MultiPictureListPage {
       })
       .id("backImg")
-
       if (this.photoList && this.photoList?.length > 0) {
         Swiper(this.swiperController) {
           ForEach(this.photoList, (item: PhotoListBean) => {
-            ImageItemView({ MultiPictureDetailItem: item, isEnableSwipe: this.isEnableSwipe })
+            MultiPictureDetailItemComponent({ MultiPictureDetailItem: item, isEnableSwipe: this.isEnableSwipe })
           })
         }
         .index(this.swiperIndex)
@@ -135,7 +135,6 @@ export struct MultiPictureListPage {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
       }
-
       ImageDownloadComponent({ url: this.currentUrl })
         .alignRules({
           bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
@@ -152,6 +151,7 @@ export struct MultiPictureListPage {
     .width('100%')
     .height('100%')
     .id('e_picture_container')
+    .backgroundColor(Color.Black)
   }
   aboutToDisappear(): void {
--- a/sight_harmony/features/wdDetailPlayLive/oh-package.json5
View file @bdd325b
+++ b/sight_harmony/features/wdDetailPlayLive/oh-package.json5
View file @bdd325b
@@ -7,7 +7,6 @@
   "main": "Index.ets",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/lottie": "2.0.10",
     "wdComponent": "file:../../features/wdComponent",
     "wdPlayer": "file:../../features/wdPlayer",
     "wdNetwork": "file:../../commons/wdNetwork",
--- a/sight_harmony/features/wdDetailPlayShortVideo/oh-package.json5
View file @bdd325b
+++ b/sight_harmony/features/wdDetailPlayShortVideo/oh-package.json5
View file @bdd325b
@@ -7,7 +7,6 @@
   "main": "Index.ets",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/lottie": "2.0.0",
     "wdPlayer": "file:../../features/wdPlayer",
     "wdKit": "file:../../commons/wdKit",
     "wdBean": "file:../../features/wdBean",
--- a/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/DetailVideoListPage.ets
View file @bdd325b
+++ b/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/pages/DetailVideoListPage.ets
View file @bdd325b
@@ -204,7 +204,7 @@ export struct DetailVideoListPage {
   build() {
     if (this.netStatus !== undefined) {
       EmptyComponent({
-        emptyType: 1, emptyButton: true, retry: () => {
+        emptyType: 1, emptyButton: true, isBlack: true, retry: () => {
           this.getContentDetail(this.contentId, this.relId, this.relType)
         }
       })
--- a/sight_harmony/oh-package.json5
View file @bdd325b
+++ b/sight_harmony/oh-package.json5
View file @bdd325b
@@ -10,7 +10,8 @@
   "main": "",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/pulltorefresh": "^2.0.5",
+    "@ohos/pulltorefresh": "^2.0.6-rc.0",
+    "@ohos/lottie": "v2.0.11-rc.6",
     "@mpaas/udid": "0.0.2",
     "@mpaas/upgrade": "0.0.2",
     "@mpaas/framework": "0.0.2",
--- a/sight_harmony/products/phone/oh-package.json5
View file @bdd325b
+++ b/sight_harmony/products/phone/oh-package.json5
View file @bdd325b
@@ -7,7 +7,6 @@
   "main": "",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/lottie": "v2.0.11-rc.6",
     "wdComponent": "file:../../features/wdComponent",
     "wdConstant": "file:../../commons/wdConstant",
     "wdKit": "file:../../commons/wdKit",
--- a/sight_harmony/products/phone/src/main/ets/pages/view/MultiPictureDetailPageComponent.ets
View file @bdd325b
+++ b/sight_harmony/products/phone/src/main/ets/pages/view/MultiPictureDetailPageComponent.ets
View file @bdd325b
@@ -525,7 +525,7 @@ export struct MultiPictureDetailPageComponent {
   @Builder
   noNet() {
     EmptyComponent({
-      emptyType: 1, emptyButton: true, retry: () => {
+      emptyType: 1, emptyButton: true, isBlack: true, retry: () => {
         this.getContentDetailData()
       }
     })
@@ -534,6 +534,7 @@ export struct MultiPictureDetailPageComponent {
         center: { anchor: "__container__", align: VerticalAlign.Center },
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
+      .backgroundColor(Color.Black)
   }
   @Builder