根据groupid按顺序请求并加载,直播回看加载及展现

@@ -25,11 +25,11 @@ export class CollectionUtils {
    * @returns  {boolean} true(empty)
    * @returns  {boolean} true(empty)
    */
    */
   static isEmpty(collection?: any[]): boolean {
   static isEmpty(collection?: any[]): boolean {
-    return !collection || collection.length === 0;
+    return!collection || collection.length === 0;
   }
   }
 
 
   static isEmptyList<T>(list1?: LinkList<T>): boolean {
   static isEmptyList<T>(list1?: LinkList<T>): boolean {
-    return !list1 || list1.length === 0;
+    return!list1 || list1.length === 0;
   }
   }
 
 
   static isEmptyHashMap(obj?: HashMap<any, any>): boolean {
   static isEmptyHashMap(obj?: HashMap<any, any>): boolean {
@@ -179,5 +179,13 @@ export class CollectionUtils {
     ss;
     ss;
     return collection.slice(start, end);
     return collection.slice(start, end);
   }
   }
+
+
+  static getElement(collection?: any[], index?: number): any {
+    if (CollectionUtils.isEmpty(collection) || index === undefined) {
+      return null;
+    }
+    return index >= 0 && index < collection.length ? collection[index] : null;
+  }
 }
 }
 
 

@@ -48,7 +48,7 @@ export struct CompParser {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
       LiveHorizontalReservationComponent({ compDTO: compDTO })
       LiveHorizontalReservationComponent({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
-      // ZhGridLayout02({ compDTO: compDTO })
+      ZhGridLayout02({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
       ZhGridLayout03({ compDTO: compDTO })
       ZhGridLayout03({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
 
 
 const TAG = 'Zh_Grid_Layout-02';
 const TAG = 'Zh_Grid_Layout-02';
 const FULL_PARENT: string = '100%';
 const FULL_PARENT: string = '100%';
@@ -22,6 +23,22 @@ export struct ZhGridLayout02 {
   }
   }
 
 
   build() {
   build() {
+    Column() {
+      Row() {
+        Image($r("app.media.redLine"))
+          .width(3)
+          .height(16)
+          .margin({ right: 4 })
+        Text(this.compDTO.objectTitle)
+          .fontSize($r("app.float.font_size_17"))
+          .fontColor($r("app.color.color_222222"))
+          .fontWeight(600)
+      }
+      .justifyContent(FlexAlign.Start)
+      .margin({ top: 8, bottom: 8 })
+      .width(CommonConstants.FULL_WIDTH)
+
+
       GridRow({
       GridRow({
         columns: { sm: listSize, md: 2 },
         columns: { sm: listSize, md: 2 },
         breakpoints: { value: ['320vp', '520vp', '840vp'] }
         breakpoints: { value: ['320vp', '520vp', '840vp'] }
@@ -33,6 +50,14 @@ export struct ZhGridLayout02 {
         })
         })
       }
       }
     }
     }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      top: 14,
+      left: 16,
+      right: 16
+    })
+
+  }
 
 
   /**
   /**
    * 组件项
    * 组件项
@@ -42,13 +67,13 @@ export struct ZhGridLayout02 {
   @Builder
   @Builder
   buildItemCard(item: ContentDTO) {
   buildItemCard(item: ContentDTO) {
     Column() {
     Column() {
-      Image(item.coverUrl)
-        .width(44)
-        .aspectRatio(1 / 1)
+      Image(item.fullColumnImgUrls[0].url)
+        .width(170)
+        .height(95)
         .margin(16)
         .margin(16)
       Text(item.newsTitle)
       Text(item.newsTitle)
         .fontSize(13)
         .fontSize(13)
-        .maxLines(1)
+        .maxLines(2)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }
     }
     .width('100%')
     .width('100%')

-import { CommonConstants, ViewType } from 'wdConstant';
+import { CommonConstants, CompStyle, ViewType } from 'wdConstant';
 import { DateTimeUtils, Logger } from 'wdKit';
 import { DateTimeUtils, Logger } from 'wdKit';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
@@ -12,7 +12,7 @@ import LoadMoreLayout from './LoadMoreLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CompParser } from '../CompParser';
 import { CompParser } from '../CompParser';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
-import { CompDTO, LiveReviewDTO } from 'wdBean';
+import { CompDTO, LiveReviewDTO, PageDTO } from 'wdBean';
 
 
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
@@ -23,6 +23,14 @@ export struct PageComponent {
   pageId: string = "";
   pageId: string = "";
   channelId: string = "";
   channelId: string = "";
   pageNum: number = 1;
   pageNum: number = 1;
+  isFirstIn: boolean = true
+  pageDto: PageDTO = {
+    pageId: '',
+    id: 0,
+    name: '',
+    branchMark: false,
+    compList: []
+  }
   liveReviewDTO: LiveReviewDTO = {
   liveReviewDTO: LiveReviewDTO = {
     hasNext: false,
     hasNext: false,
     pageNum: 0,
     pageNum: 0,
@@ -126,40 +134,91 @@ export struct PageComponent {
   }
   }
 
 
   onChange() {
   onChange() {
-    Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
-    if (this.navIndex === this.currentTopNavSelectedIndex) {
+    Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , ${this.isFirstIn} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    if (this.navIndex === this.currentTopNavSelectedIndex && !this.isFirstIn) {
       this.getData();
       this.getData();
     }
     }
   }
   }
 
 
+  /**
+   * 要按顺序处理pageInfo.groups中的每个元素，并确保每个异步操作完成后再继续执行下一个，你应该避免使用forEach。
+   * 取而代之的是，你可以使用for...of循环，并配合async/await来确保按顺序执行操作。
+   * */
   async getData() {
   async getData() {
     Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
     Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
     this.pageModel.pageId = this.pageId;
     this.pageModel.pageId = this.pageId;
     this.pageModel.groupId = this.pageId;
     this.pageModel.groupId = this.pageId;
     this.pageModel.channelId = this.channelId;
     this.pageModel.channelId = this.channelId;
     this.pageModel.currentPage = 1;
     this.pageModel.currentPage = 1;
-    let pageDto = await PageViewModel.getPageData(this.pageModel.pageId, this.pageModel.pageId, this.pageModel.channelId
+    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.getPageData(this.pageModel.pageId, `${group.id}`, this.pageModel.channelId
         , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
         , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
       this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-    if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
+      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.viewType = ViewType.LOADED;
-      this.pageModel.compList.push(...pageDto.compList)
-      if (pageDto.compList.length === this.pageModel.pageSize) {
+        this.pageModel.compList.push(...this.pageDto.compList)
+        if (this.pageDto.compList.length === this.pageModel.pageSize) {
           this.pageModel.currentPage++;
           this.pageModel.currentPage++;
           this.pageModel.hasMore = true;
           this.pageModel.hasMore = true;
         } else {
         } else {
           this.pageModel.hasMore = false;
           this.pageModel.hasMore = false;
         }
         }
-      // 二次请求，批查互动数据
-      PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
-        // 刷新，替换所有数据
-        this.pageModel.compList.replaceAll(...data)
-        this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-      })
+        // // 二次请求，批查互动数据
+        // 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 {
       } else {
         Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
         Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
         this.pageModel.viewType = ViewType.EMPTY;
         this.pageModel.viewType = ViewType.EMPTY;
       }
       }
+    }
+
+    // this.isFirstIn = false
+    // let groupInfo: Group = CollectionUtils.getElement(pageInfo.groups, 0);
+    // if (groupInfo != null) {
+    //   this.pageModel.groupStrategy = groupInfo.groupStrategy;
+    //   this.pageModel.isRecGroup = groupInfo.groupStrategy === 1;
+    //   this.pageModel.groupId = "" + groupInfo.id;
+    // }
+    // let pageDto = await PageViewModel.getPageData(this.pageModel.pageId, this.pageModel.pageId, this.pageModel.channelId
+    //   , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
+    // this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+    // if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
+    //   this.pageModel.viewType = ViewType.LOADED;
+    //   this.pageModel.compList.push(...pageDto.compList)
+    //   if (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()
+    //   })
+    // } else {
+    //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+    //   this.pageModel.viewType = ViewType.EMPTY;
+    // }
 
 
   }
   }
 
 

@@ -174,6 +174,12 @@ export class PageRepository {
     return WDHttp.get<ResponseDTO<MorningEveningPaperDTO>>(url, headers)
     return WDHttp.get<ResponseDTO<MorningEveningPaperDTO>>(url, headers)
   };
   };
 
 
+  static fetchPageUrlData(pageId: string) {
+    let url = PageRepository.getPageUrl(pageId)
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.get<ResponseDTO<PageInfoBean>>(url, headers)
+  };
+
   static fetchPageData(pageId: string, groupId: string, channelId: string, currentPage: number, pageSize: number) {
   static fetchPageData(pageId: string, groupId: string, channelId: string, currentPage: number, pageSize: number) {
     let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, currentPage, pageSize)
     let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, currentPage, pageSize)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
@@ -341,4 +347,10 @@ export class PageRepository {
     Logger.info(TAG, "postRecommendList url = " + url + JSON.stringify(params))
     Logger.info(TAG, "postRecommendList url = " + url + JSON.stringify(params))
     return WDHttp.post<ResponseDTO<ContentDTO[]>>(url, params, headers)
     return WDHttp.post<ResponseDTO<ContentDTO[]>>(url, params, headers)
   };
   };
+
+  static getPageUrl(pageId: string) {
+    const url = HttpUrlUtils.getHost() + HttpUrlUtils.PAGE_INFO_PATH + "?pageId=" + pageId;
+    Logger.info(TAG, "getPageUrl url = " + url)
+    return url;
+  }
 }
 }

@@ -34,4 +34,6 @@ export default class PageModel {
   isCanLoadMore: boolean = false;
   isCanLoadMore: boolean = false;
   // keyGenerator相关字符串，用于刷新list布局
   // keyGenerator相关字符串，用于刷新list布局
   timestamp: String = '1';
   timestamp: String = '1';
+  groupStrategy: number = 0;
+  isRecGroup: boolean = false;
 }
 }

@@ -6,7 +6,8 @@ import {
   LiveReviewDTO,
   LiveReviewDTO,
   MorningEveningPaperDTO,
   MorningEveningPaperDTO,
   NavigationBodyDTO,
   NavigationBodyDTO,
-  PageDTO
+  PageDTO,
+  PageInfoBean
 } from 'wdBean';
 } from 'wdBean';
 
 
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
@@ -168,6 +169,31 @@ export class PageViewModel extends BaseViewModel {
     })
     })
   }
   }
 
 
+  async getPageUrlData(pageId: string): Promise<PageInfoBean> {
+    Logger.debug(TAG, 'getPageUrlData pageId: ' + pageId);
+    return new Promise<PageInfoBean>((success, error) => {
+      PageRepository.fetchPageUrlData(pageId)
+        .then((resDTO: ResponseDTO<PageInfoBean>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'fetchPageUrlData then resDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `fetchPageUrlData then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          Logger.info(TAG, "fetchPageUrlData then,resDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `fetchPageUrlData catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
+  }
+
   async getInteractData(compList: CompDTO[]) {
   async getInteractData(compList: CompDTO[]) {
     let param: InteractParam = this.getInteractParams(compList);
     let param: InteractParam = this.getInteractParams(compList);
     const SIZE = 20;
     const SIZE = 20;