直播与视频冲突,分开写

chenjun3_wd
Commit 0aebb7f81270bff905eb89fe523adcc6707c9d40 0aebb7f8 1 parent 3c28f55a
Showing 3 changed files with 142 additions and 19 deletions
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @0aebb7f
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @0aebb7f
-
-import { Logger, DateTimeUtils, CollectionUtils } from 'wdKit';
+import { CollectionUtils, DateTimeUtils, Logger } from 'wdKit';
 import { CommonConstants, CompStyle, ViewType } from 'wdConstant';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import { EmptyComponent } from '../view/EmptyComponent';
@@ -14,7 +13,7 @@ import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CompParser } from '../CompParser';
 import { GroupInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
-import { CompDTO, LiveReviewDTO, PageDTO ,PageInfoDTO} from 'wdBean';
+import { CompDTO, LiveReviewDTO, PageDTO, PageInfoBean } from 'wdBean';
 const TAG = 'PageComponent';
@@ -158,6 +157,16 @@ export struct PageComponent {
       this.pageModel.viewType = ViewType.EMPTY;
       return;
     }
+    if (this.navIndex === 0) {
+      await this.getVideoListData(pageInfo);
+    } else {
+      await this.getLiveListData(pageInfo);
+    }
+
+
+  }
+
+  private async getVideoListData(pageInfo: PageInfoBean) {
     let groupInfo: GroupInfoDTO = CollectionUtils.getElement(pageInfo.groups, 0);
     if (groupInfo != null) {
       this.pageModel.isRecGroup = groupInfo.groupStrategy === 1;
@@ -165,7 +174,89 @@ export struct PageComponent {
     }
     // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
     // for (const group of pageInfo.groups) {
-      this.pageDto = await PageViewModel.getPageData(this.pageModel, getContext(this))
+    this.pageDto = await PageViewModel.getPageData(this.pageModel, getContext(this));
+    this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString();
+    if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
+      this.pageDto.compList.forEach((comp) => {
+        if (comp.compStyle === CompStyle.Zh_Grid_Layout_02 && this.liveReviewDTO && this.liveReviewDTO.list && this.liveReviewDTO.list.length > 0) {
+          comp.operDataList.push(...this.liveReviewDTO.list);
+        }
+      });
+
+      this.pageModel.viewType = ViewType.LOADED;
+      this.pageModel.compList.push(...this.pageDto.compList);
+      if (this.pageDto.compList.length === this.pageModel.pageSize) {
+        this.pageModel.currentPage++;
+        this.pageModel.hasMore = true;
+      } else {
+        this.pageModel.hasMore = false;
+      }
+      // // 二次请求，批查互动数据
+      // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
+      //   // 刷新，替换所有数据
+      //   this.pageModel.compList.replaceAll(...data)
+      //   this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+      // })
+      this.isFirstIn = false;
+      Logger.debug(TAG, 'cj111');
+      // } else {
+      //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+      //   this.pageModel.viewType = ViewType.EMPTY;
+      // }
+    }
+  }
+
+  // private async getLiveListData(pageInfo: PageInfoBean) {
+  //   // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
+  //   for (const group of pageInfo.groups) {
+  //     this.pageDto = await PageViewModel.getPageData(this.pageModel, getContext(this));
+  //     this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString();
+  //     if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
+  //       this.pageDto.compList.forEach((comp) => {
+  //         if (comp.compStyle === CompStyle.Zh_Grid_Layout_02 && this.liveReviewDTO && this.liveReviewDTO.list && this.liveReviewDTO.list.length > 0) {
+  //           comp.operDataList.push(...this.liveReviewDTO.list);
+  //         }
+  //       });
+  //
+  //       this.pageModel.viewType = ViewType.LOADED;
+  //       this.pageModel.compList.push(...this.pageDto.compList);
+  //       if (this.pageDto.compList.length === this.pageModel.pageSize) {
+  //         this.pageModel.currentPage++;
+  //         this.pageModel.hasMore = true;
+  //       } else {
+  //         this.pageModel.hasMore = false;
+  //       }
+  //       // // 二次请求，批查互动数据
+  //       // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
+  //       //   // 刷新，替换所有数据
+  //       //   this.pageModel.compList.replaceAll(...data)
+  //       //   this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+  //       // })
+  //       this.isFirstIn = false;
+  //       Logger.debug(TAG, 'cj111');
+  //       // } else {
+  //       //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+  //       //   this.pageModel.viewType = ViewType.EMPTY;
+  //     }
+  //   }
+  // }
+
+  async getLiveListData(pageInfo: PageInfoBean) {
+    // Logger.info(TAG, `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;
+    // let pageInfo = await PageViewModel.getPageUrlData(this.pageModel.pageId);
+    // if (pageInfo == null) {
+    //   this.pageModel.viewType = ViewType.EMPTY;
+    //   return;
+    // }
+    Logger.debug(TAG, 'getPageUrlData ' + pageInfo.id);
+    // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
+    for (const group of pageInfo.groups) {
+      this.pageDto = await PageViewModel.getLivePageData(this.pageModel.pageId, `${group.id}`, this.pageModel.channelId, group.groupStrategy
+        , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
       this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
         this.pageDto.compList.forEach((comp) => {
@@ -189,12 +280,11 @@ export struct PageComponent {
           this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
         })
         this.isFirstIn = false
-      // } else {
-      //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
-      //   this.pageModel.viewType = ViewType.EMPTY;
-      // }
+      } else {
+        Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+        this.pageModel.viewType = ViewType.EMPTY;
+      }
     }
-
   }
   async getPreviewData() {
--- a/sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
View file @0aebb7f
+++ b/sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
View file @0aebb7f
@@ -6,6 +6,7 @@ import {
   CompInfoBean,
   ContentDetailDTO,
   ContentDTO,
+  contentListParams,
   InteractDataDTO,
   LiveReviewDTO,
   MorningEveningPaperDTO,
@@ -14,11 +15,10 @@ import {
   NewspaperTimeInfoBean,
   PageDTO,
   PageInfoBean,
+  PageInfoDTO,
   postBatchAttentionStatusParams,
   postBatchAttentionStatusResult,
   postExecuteCollectRecordParams,
-  contentListParams,
-  PageInfoDTO,
   postExecuteLikeParams,
   postInteractAccentionOperateParams,
   postRecommendListParams
@@ -48,10 +48,10 @@ export class PageRepository {
   static getCompInfoUrl(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
     let url = HttpUrlUtils.getHost();
-    if(1 == groupStrategy){
+    if (1 == groupStrategy) {
       //推荐
       url = url + HttpUrlUtils.COMP_REC_PATH;
-    }else{
+    } else {
       //非推荐
       url = url + HttpUrlUtils.COMP_PATH;
     }
@@ -194,8 +194,14 @@ export class PageRepository {
     return WDHttp.get<ResponseDTO<PageInfoDTO>>(url, headers)
   };
-  static fetchCompData(pageId: string, groupId: string, channelId: string,groupStrategy:number, currentPage: number, pageSize: number) {
-    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId,groupStrategy, currentPage, pageSize)
+  static fetchLivePageData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
+    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
+  };
+
+  static fetchCompData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
+    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
   };
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
View file @0aebb7f
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
View file @0aebb7f
@@ -7,11 +7,9 @@ import {
   MorningEveningPaperDTO,
   NavigationBodyDTO,
   PageDTO,
-  PageInfoBean,
-  PageInfoDTO
+  PageInfoBean
 } from 'wdBean';
-
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { ResponseDTO, } from 'wdNetwork';
 import { PageRepository } from '../repository/PageRepository';
@@ -145,7 +143,36 @@ export class PageViewModel extends BaseViewModel {
   async getPageData(pageModel: PageModel, context?: Context): Promise<PageDTO> {
     Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
-    return this.parseComp(PageRepository.fetchCompData(pageModel.pageId, pageModel.groupId, pageModel.channelId, pageModel.isRecGroup==true?1:0,pageModel.currentPage, pageModel.pageSize))
+    return this.parseComp(PageRepository.fetchCompData(pageModel.pageId, pageModel.groupId, pageModel.channelId, pageModel.isRecGroup == true ? 1 : 0, pageModel.currentPage, pageModel.pageSize))
+  }
+
+  async getLivePageData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number
+    , pageSize: number, context: Context): Promise<PageDTO> {
+    Logger.debug(TAG, 'getPageData pageId: ' + pageId);
+    if (mock_switch) {
+      return this.getPageData1(currentPage, context);
+    }
+    return new Promise<PageDTO>((success, error) => {
+      PageRepository.fetchLivePageData(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
+        .then((resDTO: ResponseDTO<PageDTO>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'getNavData then resDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `getNavData then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          Logger.info(TAG, "getNavData then,resDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getPageData catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
   }
   private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> {