feat:优化启动广告

@@ -4,7 +4,7 @@ import PageModel from '../../viewmodel/PageModel';
 import { CommonConstants, ViewType } from 'wdConstant'
 import { CommonConstants, ViewType } from 'wdConstant'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
-import { CompDTO, ContentDTO } from 'wdBean'
+import { CompDTO, ContentDTO, contentListParams,contentListItem } from 'wdBean'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
@@ -149,16 +149,13 @@ struct MyCollectionListPage {
           .margin({left:16})
           .margin({left:16})
       }
       }
       Column() {
       Column() {
-        BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO})
+        BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO,pageId:TrackConstants.PageName.My_Collect,pageName:TrackConstants.PageName.My_Collect})
       }
       }
     }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
     }.onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
       if (isVisible) {
       if (isVisible) {
         TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect, TrackParamConvert.program(compDTO))
         TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect, TrackParamConvert.program(compDTO))
       }
       }
     })
     })
-    // .onClick(()=>{
-    //   TrackingContent.common(TrackConstants.EventType.Click, TrackConstants.PageName.My_Collect,TrackConstants.PageName.My_Collect, TrackParamConvert.program(compDTO))
-    // })
   }
   }
 
 
 
 
@@ -262,4 +259,12 @@ struct MyCollectionListPage {
     }
     }
   }
   }
 
 
+  getContentData(){
+    for (let index = 0; index < this.allDatas.length; index++) {
+      const compDTO = this.allDatas[index];
+      compDTO.isCollection = true ///用于时间展示
+      this.allDatas.push(compDTO)
+    }
+  }
+  
 }
 }

@@ -15,6 +15,8 @@ const TAG: string = 'BigPicCardComponent';
 @Component
 @Component
 export struct BigPicCardComponent {
 export struct BigPicCardComponent {
   @ObjectLink compDTO: CompDTO
   @ObjectLink compDTO: CompDTO
+  @State pageId: string = '';
+  @State pageName: string = '';
   contentDTO: ContentDTO = new ContentDTO();
   contentDTO: ContentDTO = new ContentDTO();
 
 
   aboutToAppear() {
   aboutToAppear() {
@@ -110,7 +112,7 @@ export struct BigPicCardComponent {
 
 
   @Builder
   @Builder
   cardBuild() {
   cardBuild() {
-    CardParser({ compDTO: this.compDTO, contentDTO: this.contentDTO });
+    CardParser({ compDTO: this.compDTO, contentDTO: this.contentDTO,pageId:this.pageId,pageName:this.pageName});
   }
   }
 }
 }
 
 

@@ -74,6 +74,22 @@ struct LaunchAdvertisingPage {
             bottom: 0
             bottom: 0
           })
           })
 
 
+          if (this.defaultModel.isAd === '1'){
+            Stack({alignContent:Alignment.TopStart}){
+              Text('广告')
+                .fontColor(Color.White)
+                .textAlign(TextAlign.Center)
+                .fontSize('24lpx')
+                .width('72lpx')
+                .height('36lpx')
+                .borderRadius(2)
+                .margin({top:'15lpx',left:'19lpx'})
+                .backgroundColor('#80000000')
+            }
+            .width('100%')
+            .height('100%')
+          }
+
           Stack({alignContent:Alignment.TopEnd}){
           Stack({alignContent:Alignment.TopEnd}){
             Button(){
             Button(){
               Text(this.time + 's 跳过')
               Text(this.time + 's 跳过')
@@ -95,22 +111,6 @@ struct LaunchAdvertisingPage {
           .width('100%')
           .width('100%')
           .height('100%')
           .height('100%')
 
 
-          if (this.defaultModel.isAd === '1'){
-            Stack({alignContent:Alignment.TopStart}){
-              Text('广告')
-                .fontColor(Color.White)
-                .textAlign(TextAlign.Center)
-                .fontSize('24lpx')
-                .width('72lpx')
-                .height('36lpx')
-                .borderRadius(2)
-                .margin({top:'15lpx',left:'19lpx'})
-                .backgroundColor('#80000000')
-            }
-            .width('100%')
-            .height('100%')
-          }
-
           if(this.defaultModel.screenType != '2'){
           if(this.defaultModel.screenType != '2'){
             //底部logo样式  按钮加载在背景展示图上
             //底部logo样式  按钮加载在背景展示图上
             Button(){
             Button(){