Merge remote-tracking branch 'origin/main'

陈剑华
Commit f16af82ec579446fc7208c2f40aa6774840c5942 f16af82e 2 parents 8a7b8eee 9ee664b4
Showing 4 changed files with 57 additions and 25 deletions
sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/mine/home/ChildCommentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
View file @f16af82
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
View file @f16af82
@@ -195,6 +195,7 @@ export struct ENewspaperPageComponent {
             top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
             middle: { anchor: "__container__", align: HorizontalAlign.Center }
           })
+          .effectMode(EdgeEffect.None)
           .onChange((index: number) => {
             this.currentPageNum = this.newspaperListBean?.list[index]?.pageNum
             this.swiperIndex = index
@@ -202,12 +203,12 @@ export struct ENewspaperPageComponent {
           Image($r('app.media.newspaper_shadow'))
             .height($r('app.float.vp_12'))
-            .margin({ left: 20, right: 20, top: -1 })
+            .margin({ left: 10, right: 10, top: -1 })
             .objectFit(ImageFit.Contain)
             .alignRules({
               top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
-              left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
-              right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
+              // left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
+              // right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
             })
             .id('e_newspaper_shadow')
--- a/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/ChildCommentComponent.ets
View file @f16af82
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/ChildCommentComponent.ets
View file @f16af82
@@ -61,6 +61,7 @@ export struct ChildCommentComponent {
               .lineHeight("31lpx")
               .fontColor(this.data.like_status === 0 ? $r('app.color.color_666666') : $r('app.color.color_ED2800'))
               .margin({ right: '8lpx' })
+              .visibility(this.data.likeNum <= 0||StringUtils.isEmpty(this.data.likeNum.toString()) ? Visibility.Hidden : Visibility.Visible)
             Image(this.data.like_status === 0 ? $r('app.media.like_default_status') : $r('app.media.liked_status'))
               .width('31lpx')
               .height('31lpx')
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @f16af82
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @f16af82
-import { CompDTO, ContentDTO, PageDTO, PageInfoDTO } from 'wdBean';
+import { CompDTO, ContentDTO, InteractDataDTO, PageDTO, PageInfoDTO } from 'wdBean';
 import { CompStyle, ViewType } from 'wdConstant/Index';
-import { CollectionUtils, DateTimeUtils, Logger, NetworkUtil, StringUtils } from 'wdKit';
+import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils } from 'wdKit';
 import { closeRefresh } from '../utils/PullDownRefresh';
 import PageModel from './PageModel';
 import PageViewModel from './PageViewModel';
@@ -10,6 +10,7 @@ import PageAdModel from './PageAdvModel';
 import { ArrayList } from '@kit.ArkTS';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
+import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO';
 const TAG = 'PageHelper';
@@ -121,7 +122,6 @@ export class PageHelper {
     pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
     if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
       pageModel.viewType = ViewType.LOADED;
-      let sizeBefore: number = pageModel.compList.size();
       if (isLastGroup) {
         // 认为分页只会在最后一个group里
         pageModel.currentPage++;
@@ -132,17 +132,15 @@ export class PageHelper {
       //移除音频 和 活动
       this.collectPageComp(pageModel, pageDto)
-      // pageModel.compList.push(...pageDto.compList)
-
       // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
       // TODO updateItems(sizeBefore, data)，这里可能有时序问题，导致覆盖别的group数据，需要优化，考虑精准替换
       // 二次请求，批查互动数据
-      // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
-      //   // 刷新，替换所有数据
-      //   // pageModel.compList.replaceAll(...data)
-      //   pageModel.compList.updateItems(sizeBefore, data)
-      //   pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-      // })
+      PageViewModel.getInteractData(pageDto.compList).then((data: InteractDataDTO[]) => {
+        // 刷新，替换所有数据
+        this.resetInteract(data, pageModel.compList)
+        pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+        pageModel.compList.reloadData()
+      })
       // content级别的展现加载丢给comp自己，这里只需要处理屏蔽分页加载，pageModel.pageScroll
       if (isLastGroup) {
         closeRefresh(pageModel, true);
@@ -335,18 +333,17 @@ export class PageHelper {
             // 直接认为有分页，一直加载分页。直到没有数据，再停止
             pageModel.currentPage++;
             pageModel.hasMore = true;
-            let sizeBefore: number = pageModel.compList.size();
             //移除音频 和 活动
             this.collectPageComp(pageModel, data)
-            // pageModel.compList.push(...data.compList)
             // TODO   暂时屏蔽，此处代码会造成  广告逻辑错乱，只有第一页有广告数据，随着加载更多，第二页也会出现广告数据
-            // PageViewModel.getInteractData(data.compList).then((data: CompDTO[]) => {
-            //   // 刷新，替换所有数据
-            //   pageModel.compList.updateItems(sizeBefore, data)
-            //   pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-            // })
+            PageViewModel.getInteractData(data.compList).then((data: InteractDataDTO[]) => {
+              // 刷新，替换所有数据
+              this.resetInteract(data, pageModel.compList)
+              pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+              pageModel.compList.reloadData()
+            })
           }
         }).catch((err: string | Resource) => {
         promptAction.showToast({ message: err });
@@ -394,6 +391,36 @@ export class PageHelper {
   }
+
+  /**
+   * 刷新互动数据到compList
+   * @param interact 批查互动数据结果
+   * @param compList comp list
+   */
+  private resetInteract(interact: InteractDataDTO[], compList: LazyDataSource<BaseDTO>) {
+    if (interact == null || interact.length == 0) {
+      return
+    }
+    interact.forEach((interactData) => {
+      let id = interactData.contentId;
+      outer: for (let i = 0; i < compList.totalCount(); i++) {
+        let comp = compList.getData(i) as CompDTO;
+        if (comp == null || comp.operDataList == null || comp.operDataList.length == 0) {
+          continue;
+        }
+        for (let j = 0; j < comp.operDataList.length; j++) {
+          let content = comp.operDataList[j];
+          if (content == null) {
+            continue;
+          }
+          if (id == content.objectId) {
+            content.interactData = interactData;
+            break outer;
+          }
+        }
+      }
+    })
+  }
 }
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
View file @f16af82
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
View file @f16af82
@@ -232,10 +232,10 @@ export class PageViewModel extends BaseViewModel {
       }
     }
-    return new Promise<CompDTO[]>((success, error) => {
+    return new Promise<InteractDataDTO[]>((success, error) => {
       Promise.all(promises).then((result) => {
         if (!CollectionUtils.isArray(result)) {
-          success(compList);
+          success(new Array<InteractDataDTO>());
           return;
         }
@@ -246,8 +246,8 @@ export class PageViewModel extends BaseViewModel {
           }
         })
         // 批查全部完成，统一设置到comp里
-        this.resetInteract(allInteractDataList, compList);
-        success(compList);
+        // this.resetInteract(allInteractDataList, compList);
+        success(allInteractDataList);
       })
     })
   }
@@ -269,6 +269,9 @@ export class PageViewModel extends BaseViewModel {
     });
   }
+  /**
+   * @deprecated
+   */
   private resetInteract(interact: InteractDataDTO[], compList: CompDTO[]) {
     if (interact == null || interact.length == 0) {
       return