feat(广告)：搭建 信息流中广告稿件接口以及收集处理广告信息和信息流组件、稿件 push到页面

@@ -64,4 +64,21 @@ export const enum CompStyle {
   Card_21 = '21', // 小视频卡人民号
   Card_22 = '22', // 时间链
   Card_23 = '23', // 问政卡
+
+
+
+  Card_Adv_4 = 4, //4：轮播图     5：三图广告    6：小图广告    7：长通栏广告   8：大图广告    9：视频广告    10：展会广告    11：冠名广告    12：顶部长通栏广告
+  Card_Adv_5 = 5,
+  Card_Adv_6 = 5,
+  Card_Adv_7 = 7,
+  Card_Adv_8 = 8,
+  Card_Adv_9 = 9,
+  Card_Adv_10 = 10,
+  Card_Adv_11 = 11,
+  Card_Adv_12 = 12,
+
+  /**
+   *  本地稿件和组件样式
+   */
+  Card_Comp_Adv = 'card_comp_adv', //
 }

@@ -90,6 +90,8 @@ export class LazyDataSource<T> extends BasicDataSource<T> {
     }
   }
 
+
+
   // 在数据尾部增加一个同类型的LazyDataSource
   public pushDataSource(dataSource: LazyDataSource<T>): void {
     this.push(...dataSource.dataArray)
@@ -123,6 +125,7 @@ export class LazyDataSource<T> extends BasicDataSource<T> {
     this.addItem(item, 3)
   }
 
+
   // 把from位置的item移动到to位置(暂不支持from/to为负数或大于等于数组长度)
   public moveItem(from: number, to: number): void {
     // 当from/to大于/等于数组长度时;

@@ -23,7 +23,7 @@ export interface CompAdvMatInfoBean {
   /**
    * 信息流广告类型（4：轮播图     5：三图广告    6：小图广告    7：长通栏广告   8：大图广告    9：视频广告    10：展会广告    11：冠名广告    12：顶部长通栏广告）
    */
-  advSubType: string
+  advSubType: number
   /**
    * 素材图片信息；adv_subtype=4，5，6，7，8，9，12 时使用
    */

+import { CompAdvMatInfoBean } from '../adv/CompAdvInfoBean';
 import { AudioDTO } from '../content/AudioDTO';
 import { ContentDTO } from '../content/ContentDTO';
 
@@ -7,6 +8,7 @@ export interface CompDTO {
   cityCode: string;
   compStyle: string;
   compType: string;
+
   // dataSourceRequest: any[];
   districtCode: string;
   extraData?: string;
@@ -15,6 +17,7 @@ export interface CompDTO {
   imgSize: string;
   innerUrl: string;
   linkUrl: string;
+
   // meddleDataList: any[];
   name: string;
   objectId: string; // 跳转页面id?
@@ -34,4 +37,9 @@ export interface CompDTO {
    * 组件内容源类型  (LIVE_HORIZONTAL_CARD\LIVE_RESERVATION\LIVE_LARGE_CARD\LIVE_END\LIVE_MONTHLY_RANKING  )
    */
   dataSourceType: string;
+
+  /**
+   * 信息流广告素材
+   */
+  matInfo: CompAdvMatInfoBean
 }
\ No newline at end of file

+import { CompAdvBean } from '../adv/AdvsRuleBean';
 import { CompDTO } from './CompDTO';
 
 /**
@@ -10,4 +11,6 @@ export interface PageDTO {
   name: string; // 名称
   branchMark: boolean;
   compList: CompDTO[]; // Components集合的布局信息
+
+  compAdList:CompAdvBean[] // 页面广告
 }
\ No newline at end of file

@@ -23,6 +23,8 @@ import { ZhGridLayout02 } from './compview/ZhGridLayout02';
 import { Card5Component } from './cardview/Card5Component';
 import { Card2Component } from './cardview/Card2Component';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { CardAdvComponent } from './cardViewAdv/CardAdvComponent';
+import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 
 /**
  * comp适配器.
@@ -42,7 +44,7 @@ export struct CompParser {
 
   @Builder
   componentBuilder(compDTO: CompDTO, compIndex: number) {
-    if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
+    // if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
     if (compDTO.compStyle === CompStyle.Label_03) {
       LabelComponent({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
@@ -81,6 +83,8 @@ export struct CompParser {
       ZhSingleColumn05({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
       ZhSingleColumn09({ compDTO })
+    } else if (compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
+      AdvCardParser({compDTO})
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
       CardParser({ contentDTO: compDTO.operDataList[0] });
     }
@@ -96,6 +100,7 @@ export struct CompParser {
     }
     Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
   }
-  }
+
+  // }
 }
 

+import { CompStyle } from 'wdConstant';
+import { CompDTO } from 'wdBean';
+import { CardAdvComponent } from './CardAdvComponent';
+import { CardAdvThreeImageComponent } from './CardAdvThreeImageComponent';
+import { CardAdvSmallImageComponent } from './CardAdvSmallImageComponent';
+import { CardAdvLongImageComponent } from './CardAdvLongImageComponent';
+import { CardAdvBigImageComponent } from './CardAdvBigImageComponent';
+import { CardAdvVideoComponent } from './CardAdvVideoComponent';
+import { CardAdvGanMiComponent } from './CardAdvGanMiComponent';
+import { CardAdvVideoExComponent } from './CardAdvVideoExComponent';
+
+/**
+ * @Description: 广告稿件解析类
+ * @Author:
+ * @Email: liyubing@wondertek.com.cn
+ * @CreateDate:
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Component
+export struct AdvCardParser {
+  @State compDTO: CompDTO = {} as CompDTO;
+
+  build() {
+    this.contentBuilder(this.compDTO);
+  }
+
+  @Builder
+  contentBuilder(compDTO: CompDTO) {
+    if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告
+      CardAdvThreeImageComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
+      CardAdvSmallImageComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 ||
+      compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告
+      CardAdvLongImageComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
+      CardAdvBigImageComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
+      CardAdvVideoComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
+      CardAdvVideoExComponent({ compDTO })
+    } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
+      CardAdvGanMiComponent({ compDTO })
+    }
+  }
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---大图卡
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvBigImageComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    类描述
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---冠名广告
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvGanMiComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---长通栏广告 和 顶部长通栏广告
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvLongImageComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---小图卡
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvSmallImageComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---三图卡
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvThreeImageComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---视频广告
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvVideoComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

+//全标题 "appStyle":"2",
+import { CompDTO, ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { ProcessUtils } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+
+const TAG: string = 'Card2Component';
+
+/** 
+ * @Description:    广告---冠名广告
+ * @Author:         
+ * @Email:          liyubing@wondertek.com.cn
+ * @CreateDate:     
+ * @UpdateRemark:   更新说明
+ * @Version:        1.0
+ */
+@Component
+export struct CardAdvVideoExComponent {
+
+  @State compDTO: CompDTO = {} as CompDTO
+
+  aboutToAppear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+  }
+
+  aboutToDisappear(): void {
+
+    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+  }
+
+  build() {
+
+    Column() {
+      Text(this.compDTO.matInfo.advTitle)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
+        .maxLines(3)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+        .align(Alignment.Start)
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .onClick((event: ClickEvent) => {
+      //ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+@Extend(Text)
+function bottomTextStyle() {
+  .fontSize(12)
+  .fontColor('#B0B0B0')
+}
\ No newline at end of file

@@ -149,6 +149,7 @@ export default class PageAdModel {
 
     // 按时间维度过滤出广告数据
     let compAdsArray: ArrayList<CompAdvBean> = new ArrayList();
+    //当前日期
     let serverTimeLong: number = DateTimeUtils.getTimeStamp();
     for (let advBean of cornersAdv2) {
       let startLong = advBean.startTime;

@@ -5,8 +5,9 @@ import { closeRefresh } from '../utils/PullDownRefresh';
 import PageModel from './PageModel';
 import PageViewModel from './PageViewModel';
 import { promptAction } from '@kit.ArkUI';
-import { AdvRuleBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
+import { AdvRuleBean, CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
 import PageAdModel from './PageAdvModel';
+import { ArrayList } from '@kit.ArkTS';
 
 const TAG = 'PageHelper';
 
@@ -14,14 +15,12 @@ const TAG = 'PageHelper';
  * 处理返回后的数据
  */
 export class PageHelper {
-
-
   /**
    * 刷新数据
    */
-  async refreshUI(pageModel: PageModel,pageAdvModel:PageAdModel) {
+  async refreshUI(pageModel: PageModel, pageAdvModel: PageAdModel) {
     pageModel.loadStrategy = 2
-    this.getPageInfo(pageModel,pageAdvModel)
+    this.getPageInfo(pageModel, pageAdvModel)
   }
 
   /**
@@ -36,12 +35,12 @@ export class PageHelper {
   /**
    * 进页面请求数据
    */
-  async getInitData(pageModel: PageModel,pageAdvModel:PageAdModel) {
+  async getInitData(pageModel: PageModel, pageAdvModel: PageAdModel) {
     pageModel.loadStrategy = 1
-    this.getPageInfo(pageModel,pageAdvModel)
+    this.getPageInfo(pageModel, pageAdvModel)
   }
 
-  async getPageInfo(pageModel: PageModel,pageAdvModel:PageAdModel) {
+  async getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) {
     pageModel.currentPage = 1;
     let pageInfo = await PageViewModel.getPageInfo(pageModel.pageId);
     if (pageInfo == null) {
@@ -57,7 +56,6 @@ export class PageHelper {
   }
 
 
-
   async parseGroup(pageModel: PageModel) {
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     pageModel.groupList = []
@@ -72,13 +70,15 @@ export class PageHelper {
       }
       pageModel.groupData = group
       // await，确保groups接口顺序执行
-      let pageDto = await PageViewModel.getPageData(pageModel.bizCopy())
+      let pageDto = await PageViewModel.getPageData(pageModel.bizCopy()) as PageDTO
       let index = pageInfo.groups.indexOf(group)
       if (index == 0) {
         // 清空comp列表
         pageModel.compList.clear()
       }
       this.getGroupData(pageModel, pageDto, index == pageInfo.groups.length - 1)
+
+
     }
     if (pageModel.compList.isEmpty()) {
       // 没数据，展示空页面
@@ -100,7 +100,8 @@ export class PageHelper {
       }
 
       //移除音频 和 活动
-      this.removeComp(pageModel, pageDto)
+      this.collectPageComp(pageModel, pageDto)
+
 
       // pageModel.compList.push(...pageDto.compList)
 
@@ -129,6 +130,75 @@ export class PageHelper {
     }
   }
 
+
+  /**
+   *   处理页面中的广告组件信息
+   * @param pageDto
+   */
+  private handlePageCompAdvPostion(pageCompList: ArrayList<CompDTO>, pageDto: PageDTO) {
+
+    let compAdvList = pageDto.compAdList
+
+    let flag = true;
+    if (compAdvList == null) {
+      flag = false
+    }
+    if (compAdvList.length == 0) {
+      flag = false
+    }
+
+    let pageCompSize = pageCompList.length // 信息流组件业务数量
+    console.error("ZZZXXXXX", " start--->" + pageCompSize);
+
+    if (pageCompSize == 0) {
+      flag = false
+    }
+
+    if (flag) {
+      // 升序排序
+      compAdvList.sort((a: CompAdvBean, b: CompAdvBean) => a.slotInfo.position - b.slotInfo.position)
+      console.error("ZZZXXXXX", " 排序后的广告--->" + JSON.stringify(compAdvList));
+      //当前日期
+      let serverTimeLong: number = DateTimeUtils.getTimeStamp();
+      for (let advBean of compAdvList) {
+        let slotInfo = advBean.slotInfo
+
+        if (slotInfo != null) {
+          // 广告有效日期
+          let startLong = advBean.startTime;
+          let endLong = advBean.endTime;
+          //符合开始时间和结束时间要求
+          if (serverTimeLong >= startLong && serverTimeLong <= endLong) {
+
+            let matInfo = advBean.matInfo
+            if (matInfo == null) {
+              continue
+            }
+
+            let advSubType = matInfo.advSubType
+
+            // 插入轮播组件的广告
+            if (4 == advSubType) {
+
+            } else {
+              let advPosition = slotInfo.position //广告位置,从1开始
+              advPosition = advPosition - 1
+              let advComp: CompDTO = {
+                compStyle: CompStyle.Card_Comp_Adv,
+                matInfo: matInfo
+              } as CompDTO;
+              pageCompList.insert(advComp, 0)
+            }
+          }
+        }
+
+      }
+
+    }
+    console.error("ZZZXXXXX", " end--->" + pageCompList.length);
+  }
+
+
   /**
    * comp加载更多，分页加载
    */
@@ -148,7 +218,7 @@ export class PageHelper {
           let sizeBefore: number = pageModel.compList.size();
 
           //移除音频 和 活动
-          this.removeComp(pageModel, data)
+          this.collectPageComp(pageModel, data)
           //
           // pageModel.compList.push(...data.compList)
           PageViewModel.getInteractData(data.compList).then((data: CompDTO[]) => {
@@ -165,7 +235,10 @@ export class PageHelper {
   /**
    * 移除comp
    */
-  private removeComp(pageModel: PageModel, pageDto: PageDTO) {
+  private collectPageComp(pageModel: PageModel, pageDto: PageDTO) {
+
+    let pageCompList: ArrayList<CompDTO> = new ArrayList() // 收集页面组件、稿件和本地组件容器
+
     let datas = pageDto.compList
     for (let index = 0; index < datas.length; index++) {
       const element = datas[index];
@@ -174,9 +247,18 @@ export class PageHelper {
       if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
         Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
       } else {
-        pageModel.compList.push(element)
+        pageCompList.add(element)
       }
     }
+    // 处理页面广告数据，投放到页面的位置
+    //this.handlePageCompAdvPostion(pageCompList, pageDto);
+
+    //遍历所有组件和稿件数据 push到页面
+    for (let element of pageCompList) {
+      pageModel.compList.push(element)
+    }
+
+
   }
 }