Merge remote-tracking branch 'origin/main'

@@ -2,6 +2,8 @@
  * page接口返回的Page数据DTO
  * page接口返回的Page数据DTO
  */
  */
 import { AdvRuleBean, CompAdvBean } from '../adv/AdvsRuleBean';
 import { AdvRuleBean, CompAdvBean } from '../adv/AdvsRuleBean';
+import { ArrayList } from '@kit.ArkTS';
+import { CompDTO } from '../component/CompDTO';
 
 
 export interface PageInfoDTO {
 export interface PageInfoDTO {
   pageId: string; // 页面id
   pageId: string; // 页面id
@@ -27,6 +29,18 @@ export interface PageInfoDTO {
    */
    */
   cornersAdv2: CompAdvBean[]
   cornersAdv2: CompAdvBean[]
 
 
+
+  // 本地字段
+  /*
+     记录一次请求获取到的楼层comp数据，如 完成一次刷新到结束，获取所有楼层的稿件数据
+   */
+  oneRequestPageGroupCompList: ArrayList<CompDTO>
+
+  /*
+     记录页面楼层所有的信息流广告数据
+   */
+  pageAdList:CompAdvBean[]
+
 }
 }
 
 
 export interface ChannelInfoDTO {
 export interface ChannelInfoDTO {

@@ -49,7 +49,9 @@ export struct Card2Component {
       Column() {
       Column() {
         Stack() {
         Stack() {
           //新闻标题
           //新闻标题
-          if (this.contentDTO.objectType == '5') {
+          if (this.contentDTO.newTags) {
+              Notes({ newTags: this.contentDTO.newTags })
+          } else if (this.contentDTO.objectType == '5') {
               Notes({ objectType: this.contentDTO.objectType })
               Notes({ objectType: this.contentDTO.objectType })
           }
           }
 
 
@@ -68,9 +70,13 @@ export struct Card2Component {
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .align(Alignment.Start)
           .align(Alignment.Start)
-          .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
-        }
-        .alignContent(Alignment.TopStart)
+          .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
+          (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+            this.contentDTO.objectType == '5' ? 30 : 0)
+      }.alignContent(Alignment.TopStart)
+          //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
+       // }
+       // .alignContent(Alignment.TopStart)
 
 
         //大图
         //大图
         Stack() {
         Stack() {

@@ -4,7 +4,7 @@ import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
-
+import { Notes } from './notes';
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
 /**
 /**
@@ -43,6 +43,11 @@ export struct Card4Component {
     Column() {
     Column() {
       //body
       //body
       Column() {
       Column() {
+      if (this.contentDTO.newTags) {
+          Notes({ newTags: this.contentDTO.newTags })
+       } else if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: this.contentDTO.objectType })
+       }    
         //新闻标题
         //新闻标题
         Text() {
         Text() {
           if (this.titleMarked) {
           if (this.titleMarked) {
@@ -96,6 +101,10 @@ export struct Card4Component {
         this.clicked = true;
         this.clicked = true;
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)
       })
       })
+      .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
+          (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+            this.contentDTO.objectType == '5' ? 30 : 0)
+      }.alignContent(Alignment.TopStart)
       //bottom 评论等信息
       //bottom 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
     }

@@ -75,6 +75,7 @@ export struct Card5Component {
             .fontWeight(FontWeight.Bold)
             .fontWeight(FontWeight.Bold)
             .maxLines(2)
             .maxLines(2)
             .align(Alignment.TopStart)
             .align(Alignment.TopStart)
+            .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
             .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
             .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
               (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
               (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
                 this.contentDTO.objectType == '5' ? 30 : 0)
                 this.contentDTO.objectType == '5' ? 30 : 0)

-import { CompDTO, ContentDTO, InteractDataDTO, PageDTO, PageInfoDTO } from 'wdBean';
+import { CompDTO, ContentDTO, InteractDataDTO, LiveReviewDTO, PageDTO, PageInfoDTO } from 'wdBean';
 import { CompStyle, ViewType } from 'wdConstant/Index';
 import { CompStyle, ViewType } from 'wdConstant/Index';
 import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils } from 'wdKit';
 import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils } from 'wdKit';
 import { closeRefresh } from '../utils/PullDownRefresh';
 import { closeRefresh } from '../utils/PullDownRefresh';
@@ -13,6 +13,7 @@ import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean
 import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO';
 import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO';
 import { viewBlogInsightIntentShare, ActionMode } from '../utils/InsightIntentShare'
 import { viewBlogInsightIntentShare, ActionMode } from '../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
+
 const TAG = 'PageHelper';
 const TAG = 'PageHelper';
 
 
 /**
 /**
@@ -75,7 +76,7 @@ export class PageHelper {
           return;
           return;
         }
         }
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
-        //解析广告资源
+        //解析页面挂角广告资源
         pageAdvModel.analysisAdvSource(pageInfo);
         pageAdvModel.analysisAdvSource(pageInfo);
         this.parseGroup(pageModel)
         this.parseGroup(pageModel)
       }).catch(() => {
       }).catch(() => {
@@ -86,10 +87,17 @@ export class PageHelper {
   }
   }
 
 
 
 
+  /**
+   * 解析信息流页面楼层数据
+   * @param pageModel
+   */
   async parseGroup(pageModel: PageModel) {
   async parseGroup(pageModel: PageModel) {
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     pageModel.groupList = []
     pageModel.groupList = []
+    pageInfo.pageAdList = []
+    pageInfo.oneRequestPageGroupCompList = new ArrayList()
     pageModel.groupList.push(...pageInfo.groups)
     pageModel.groupList.push(...pageInfo.groups)
+    Logger.error("ZZZXXXXX", 'parseGroup----1-----');
     for (const group of pageInfo.groups) {
     for (const group of pageInfo.groups) {
       pageModel.isRecGroup = group.groupStrategy === 1;
       pageModel.isRecGroup = group.groupStrategy === 1;
       pageModel.groupId = group.id;
       pageModel.groupId = group.id;
@@ -99,17 +107,40 @@ export class PageHelper {
         pageModel.pageSize = 20
         pageModel.pageSize = 20
       }
       }
       pageModel.groupData = group
       pageModel.groupData = group
+
+      Logger.error("ZZZXXXXX", '楼层id-start--》' + pageModel.groupId);
       // await，确保groups接口顺序执行
       // await，确保groups接口顺序执行
-      let pageDto = await PageViewModel.getPageData(pageModel.bizCopy()) as PageDTO
+      let pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
       let index = pageInfo.groups.indexOf(group)
       let index = pageInfo.groups.indexOf(group)
       if (index == 0) {
       if (index == 0) {
         // 清空comp列表
         // 清空comp列表
-        pageModel.compList.clearAllData()
+        pageModel.compList.clear()
+      }
+      this.analysisPageGroupCompData(pageModel,pageDto, pageInfo, index == pageInfo.groups.length - 1)
+      Logger.error("ZZZXXXXX", '楼层id-end--》' + pageModel.groupId + '  楼层 comp数量=' + pageDto.compList.length);
     }
     }
-      this.getGroupData(pageModel, pageDto, index == pageInfo.groups.length - 1)
 
 
+    /*
+         收集页面所有楼层的组件信息，同步完成广告投放计算，异步完成稿件批查,
+     */
+    pageModel.pageTotalCompSize = pageInfo.oneRequestPageGroupCompList.length + pageModel.pageTotalCompSize
+    // 处理页面广告数据，投放到页面的位置
+    this.handlePageCompAdvPostion(pageInfo.oneRequestPageGroupCompList, pageModel, pageInfo.pageAdList);
 
 
+    //遍历所有组件和稿件数据 push到页面
+    for (let element of pageInfo.oneRequestPageGroupCompList) {
+      pageModel.compList.push(CompDTO.createNewsBean(element))
     }
     }
+
+    // 批查互动数据
+    this.allCompBatchRequest(pageInfo.oneRequestPageGroupCompList.convertToArray(), pageModel)
+
+    //
+    pageModel.currentPage++
+    pageModel.viewType = ViewType.LOADED
+    closeRefresh(pageModel, true)
+
+    Logger.error("ZZZXXXXX", 'parseGroup----3----->' + pageInfo.oneRequestPageGroupCompList.length);
     if (pageModel.compList.isEmpty()) {
     if (pageModel.compList.isEmpty()) {
       // 没数据，展示空页面
       // 没数据，展示空页面
       Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
       Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
@@ -119,39 +150,197 @@ export class PageHelper {
     }
     }
   }
   }
 
 
-  private async getGroupData(pageModel: PageModel, pageDto: PageDTO, isLastGroup: boolean) {
+  /**
+   *  解析页面的楼层数据
+   * @param pageDto  楼层的组件信息
+   * @param pageInfo 信息流页面信息
+   * @param isLastGroup  pageDto信息是不是最后一个楼层
+   */
+  private async analysisPageGroupCompData(pageModel: PageModel,pageDto: PageDTO, pageInfo: PageInfoDTO, isLastGroup: boolean) {
+
     if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
     if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
-      pageModel.viewType = ViewType.LOADED;
-      if (isLastGroup) {
-        // 认为分页只会在最后一个group里
-        pageModel.currentPage++;
-      }
-      // pageModel.currentPage++;
-      pageModel.hasMore = true;
 
 
+      let pageCompList: ArrayList<CompDTO> = new ArrayList() // 收集楼层组件、稿件和本地组件容器
+      // 遍历楼层的组件数据
+      pageDto.compList.forEach((element: CompDTO) => {
+        let contentInfo: ContentDTO = CollectionUtils.getElement(element.operDataList, 0);
         //移除音频 和 活动
         //移除音频 和 活动
-      this.collectPageComp(pageModel, pageDto)
+        if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
+          Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
+        } else {
+          // 暂时屏蔽活动和音频详情入口
+          if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
+          } else {
+            pageCompList.add(element)
+          }
+        }
+      })
 
 
-      // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
-      // TODO updateItems(sizeBefore, data)，这里可能有时序问题，导致覆盖别的group数据，需要优化，考虑精准替换
-      // 二次请求，批查互动数据
-      this.allCompBatchRequest(pageDto.compList, pageModel)
+      // pageInfor 记录
+      pageCompList.forEach((comp: CompDTO) => {
+        pageInfo.oneRequestPageGroupCompList.add(comp)
+      })
 
 
+      // pageInfor 记录广告
+      if (pageDto.compAdList != null) {
+        pageInfo.pageAdList.push(...pageDto.compAdList)
+      }
 
 
-      // content级别的展现加载丢给comp自己，这里只需要处理屏蔽分页加载，pageModel.pageScroll
+      // 检测最后一个楼层是否有一行两图卡
       if (isLastGroup) {
       if (isLastGroup) {
-        closeRefresh(pageModel, true);
         // 最后一个楼层，特殊处理
         // 最后一个楼层，特殊处理
         // 检测楼层最后一个组件业务数据是否需要通过访问接口获取
         // 检测楼层最后一个组件业务数据是否需要通过访问接口获取
         let comp: CompDTO = pageDto.compList[pageDto.compList.length - 1]
         let comp: CompDTO = pageDto.compList[pageDto.compList.length - 1]
-        let compSize = CollectionUtils.getListSize(comp.operDataList)
         // 直播回放，需要二次请求数据
         // 直播回放，需要二次请求数据
-        if (compSize <= 0 && comp.compStyle == CompStyle.Zh_Grid_Layout_02) {
+        if ( comp.compStyle == CompStyle.Zh_Grid_Layout_02) {
           // 这个comp，数据自己二次请求，自己分页处理，这里加flag，将page层滑动及loadmore ui去掉
           // 这个comp，数据自己二次请求，自己分页处理，这里加flag，将page层滑动及loadmore ui去掉
           pageModel.contentNeedScroll = true
           pageModel.contentNeedScroll = true
+
+          //this.getLiveReviewData(pageInfo,comp)
+        }
+      }
+    }
+
+  }
+
+
+  /**
+   * comp加载更多，分页加载
+   */
+  private compLoadMore(pageModel: PageModel) {
+    //聚合页
+    if (pageModel.pageType == 1) {
+      PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => {
+        if (liveReviewDTO == null || liveReviewDTO.list == null || liveReviewDTO.list.length == 0) {
+          pageModel.hasMore = false;
+          return;
+        } else {
+          //更新数据
+          pageModel.compList.addItems(liveReviewDTO.list);
+          // 直接认为有分页，一直加载分页。直到没有数据，再停止
+          pageModel.currentPage++;
+          pageModel.hasMore = true;
+          pageModel.pageTotalCompSize = liveReviewDTO.list.length + pageModel.pageTotalCompSize
+        }
+      }).catch((err: string | Resource) => {
+        promptAction.showToast({ message: err });
+      })
+    } else {
+      PageViewModel.getPageGroupCompData(pageModel.bizCopy())
+        .then((data: PageDTO) => {
+          if (data == null || data.compList == null || data.compList.length == 0) {
+            pageModel.hasMore = false;
+          } else {
+            // 直接认为有分页，一直加载分页。直到没有数据，再停止
+            pageModel.currentPage++;
+            pageModel.hasMore = true;
+
+            //移除音频 和 活动
+            this.loadMorePageComp(pageModel, data)
+            // 参与批查
+            this.allCompBatchRequest(data.compList, pageModel)
+          }
+        }).catch((err: string | Resource) => {
+        promptAction.showToast({ message: err });
+      })
+    }
+  }
+
+
+  /**
+   * 加载更多页面组件和稿件信息
+   */
+  private loadMorePageComp(pageModel: PageModel, pageDto: PageDTO) {
+
+    let pageCompList: ArrayList<CompDTO> = new ArrayList() // 收集页面组件、稿件和本地组件容器
+
+    pageDto.compList.forEach((element: CompDTO) => {
+      let contentInfo: ContentDTO = CollectionUtils.getElement(element.operDataList, 0);
+      //移除音频 和 活动
+      if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
+        Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
+      } else {
+        // 暂时屏蔽活动和音频详情入口
+        if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
+        } else {
+          pageCompList.add(element)
+        }
+      }
+
+    })
+
+    // 记录
+    pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
+    // 处理页面广告数据，投放到页面的位置
+    this.handlePageCompAdvPostion(pageCompList, pageModel, pageDto.compAdList);
+
+    //遍历所有组件和稿件数据 push到页面
+    for (let element of pageCompList) {
+      pageModel.compList.push(CompDTO.createNewsBean(element))
+    }
+
+  }
+
+  /**
+   *  信息流页面，所有稿件需要参与批查，如 批查评论、批查关注状态等接口
+   * @param compList
+   * @param pageModel
+   */
+  private allCompBatchRequest(compList: CompDTO[], pageModel: PageModel) {
+    PageViewModel.getInteractData(compList).then((data: InteractDataDTO[]) => {
+      // 刷新，替换所有数据
+      this.resetInteract(data, pageModel.compList)
+      if (pageModel?.channelId === '2001' || pageModel?.channelId === '2002') {
+        //早晚报意图上报
+        let context = getContext(this) as common.UIAbilityContext;
+        viewBlogInsightIntentShare(context, pageModel?.channelId, compList, ActionMode.EXPECTED)
+      }
+    })
+
+    // 测试数据
+    // setTimeout(() => {
+    //   let index = 1
+    //   let comp = pageModel.compList.getData(index) as CompDTO
+    //   comp.hasMore = 0
+    //   //comp.operDataList[0].newsTitle = '测试111'
+    //   let con :InteractDataDTO = new InteractDataDTO;
+    //   con.commentNum=1000
+    //   comp.operDataList[0].interactData = con
+    //   Logger.debug("ZZZXXXXX",
+    //     "-----setTimeout--------->"  + comp.hasMore)
+    // }, 4 * 1000)
+  }
+
+  /**
+   * 刷新互动数据到compList
+   * @param interact 批查互动数据结果
+   * @param compList comp list
+   */
+  private resetInteract(interact: InteractDataDTO[], compList: LazyDataSource<BaseDTO>) {
+    if (interact == null || interact.length == 0) {
+      return
+    }
+    let time = DateTimeUtils.getTimeStamp().toString()
+    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;
+            comp.timestamp = time
+            break outer;
           }
           }
         }
         }
       }
       }
+    })
   }
   }
 
 
 
 
@@ -159,9 +348,9 @@ export class PageHelper {
    *   处理页面中的广告组件信息
    *   处理页面中的广告组件信息
    * @param pageDto
    * @param pageDto
    */
    */
-  private handlePageCompAdvPostion(pageCompList: ArrayList<CompDTO>, pageModel: PageModel, pageDto: PageDTO) {
+  private handlePageCompAdvPostion(pageCompList: ArrayList<CompDTO>, pageModel: PageModel, compAdList: CompAdvBean[]) {
 
 
-    let compAdvList = pageDto.compAdList
+    let compAdvList = compAdList
 
 
     let flag = true;
     let flag = true;
     if (compAdvList == null) {
     if (compAdvList == null) {
@@ -300,142 +489,15 @@ export class PageHelper {
 
 
 
 
   /**
   /**
-   * comp加载更多，分页加载
+   * 获取直播回看数据
    */
    */
-  private compLoadMore(pageModel: PageModel) {
-    //聚合页
-    if (pageModel.pageType == 1) {
-      PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => {
-        if (liveReviewDTO == null || liveReviewDTO.list == null || liveReviewDTO.list.length == 0) {
-          pageModel.hasMore = false;
-          return;
-        } else {
-          //更新数据
-          pageModel.compList.addItems(liveReviewDTO.list);
-          // 直接认为有分页，一直加载分页。直到没有数据，再停止
-          pageModel.currentPage++;
-          pageModel.hasMore = true;
-          pageModel.pageTotalCompSize = liveReviewDTO.list.length + pageModel.pageTotalCompSize
-        }
-      }).catch((err: string | Resource) => {
-        promptAction.showToast({ message: err });
-      })
-    } else {
-      PageViewModel.getPageData(pageModel.bizCopy())
-        .then((data: PageDTO) => {
-          if (data == null || data.compList == null || data.compList.length == 0) {
-            pageModel.hasMore = false;
-          } else {
-            // 直接认为有分页，一直加载分页。直到没有数据，再停止
-            pageModel.currentPage++;
-            pageModel.hasMore = true;
+  private async getLiveReviewData(pageInfo: PageInfoDTO,comp: CompDTO) {
 
 
-            //移除音频 和 活动
-            this.collectPageComp(pageModel, data)
-            // 参与批查
-            this.allCompBatchRequest(data.compList, pageModel)
-          }
-        }).catch((err: string | Resource) => {
-        promptAction.showToast({ message: err });
-      })
-    }
-  }
-
-  /**
-   *  信息流页面，所有稿件需要参与批查，如 批查评论、批查关注状态等接口
-   * @param compList
-   * @param pageModel
-   */
-  private allCompBatchRequest(compList: CompDTO[], pageModel: PageModel) {
-    PageViewModel.getInteractData(compList).then((data: InteractDataDTO[]) => {
-      // 刷新，替换所有数据
-      this.resetInteract(data, pageModel.compList)
-      if(pageModel?.channelId === '2001' || pageModel?.channelId === '2002'){
-        //早晚报意图上报
-        let context = getContext(this) as common.UIAbilityContext;
-        viewBlogInsightIntentShare(context, pageModel?.channelId, compList, ActionMode.EXPECTED)
-      }
-    })
+    let currentPage = 1
+    let pageSize = 20
+    let listReviewDtoBean =  await PageViewModel.getLiveReviewUrl(currentPage, pageSize) as LiveReviewDTO
+    Logger.error("ZZZXXXXX", 'getLiveReviewData---------'+listReviewDtoBean.list.length);
 
 
-    // 测试数据
-    // setTimeout(() => {
-    //   let index = 1
-    //   let comp = pageModel.compList.getData(index) as CompDTO
-    //   comp.hasMore = 0
-    //   //comp.operDataList[0].newsTitle = '测试111'
-    //   let con :InteractDataDTO = new InteractDataDTO;
-    //   con.commentNum=1000
-    //   comp.operDataList[0].interactData = con
-    //   Logger.debug("ZZZXXXXX",
-    //     "-----setTimeout--------->"  + comp.hasMore)
-    // }, 4 * 1000)
-  }
-
-  /**
-   * 移除comp
-   */
-  private collectPageComp(pageModel: PageModel, pageDto: PageDTO) {
-
-    let pageCompList: ArrayList<CompDTO> = new ArrayList() // 收集页面组件、稿件和本地组件容器
-
-    pageDto.compList.forEach((element: CompDTO) => {
-      let contentInfo: ContentDTO = CollectionUtils.getElement(element.operDataList, 0);
-      //移除音频 和 活动
-      if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
-        Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
-      } else {
-        // 暂时屏蔽活动和音频详情入口
-        if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
-        } else {
-          pageCompList.add(element)
-        }
-      }
-
-    })
-
-    // 记录
-    pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
-
-    // 处理页面广告数据，投放到页面的位置
-    this.handlePageCompAdvPostion(pageCompList, pageModel, pageDto);
-
-    //遍历所有组件和稿件数据 push到页面
-    for (let element of pageCompList) {
-      pageModel.compList.push(CompDTO.createNewsBean(element))
-    }
-
-  }
-
-  /**
-   * 刷新互动数据到compList
-   * @param interact 批查互动数据结果
-   * @param compList comp list
-   */
-  private resetInteract(interact: InteractDataDTO[], compList: LazyDataSource<BaseDTO>) {
-    if (interact == null || interact.length == 0) {
-      return
-    }
-    let time = DateTimeUtils.getTimeStamp().toString()
-    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;
-            comp.timestamp = time
-            break outer;
-          }
-        }
-      }
-    })
   }
   }
 }
 }
 
 

@@ -178,7 +178,12 @@ export class PageViewModel extends BaseViewModel {
     return compRes.data
     return compRes.data
   }
   }
 
 
-  async getPageData(pageModel: PageUIReqBean): Promise<PageDTO> {
+  /**
+   * 获取页面楼层的组件信息
+   * @param pageModel
+   * @returns
+   */
+  async getPageGroupCompData(pageModel: PageUIReqBean): Promise<PageDTO> {
     Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
     Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
     if (pageModel.isRecGroup) {
     if (pageModel.isRecGroup) {
       return this.parseComp(PageRepository.fetchRecCompData(pageModel))
       return this.parseComp(PageRepository.fetchRecCompData(pageModel))

@@ -273,7 +273,8 @@ export struct DetailPlayShortVideoPage {
       this.playerCoverBuilder()
       this.playerCoverBuilder()
 
 
       // 横屏-全屏观看
       // 横屏-全屏观看
-      if (this.videoLandScape === 1) {
+      // 点击查看详情 不展示
+      if (this.videoLandScape === 1 && !this.isOpenDetail) {
         this.playerFullscreenBuilder()
         this.playerFullscreenBuilder()
       }
       }
     }
     }

 import { Action, ContentDetailDTO, InteractDataDTO } from 'wdBean/Index';
 import { Action, ContentDetailDTO, InteractDataDTO } from 'wdBean/Index';
+import { NetworkUtil, Logger, NetworkType, SPHelper, WindowModel, StringUtils } from 'wdKit';
 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
 import { ResponseDTO } from 'wdNetwork/Index';
 import { ResponseDTO } from 'wdNetwork/Index';
 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage'
 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage'
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
-import { WindowModel } from 'wdKit';
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
+import { EmptyComponent } from '../../../../../wdComponent/src/main/ets/components/view/EmptyComponent';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 const TAG = 'DetailVideoListPage'
 const TAG = 'DetailVideoListPage'
@@ -29,9 +30,13 @@ export struct DetailVideoListPage {
   @Provide displayDirection: DisplayDirection = DisplayDirection.VERTICAL
   @Provide displayDirection: DisplayDirection = DisplayDirection.VERTICAL
   @State data: ContentDetailDTO[] = []
   @State data: ContentDetailDTO[] = []
   @State currentIndex: number = 0
   @State currentIndex: number = 0
+  @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State interactDataList: InteractDataDTO[] = []
   @State interactDataList: InteractDataDTO[] = []
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
+    // 注册监听网络连接
+    let netStatus = NetworkUtil.isNetConnected()
+    if (netStatus) {
       this.openFullScreen()
       this.openFullScreen()
 
 
       const action: Action = router.getParams() as Action
       const action: Action = router.getParams() as Action
@@ -45,6 +50,12 @@ export struct DetailVideoListPage {
       }
       }
       await this.queryVideoList()
       await this.queryVideoList()
       console.log(TAG, 'aboutToAppear', JSON.stringify(action.params))
       console.log(TAG, 'aboutToAppear', JSON.stringify(action.params))
+
+    } else {
+      // 无网络
+      this.netStatus = 1
+    }
+
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
@@ -163,6 +174,19 @@ export struct DetailVideoListPage {
   }
   }
 
 
   build() {
   build() {
+    if (this.netStatus !== undefined) {
+      EmptyComponent({
+        emptyType: this.netStatus, emptyButton: true, retry: () => {
+          this.getContentDetail(this.contentId, this.relId, this.relType)
+        }
+      })
+        .id('e_empty_content')
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          middle: { anchor: "__container__", align: HorizontalAlign.Center }
+        })
+    } else {
+
       Column() {
       Column() {
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
           ForEach(this.data, (item: ContentDetailDTO, index: number) => {
           ForEach(this.data, (item: ContentDetailDTO, index: number) => {
@@ -198,4 +222,5 @@ export struct DetailVideoListPage {
       //   bottom: this.bottomSafeHeight + 'px'
       //   bottom: this.bottomSafeHeight + 'px'
       // })
       // })
     }
     }
+  }
 }
 }

@@ -178,7 +178,7 @@ export struct PlayerRightView {
     .width(58)
     .width(58)
     .position({ x: '100%', y: '100%' })
     .position({ x: '100%', y: '100%' })
     .markAnchor({ x: '100%', y: '100%' })
     .markAnchor({ x: '100%', y: '100%' })
-    .padding({ bottom: 10, right: 10 })
+    .padding({ bottom: 7, right: 10 })
     .visibility(this.isOpenDetail || this.isDragging || this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ?
     .visibility(this.isOpenDetail || this.isDragging || this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ?
     Visibility.None : Visibility.Visible)
     Visibility.None : Visibility.Visible)