Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -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 {

@@ -103,7 +103,7 @@ export struct DynamicDetailComponent {
       //分割线
       //分割线
       Image($r('app.media.ic_news_detail_division'))
       Image($r('app.media.ic_news_detail_division'))
         .width('100%')
         .width('100%')
-        .height($r('app.float.margin_7'))
+        .height($r('app.float.margin_9'))
         .padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
         .padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
         if (!this.isNetConnected) {
         if (!this.isNetConnected) {

 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { InteractMessageModel } from '../../model/InteractMessageModel'
 import { InteractMessageModel } from '../../model/InteractMessageModel'
-
+import { DateTimeUtils} from 'wdKit/Index'
 @Component
 @Component
 export  struct InteractMComponent {
 export  struct InteractMComponent {
   messageModel:InteractMessageModel = new InteractMessageModel;
   messageModel:InteractMessageModel = new InteractMessageModel;
@@ -15,6 +15,7 @@ export  struct InteractMComponent {
   build() {
   build() {
     Row(){
     Row(){
       Image(this.messageModel.InteractMsubM.headUrl)
       Image(this.messageModel.InteractMsubM.headUrl)
+        .alt($r('app.media.default_head'))
         .width(36)
         .width(36)
         .height(36)
         .height(36)
         .borderRadius(18)
         .borderRadius(18)
@@ -29,7 +30,7 @@ export  struct InteractMComponent {
             .margin({left:5})
             .margin({left:5})
         }.width('100%')
         }.width('100%')
 
 
-        Text(this.messageModel.time)
+        Text(this.getPublishTime(this.messageModel.time,DateTimeUtils.getDateTimestamp(this.messageModel.time)+""))
           .margin({top:2})
           .margin({top:2})
           .fontSize('12fp').fontColor('#B0B0B0').margin({top:10,bottom:10})
           .fontSize('12fp').fontColor('#B0B0B0').margin({top:10,bottom:10})
 
 
@@ -41,6 +42,7 @@ export  struct InteractMComponent {
             .constraintSize({maxHeight:500})
             .constraintSize({maxHeight:500})
         }
         }
 
 
+        if(this.messageModel.contentType != '211' && this.messageModel.contentType != '210'){
           Column(){
           Column(){
             if (this.messageModel.contentType === '207' || this.messageModel.contentType === '209'){
             if (this.messageModel.contentType === '207' || this.messageModel.contentType === '209'){
               Text('[你的评论]'+this.buildCommentContent()).fontSize('14fp').fontColor('#666666').constraintSize({maxHeight:500})
               Text('[你的评论]'+this.buildCommentContent()).fontSize('14fp').fontColor('#666666').constraintSize({maxHeight:500})
@@ -77,6 +79,7 @@ export  struct InteractMComponent {
             contentDTO.objectId = this.messageModel.InteractMsubM.contentId
             contentDTO.objectId = this.messageModel.InteractMsubM.contentId
             ProcessUtils.processPage(contentDTO)
             ProcessUtils.processPage(contentDTO)
           })
           })
+        }
       }.padding({left:5,right:5}).alignItems(HorizontalAlign.Start).width('90%')
       }.padding({left:5,right:5}).alignItems(HorizontalAlign.Start).width('90%')
     }.padding({top:10,left:16,right:16}).width('100%').alignItems(VerticalAlign.Top)
     }.padding({top:10,left:16,right:16}).width('100%').alignItems(VerticalAlign.Top)
   }
   }
@@ -102,4 +105,49 @@ export  struct InteractMComponent {
     let contentString : string = this.messageModel.contentType === '207'?this.messageModel.message:this.messageModel.InteractMsubM.beReply;
     let contentString : string = this.messageModel.contentType === '207'?this.messageModel.message:this.messageModel.InteractMsubM.beReply;
     return contentString;
     return contentString;
   }
   }
+
+  getPublishTime(data:string,publishTime: string): string {
+    const publishTimestamp = parseInt(publishTime)
+    const currentTime = Date.now(); // 当前时间戳
+
+    // 计算差异
+    const timeDifference = currentTime - publishTimestamp;
+
+    // 转换为分钟、小时和天
+    const minutes = Math.floor(timeDifference / (1000 * 60));
+    const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+    const days = Math.floor(timeDifference / (1000 * 60 * 60 * 24));
+
+    // 根据时间差返回对应的字符串
+    let result: string;
+
+    if (minutes < 60) {
+      result = `${minutes}分钟前`;
+      if (minutes === 0) {
+        result = `刚刚`;
+      }
+    } else if (hours < 24) {
+      result = `${hours}小时前`;
+    } else {
+      result = `${days}天前`;
+      if (days > 1) {
+        let arr = data.split(" ")
+        if (arr.length === 2) {
+          let arr2 = arr[0].split("-")
+          if (arr2.length === 3) {
+            result = `${arr2[1]}-${arr2[2]}`
+          }
+        } else {
+          //原始数据是时间戳  需要转成dateString
+          let time = DateTimeUtils.formatDate(Number(publishTime))
+          let arr = time.split("-")
+          if (arr.length === 3) {
+            result = `${arr[1]}-${arr[2]}`
+          }
+        }
+      }
+    }
+    console.log(result);
+    return result
+  }
 }
 }

@@ -11,19 +11,19 @@ export struct CardSourceInfo {
     Flex() {
     Flex() {
       if (this.contentDTO.corner) {
       if (this.contentDTO.corner) {
         Text(this.contentDTO.corner)
         Text(this.contentDTO.corner)
-          .fontSize($r("app.float.font_size_12"))
+          .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_ED2800"))
           .fontColor($r("app.color.color_ED2800"))
           .margin({ right: 2 })
           .margin({ right: 2 })
       }
       }
       if (this.contentDTO.rmhPlatform === 1) {
       if (this.contentDTO.rmhPlatform === 1) {
         Text(this.contentDTO.rmhInfo?.rmhName)
         Text(this.contentDTO.rmhInfo?.rmhName)
-          .fontSize($r("app.float.font_size_12"))
+          .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .maxLines(1)
           .maxLines(1)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
       } else if (this.contentDTO.source) {
       } else if (this.contentDTO.source) {
         Text(`${this.contentDTO.source}`)
         Text(`${this.contentDTO.source}`)
-          .fontSize($r("app.float.font_size_12"))
+          .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .maxLines(1)
           .maxLines(1)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -43,13 +43,13 @@ export struct CardSourceInfo {
             .height(16)
             .height(16)
         }
         }
         Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
         Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .fontSize($r("app.float.font_size_12"))
+          .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0)
           .flexShrink(0)
       }
       }
       if (this.getContentDtoBean()?.interactData?.commentNum) {
       if (this.getContentDtoBean()?.interactData?.commentNum) {
         Text(`${this.getContentDtoBean()?.interactData?.commentNum}评`)
         Text(`${this.getContentDtoBean()?.interactData?.commentNum}评`)
-          .fontSize($r("app.float.font_size_12"))
+          .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0)
           .flexShrink(0)
           .margin({ left: 6 })
           .margin({ left: 6 })

@@ -51,7 +51,7 @@ export struct Card10Component {
           }
           }
         }
         }
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })

@@ -52,7 +52,7 @@ export struct Card11Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-        .fontSize($r("app.float.font_size_16"))
+        .fontSize($r("app.float.font_size_18"))
         .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
         .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
         .maxLines(3)
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })

@@ -50,7 +50,7 @@ export struct Card12Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .textOverflowStyle(3)
           .textOverflowStyle(3)

@@ -54,7 +54,7 @@ export struct Card14Component {
               Span(this.contentDTO.newsTitle)
               Span(this.contentDTO.newsTitle)
             }
             }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .textOverflowStyle(3)
           .textOverflowStyle(3)
           .lineHeight(25)
           .lineHeight(25)

@@ -55,7 +55,7 @@ export struct Card15Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .textOverflowStyle(2)
           .textOverflowStyle(2)

@@ -58,7 +58,7 @@ export struct Card16Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .textOverflowStyle(2)
           .textOverflowStyle(2)

@@ -49,7 +49,7 @@ export struct Card17Component {
         }
         }
       }
       }
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
-        .fontSize($r('app.float.font_size_17'))
+        .fontSize($r('app.float.font_size_18'))
         .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
         .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
         .lineHeight(25)
         .lineHeight(25)
         .maxLines(3)
         .maxLines(3)

@@ -49,12 +49,12 @@ export struct Card19Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .textOverflowStyle(3)
           .textOverflowStyle(3)
           .margin({ bottom: 8 })
           .margin({ bottom: 8 })
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
-          .lineHeight(22)
+          .lineHeight(25)
           .onClick((event: ClickEvent) => {
           .onClick((event: ClickEvent) => {
             this.clicked = true;
             this.clicked = true;
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)

@@ -50,7 +50,7 @@ export struct Card20Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
           .textOverflowStyle(3)
           .textOverflowStyle(3)

@@ -52,7 +52,7 @@ export struct Card21Component {
               Span(this.contentDTO.newsTitle)
               Span(this.contentDTO.newsTitle)
             }
             }
           }
           }
-            .fontSize($r('app.float.selected_text_size'))
+            .fontSize(18)
             .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
             .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
             .width(CommonConstants.FULL_WIDTH)
             .width(CommonConstants.FULL_WIDTH)
             .maxLines(4)
             .maxLines(4)

@@ -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 })
           }
           }
 
 
@@ -63,14 +65,18 @@ export struct Card2Component {
               Span(this.contentDTO.newsTitle)
               Span(this.contentDTO.newsTitle)
             }
             }
           }
           }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .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() {

@@ -50,7 +50,8 @@ export struct Card3Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-        .fontSize($r("app.float.font_size_16"))
+        .lineHeight(27)
+        .fontSize($r("app.float.font_size_18"))
         .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
         .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
         .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :

@@ -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';
 
 
 /**
 /**
@@ -44,6 +44,11 @@ export struct Card4Component {
       //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) {
             Span(this.str01)
             Span(this.str01)
@@ -54,10 +59,12 @@ export struct Card4Component {
             Span(this.contentDTO.newsTitle)
             Span(this.contentDTO.newsTitle)
           }
           }
         }
         }
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+          
+          
         //三图
         //三图
         Stack(){
         Stack(){
           Row() {
           Row() {

@@ -71,10 +71,11 @@ export struct Card5Component {
             }
             }
             .width(CommonConstants.FULL_WIDTH)
             .width(CommonConstants.FULL_WIDTH)
             .fontColor(Color.White)
             .fontColor(Color.White)
-            .fontSize($r('app.float.font_size_17'))
+            .fontSize($r('app.float.font_size_18'))
             .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)

@@ -70,8 +70,8 @@ export struct Card6Component {
               }
               }
             }
             }
               .fontColor(this.clicked ? 0x848484 : 0x222222)
               .fontColor(this.clicked ? 0x848484 : 0x222222)
-              .fontSize(16)
-              .lineHeight(24)
+              .fontSize(18)
+              .lineHeight(27)
               .fontWeight(FontWeight.Normal)
               .fontWeight(FontWeight.Normal)
               .maxLines(3)
               .maxLines(3)
               .alignSelf(ItemAlign.Start)
               .alignSelf(ItemAlign.Start)

@@ -50,7 +50,7 @@ export struct Card9Component {
         }
         }
           .fontColor(this.clicked ? 0x848484 : 0x222222)
           .fontColor(this.clicked ? 0x848484 : 0x222222)
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })

@@ -36,7 +36,7 @@ export struct SearchContentComponent {
       Column() {
       Column() {
         //新闻标题
         //新闻标题
         Text(this.contentDTO.newsTitle)
         Text(this.contentDTO.newsTitle)
-          .fontSize($r('app.float.font_size_17'))
+          .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。

@@ -208,7 +208,7 @@ struct CarouselLayout01CardView {
           Text(`${this.item.corner}${this.item.newsTitle}`)
           Text(`${this.item.corner}${this.item.newsTitle}`)
             .width(CommonConstants.FULL_PARENT)
             .width(CommonConstants.FULL_PARENT)
             .fontColor(Color.White)
             .fontColor(Color.White)
-            .fontSize($r('app.float.font_size_16'))
+            .fontSize($r('app.float.font_size_18'))
             .fontWeight(FontWeight.Medium)
             .fontWeight(FontWeight.Medium)
             .textAlign(TextAlign.Start)
             .textAlign(TextAlign.Start)
             .align(Alignment.Bottom)
             .align(Alignment.Bottom)

@@ -57,7 +57,7 @@ export struct ZhSingleColumn04 {
         .width(12)
         .width(12)
         .margin({ left: 12, right: 8 })
         .margin({ left: 12, right: 8 })
       Text(item.newsTitle)
       Text(item.newsTitle)
-        .fontSizeColorWeight($r('app.float.font_size_17'), $r('app.color.color_222222'), 400)
+        .fontSizeColorWeight($r('app.float.font_size_18'), $r('app.color.color_222222'), 400)
         .maxLines(1)
         .maxLines(1)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .layoutWeight(1)
         .layoutWeight(1)

@@ -101,7 +101,7 @@ struct localCard {
       Text(this.operDataListItem.newsTitle)
       Text(this.operDataListItem.newsTitle)
         .width(CommonConstants.FULL_PARENT)
         .width(CommonConstants.FULL_PARENT)
         .height(CommonConstants.FULL_PARENT)
         .height(CommonConstants.FULL_PARENT)
-        .fontSize($r('app.float.font_size_16'))
+        .fontSize($r('app.float.font_size_18'))
         .fontColor('#000000')
         .fontColor('#000000')
         .align(Alignment.TopStart)
         .align(Alignment.TopStart)
         .maxLines(3)
         .maxLines(3)

@@ -168,7 +168,7 @@ export struct ZhSingleRow06 {
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
               : $r('app.media.default_head')
               : $r('app.media.default_head')
-            : '')
+            : $r('app.media.comment_rmh_tag'))
           .width(32)
           .width(32)
           .height(32)
           .height(32)
           .borderRadius(16)
           .borderRadius(16)

@@ -31,21 +31,26 @@ struct InteractMessagePage {
       if(this.browSingModel.viewType == ViewType.ERROR){
       if(this.browSingModel.viewType == ViewType.ERROR){
         EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NetworkFailed})
         EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NetworkFailed})
       }else if(this.browSingModel.viewType == ViewType.EMPTY){
       }else if(this.browSingModel.viewType == ViewType.EMPTY){
-        EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoHistory})
+        EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoMessage})
       }else {
       }else {
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata:this.allDatas,
           alldata:this.allDatas,
           scroller:this.scroller,
           scroller:this.scroller,
+          hasMore:this.browSingModel.hasMore,
           customList:()=>{
           customList:()=>{
             this.ListLayout()
             this.ListLayout()
           },
           },
           onRefresh:(resolve)=>{
           onRefresh:(resolve)=>{
-            this.browSingModel.currentPage = 0
+            this.currentPage = 1
             this.getData(resolve)
             this.getData(resolve)
           },
           },
           onLoadMore:(resolve)=> {
           onLoadMore:(resolve)=> {
-            this.browSingModel.currentPage++
-            this.getData()
+            if (this.browSingModel.hasMore === false) {
+              if(resolve) resolve('')
+              return
+            }
+            this.currentPage++
+            this.getData(resolve)
           }
           }
         })
         })
       }
       }
@@ -75,6 +80,7 @@ struct InteractMessagePage {
         }
         }
       }
       }
     }
     }
+    .scrollBar(BarState.Off)
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
   }
   }
@@ -120,18 +126,19 @@ struct InteractMessagePage {
         for (let index = 0; index < InteractMessageMItem.list.length; index++) {
         for (let index = 0; index < InteractMessageMItem.list.length; index++) {
           const element = InteractMessageMItem.list[index];
           const element = InteractMessageMItem.list[index];
           element.InteractMsubM = JSON.parse(element.remark)
           element.InteractMsubM = JSON.parse(element.remark)
+          this.allDatas.push(element)
         }
         }
 
 
-        this.allDatas.push(...InteractMessageMItem.list)
-        if (InteractMessageMItem.list.length === this.browSingModel.pageSize) {
-          this.browSingModel.currentPage++;
-          this.browSingModel.hasMore = true;
-        } else {
+        if (InteractMessageMItem.hasNext === 0) {
           this.browSingModel.hasMore = false;
           this.browSingModel.hasMore = false;
+        } else {
+          this.browSingModel.hasMore = true;
         }
         }
       } else {
       } else {
+        if (this.currentPage === 1) {
           this.browSingModel.viewType = ViewType.EMPTY;
           this.browSingModel.viewType = ViewType.EMPTY;
         }
         }
+      }
     })
     })
   }
   }
 
 

@@ -114,6 +114,7 @@ struct MyCollectionListPage {
         if (this.browSingModel.hasMore === false) NoMoreLayout()
         if (this.browSingModel.hasMore === false) NoMoreLayout()
       }
       }
     }
     }
+    .scrollBar(BarState.Off)
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
   }
   }

 import router from '@ohos.router'
 import router from '@ohos.router'
-import { StringUtils, ToastUtils } from 'wdKit'
+import { NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
 import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem'
 import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem'
+import { EmptyComponent } from '../view/EmptyComponent'
 import { SearchHistoryComponent } from './SearchHistoryComponent'
 import { SearchHistoryComponent } from './SearchHistoryComponent'
 import { SearchHotsComponent } from './SearchHotsComponent'
 import { SearchHotsComponent } from './SearchHotsComponent'
 import { SearchRelatedComponent } from './SearchRelatedComponent'
 import { SearchRelatedComponent } from './SearchRelatedComponent'
@@ -30,6 +31,7 @@ export struct SearchComponent {
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
   @State count:string[] = []
   @State count:string[] = []
   @State isGetRequest:boolean = false;
   @State isGetRequest:boolean = false;
+  @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
 
 
   aboutToAppear() {
   aboutToAppear() {
     //获取提示滚动
     //获取提示滚动
@@ -127,8 +129,16 @@ export struct SearchComponent {
         .padding({ left: '31lpx', right: '31lpx' })
         .padding({ left: '31lpx', right: '31lpx' })
       } else {
       } else {
         if (this.hasChooseSearch) {
         if (this.hasChooseSearch) {
+          if(!this.isConnectNetwork){
+            EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
+              this.getSearchInputResData(this.searchText)
+            }})
+              .layoutWeight(1)
+              .width('100%')
+          }else{
             //搜索结果
             //搜索结果
             SearchResultComponent({count:this.count,searchText:this.searchText,isGetRequest:this.isGetRequest})
             SearchResultComponent({count:this.count,searchText:this.searchText,isGetRequest:this.isGetRequest})
+          }
         } else {
         } else {
           //联想搜索
           //联想搜索
           SearchRelatedComponent({relatedSearchContentData:$relatedSearchContentsData,onGetSearchRes: (item): void => this.getSearchRelatedResData(item),searchText:this.searchText})
           SearchRelatedComponent({relatedSearchContentData:$relatedSearchContentsData,onGetSearchRes: (item): void => this.getSearchRelatedResData(item),searchText:this.searchText})
@@ -138,7 +148,6 @@ export struct SearchComponent {
     .width('100%')
     .width('100%')
   }
   }
 
 
-
   /**
   /**
    * 点击搜索记录列表回调
    * 点击搜索记录列表回调
    * @param content
    * @param content
@@ -330,10 +339,12 @@ export struct SearchComponent {
       }
       }
       this.isGetRequest = true
       this.isGetRequest = true
       this.resetSearch()
       this.resetSearch()
+      this.isConnectNetwork = NetworkUtil.isNetConnected()
     }).catch((err: Error) => {
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       console.log(TAG, JSON.stringify(err))
       this.isGetRequest = true
       this.isGetRequest = true
       this.resetSearch()
       this.resetSearch()
+      this.isConnectNetwork = NetworkUtil.isNetConnected()
     })
     })
   }
   }
 
 

@@ -132,6 +132,11 @@ export struct OperRowListView {
   build() {
   build() {
     // 视频详情页
     // 视频详情页
 
 
+    Column() {
+      Image($r('app.media.ic_news_detail_division'))
+        .width('100%')
+        .height($r('app.float.margin_4'))
+
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         // AudioDialog()
         // AudioDialog()
         Row() {
         Row() {
@@ -150,7 +155,7 @@ export struct OperRowListView {
             }
             }
             router.back();
             router.back();
           })
           })
-        .width(42)
+          .width(48)
 
 
           if (this.contentDetailData?.newsId) {
           if (this.contentDetailData?.newsId) {
             ForEach(this.operationButtonList, (item: string, index: number) => {
             ForEach(this.operationButtonList, (item: string, index: number) => {
@@ -180,6 +185,7 @@ export struct OperRowListView {
         bottom: `${this.bottomSafeHeight}px`
         bottom: `${this.bottomSafeHeight}px`
         // bottom: 50
         // bottom: 50
       })
       })
+    }
 
 
   }
   }
 
 
@@ -200,7 +206,7 @@ export struct OperRowListView {
     }
     }
     .layoutWeight(1)
     .layoutWeight(1)
     .margin({
     .margin({
-      right: this.pageComponentType === 1 ? 16 : 0,
+      right: this.pageComponentType === 1 ? 22 : 0,
     })
     })
 
 
     if (this.showCommentIcon) {
     if (this.showCommentIcon) {
@@ -212,7 +218,7 @@ export struct OperRowListView {
             })
             })
         }
         }
       }
       }
-      .width(46)
+      .width(48)
     }
     }
 
 
   }
   }
@@ -233,7 +239,7 @@ export struct OperRowListView {
       })
       })
       // }
       // }
     }
     }
-    .width(42)
+    .width(48)
     .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
     .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
   }
   }
 
 
@@ -261,7 +267,7 @@ export struct OperRowListView {
         })*/
         })*/
     }
     }
     .height(36)
     .height(36)
-    .width(36)
+    .width(48)
     .borderRadius(18)
     .borderRadius(18)
     .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
     .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
     .onClick(() => {
     .onClick(() => {
@@ -289,7 +295,7 @@ export struct OperRowListView {
         })
         })
     }
     }
     .height(36)
     .height(36)
-    .width(36)
+    .width(48)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
   }
   }
 
 
@@ -312,7 +318,7 @@ export struct OperRowListView {
     }
     }
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .height(36)
     .height(36)
-    .width(36)
+    .width(48)
     .borderRadius(18)
     .borderRadius(18)
     .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
     .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
   }
   }

-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))

@@ -65,10 +65,18 @@
       "value": "14vp"
       "value": "14vp"
     },
     },
     {
     {
+      "name": "margin_4",
+      "value": "4vp"
+    },
+    {
       "name": "margin_8",
       "name": "margin_8",
       "value": "8vp"
       "value": "8vp"
     },
     },
     {
     {
+      "name": "margin_9",
+      "value": "9vp"
+    },
+    {
       "name": "label_margin_top",
       "name": "label_margin_top",
       "value": "10vp"
       "value": "10vp"
     },
     },

@@ -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,11 +30,14 @@ 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
       if (action) {
       if (action) {
         this.contentId = action.params?.contentID || ''
         this.contentId = action.params?.contentID || ''
@@ -45,6 +49,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 +173,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 +221,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)
 
 

@@ -13,6 +13,10 @@
       "value": "12fp"
       "value": "12fp"
     },
     },
     {
     {
+      "name": "margin_4",
+      "value": "4vp"
+    },
+    {
       "name": "normal_text_size",
       "name": "normal_text_size",
       "value": "16fp"
       "value": "16fp"
     },
     },