feat:

1)人民号--关注频道，稿件线，和删除冗余调用冗余接口

feat:
1)人民号--关注频道，稿件线，和删除冗余调用冗余接口
liyubing
Commit e5b9dff18b91234f7414ef21b14e6d4f7614c800 e5b9dff1 1 parent 7ba266e4
Showing 4 changed files with 126 additions and 32 deletions
sight_harmony/features/wdComponent/src/main/ets/components/CardParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/peopleShip/PeopleShipMainComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageFollowHelper.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/CardParser.ets
View file @e5b9dff
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/CardParser.ets
View file @e5b9dff
@@ -25,6 +25,7 @@ import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
  */
 @Component
 export struct CardParser {
+
   @State pageId: string = '';
   @State pageName: string = '';
   @State contentDTO: ContentDTO = new ContentDTO();
--- a/sight_harmony/features/wdComponent/src/main/ets/components/peopleShip/PeopleShipMainComponent.ets
View file @e5b9dff
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/peopleShip/PeopleShipMainComponent.ets
View file @e5b9dff
 import { PeopleShipRecommendComponent } from './PeopleShipRecommendComponent';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
-import {  HttpUtils } from 'wdNetwork/Index';
+import { HttpUtils } from 'wdNetwork/Index';
 import { Logger, DateTimeUtils, EmitterEventId, EmitterUtils } from 'wdKit';
 import {
   RmhRecommendDTO,
@@ -21,27 +21,27 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem';
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
 import PageModel from '../../viewmodel/PageModel';
 import PageAdModel from '../../viewmodel/PageAdvModel';
-import PageHelper from '../../viewmodel/PageHelper';
 import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
 import { CardParser } from '../CardParser'
 import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
+import PageFollowHelper from '../../viewmodel/PageFollowHelper';
+
 const TAG = 'PeopleShipMainComponent';
+
 /**
  *  人民号 --- 关注
  */
 @Component
 export struct PeopleShipMainComponent {
   @State private pageModel: PageModel = new PageModel();
-  @State private pageAdvModel: PageAdModel = new PageAdModel();
   // 自动刷新通知
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   navIndex: number = 0;
   pageId: string = "";
   channelId: string = "";
   @Link @Watch('onChange') currentTopNavSelectedIndex: number
- // private scroller: Scroller = new Scroller()
+  // private scroller: Scroller = new Scroller()
   private listScroller: Scroller = new Scroller()
-
   @State rmhList: RmhRecommendDTO[] = []
   @Provide rmhSelectedList: string[] = []
   @State viewType: ViewType = ViewType.LOADING
@@ -56,7 +56,6 @@ export struct PeopleShipMainComponent {
   @State private currentPage: number = 1
   @State private isLoading: boolean = false
   @State private loadTime: string = ''
-
   // 页面展示监听
   @Consume @Watch('onPageShowChange') pageShow: number
   @State private pageAttentionChange: boolean = false
@@ -96,7 +95,7 @@ export struct PeopleShipMainComponent {
             this.getData(resolve)
           },
         })
-      }else {
+      } else {
         CustomPullToRefresh({
           alldata: this.attentionList,
           scroller: this.listScroller,
@@ -108,19 +107,19 @@ export struct PeopleShipMainComponent {
             this.currentPage = 1
             this.getData(resolve)
           },
-          onLoadMore:(resolve)=> {
+          onLoadMore: (resolve) => {
             if (this.hasMore === false) {
-              if(resolve) {
+              if (resolve) {
                 resolve('')
               }
               return
             }
-            if(!this.isLoading && this.hasMore){
+            if (!this.isLoading && this.hasMore) {
               //加载分页数据
               this.currentPage++;
               this.getAttentionContentListData(resolve)
-            }else  {
-              if(resolve)  {
+            } else {
+              if (resolve) {
                 resolve('')
               }
             }
@@ -138,9 +137,9 @@ export struct PeopleShipMainComponent {
   @Builder
   ListLayout() {
-    List({scroller: this.listScroller}){
+    List({ scroller: this.listScroller }) {
       // 头部关注列表
-      ListItem(){
+      ListItem() {
         PeopleShipRecommendComponent({
           rmhList: this.rmhList,
           oneKeyFollow: this.oneKeyFollow,
@@ -156,20 +155,25 @@ export struct PeopleShipMainComponent {
   @Builder
   ListAttentionLayout() {
-    List({scroller: this.listScroller}){
+    List({ scroller: this.listScroller }) {
       // 头部关注列表
-      ListItem(){
+      ListItem() {
         PeopleShipAttentionContentListTopComponent({
           followList: this.followList
         })
       }
+
       ForEach(this.attentionList, (item: ContentDTO) => {
         ListItem() {
-          CardParser({compDTO:new CompDTO, contentDTO: item })
+          Column(){
+            CardParser({ compDTO: new CompDTO, contentDTO: item })
+            Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+          }.width('100%')
+
         }.width("100%")
         .backgroundColor(Color.Transparent)
-      }, (item: ContentDTO, index: number) =>  item.objectId + index.toString())
+      }, (item: ContentDTO, index: number) => item.objectId + index.toString())
       // 加载更多
       ListItem() {
@@ -196,7 +200,8 @@ export struct PeopleShipMainComponent {
   }
   onChange() {
-    if (this.navIndex === this.currentTopNavSelectedIndex && (this.viewType == ViewType.LOADING || this.pageAttentionChange)) {
+    if (this.navIndex === this.currentTopNavSelectedIndex &&
+      (this.viewType == ViewType.LOADING || this.pageAttentionChange)) {
       this.getData();
     }
   }
@@ -224,7 +229,6 @@ export struct PeopleShipMainComponent {
           this.getRmhRecommendInfo(resolve)
         } else {
           this.followList = []
-          // this.followList = followInfo.list
           this.followList.push(...followInfo.list)
           this.attentionList = []
           this.currentPage = 1
@@ -292,7 +296,7 @@ export struct PeopleShipMainComponent {
         }
         //批量查询各类型内容动态数据接口
         this.checkContentInteractData(listData.list, resolve)
-      } else  {
+      } else {
         this.hasMore = false;
         this.resolveEnd(true, resolve)
       }
@@ -322,7 +326,7 @@ export struct PeopleShipMainComponent {
       this.resolveEnd(true, resolve)
       list.forEach((element: ContentDTO) => {
         // 获取 interactData 数据
-        if (listData &&  listData.length > 0) {
+        if (listData && listData.length > 0) {
           const objc = listData.find((interactModel: InteractDataDTO) => {
             return element.objectId == interactModel.contentId
           })
@@ -346,7 +350,7 @@ export struct PeopleShipMainComponent {
     if (resolve) {
       if (this.currentPage == 1 && isTop) {
         resolve('已更新至最新')
-      }else  {
+      } else {
         resolve('')
       }
     }
@@ -360,12 +364,13 @@ export struct PeopleShipMainComponent {
   // 说是首页必须要调用
   async getInitData() {
-    Logger.debug('PeopleShipMainComponent', `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    Logger.debug('PeopleShipMainComponent',
+      `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
     this.pageModel.pageId = this.pageId;
     this.pageModel.groupId = this.pageId;
     this.pageModel.channelId = this.channelId;
     this.pageModel.currentPage = 1;
-    PageHelper.getInitData(this.pageModel, this.pageAdvModel)
+    PageFollowHelper.getInitData(this.pageModel)
   }
   // 点击一键关注
@@ -391,7 +396,7 @@ export struct PeopleShipMainComponent {
       // 获取列表数据
       let objects = new AttentionBatchDTO()
       this.rmhList.forEach((element: RmhRecommendDTO) => {
-        if ( this.rmhSelectedList.indexOf(element.creatorId) != -1) {
+        if (this.rmhSelectedList.indexOf(element.creatorId) != -1) {
           const creator = new CreatorDTO(element.userType, element.userId, element.creatorId)
           objects.creators.push(creator)
         }
@@ -416,7 +421,7 @@ export struct PeopleShipMainComponent {
   // 页面展示监听
   onPageShowChange() {
-    if (this.navIndex === this.currentTopNavSelectedIndex && this.pageAttentionChange ) {
+    if (this.navIndex === this.currentTopNavSelectedIndex && this.pageAttentionChange) {
       this.getData()
     }
   }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @e5b9dff
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @e5b9dff
@@ -294,11 +294,12 @@ export struct SearchResultContentComponent {
                   CardParser({compDTO:new CompDTO, contentDTO: item })
                 }
                 if (index != this.data.totalCount() - 1) {
-                  Divider()
-                    .width('100%')
-                    .height('1lpx')
-                    .color($r('app.color.color_F5F5F5'))
-                    .strokeWidth('1lpx')
+                  Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+                  // Divider()
+                  //   .width('100%')
+                  //   .height('1lpx')
+                  //   .color($r('app.color.color_F5F5F5'))
+                  //   .strokeWidth('1lpx')
                 }
               }
             }
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageFollowHelper.ets 0 → 100644
View file @e5b9dff
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageFollowHelper.ets 0 → 100644
View file @e5b9dff
+import { CompDTO, ContentDTO, InteractDataDTO, LiveReviewDTO, LiveRoomDataBean, PageDTO, PageInfoDTO } from 'wdBean';
+import { CompStyle, ViewType } from 'wdConstant/Index';
+import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils, ToastUtils } from 'wdKit';
+import { closeRefresh } from '../utils/PullDownRefresh';
+import PageModel from './PageModel';
+import PageViewModel from './PageViewModel';
+import { promptAction } from '@kit.ArkUI';
+import { CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
+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';
+import { viewBlogInsightIntentShare, ActionMode } from '../utils/InsightIntentShare'
+import { common } from '@kit.AbilityKit';
+import { CacheData } from 'wdNetwork/Index';
+import { closeLoadMore } from '../utils/PullUpLoadMore';
+
+const TAG = 'PageHelper';
+
+
+/**
+ * 处理返回后的数据
+ */
+export class PageFollowHelper {
+  private refreshUIEnd(pageModel: PageModel, isRefreshSuccess: boolean) {
+    if (pageModel.loadStrategy != 2) {
+      return
+    }
+    closeRefresh(pageModel, isRefreshSuccess)
+  }
+
+
+
+  /**
+   * 进页面请求数据
+   */
+  async getInitData(pageModel: PageModel) {
+    pageModel.loadStrategy = 1
+    let netStatus = NetworkUtil.isNetConnected()
+    if (netStatus) {
+      this.getPageInfo(pageModel)
+    } else if (pageModel.compList.size() > 0) {
+      // 加载缓存数据了，不用无网络提示
+    } else {
+      pageModel.viewType = ViewType.EMPTY;
+      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoNetwork;
+    }
+  }
+
+  getPageInfo(pageModel: PageModel) {
+    pageModel.currentPage = 1;
+    Logger.debug(TAG, 'getPageInfo')
+    PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
+      Logger.debug(TAG, 'getPageInfo back: ' + JSON.stringify(pageInfo))
+      if (pageInfo == null) {
+        pageModel.viewType = ViewType.EMPTY;
+        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
+        return;
+      }
+      pageModel.pageInfo = pageInfo;
+
+      Logger.debug(TAG, 'getPageInfo go on')
+    }).catch(() => {
+      this.refreshUIEnd(pageModel, false)
+      if (this.isPageLoaded(pageModel)) {
+        return
+      }
+      pageModel.viewType = ViewType.EMPTY;
+      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_ContentFailed;
+    })
+  }
+
+  private isPageLoaded(pageModel: PageModel) {
+    if (pageModel.compList.size() > 0) {
+      return true
+    }
+    return false
+  }
+}
+
+
+
+
+let pageHelper = new PageFollowHelper();
+
+export default pageHelper as PageFollowHelper;