feat：优化启动广告，早晚报全屏逻辑

@@ -23,7 +23,7 @@ struct MorningEveningPaperPage {
     PageTransitionEnter({ type: RouteType.Push, duration: 300 })
     PageTransitionEnter({ type: RouteType.Push, duration: 300 })
       .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => {
       .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => {
       if (progress >= 0.99) {
       if (progress >= 0.99) {
-        WindowModel.shared.setWindowLayoutFullScreen(true)
+        // WindowModel.shared.setWindowLayoutFullScreen(true)
         WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
         WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
       }
       }
     })
     })
@@ -43,14 +43,14 @@ struct MorningEveningPaperPage {
   onPageShow() {
   onPageShow() {
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
     if (this.isPageShow) {
     if (this.isPageShow) {
-      WindowModel.shared.setWindowLayoutFullScreen(true)
+      // WindowModel.shared.setWindowLayoutFullScreen(true)
       WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
       WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     }
     }
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
   }
   }
 
 
   onPageHide() {
   onPageHide() {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     this.isPageShow = true
     this.isPageShow = true
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');

@@ -7,6 +7,7 @@ import LaunchDataModel, { defaultLaunchModel } from '../viewModel/LaunchDataMode
 
 
 import { ParamType, TrackConstants, TrackingButton, TrackingContent } from 'wdTracking/Index';
 import { ParamType, TrackConstants, TrackingButton, TrackingContent } from 'wdTracking/Index';
 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
+import { Core } from '@ohos/hypium';
 
 
 
 
 @Entry
 @Entry
@@ -62,7 +63,7 @@ struct LaunchAdvertisingPage {
             }else {
             }else {
               //显示图片
               //显示图片
               Image(this.defaultModel.bootScreenUrl)
               Image(this.defaultModel.bootScreenUrl)
-                .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+                // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
                 .width('100%')
                 .width('100%')
                 .height('100%')
                 .height('100%')
             }
             }
@@ -74,11 +75,10 @@ struct LaunchAdvertisingPage {
             bottom: 0
             bottom: 0
           })
           })
 
 
-
           Stack(){
           Stack(){
             Column(){
             Column(){
               Row(){
               Row(){
-                if (this.defaultModel.isAd === '1') {
+                if (this.defaultModel.isAd == '1') {
                   Text('广告')
                   Text('广告')
                     .fontColor(Color.White)
                     .fontColor(Color.White)
                     .textAlign(TextAlign.Center)
                     .textAlign(TextAlign.Center)
@@ -108,7 +108,7 @@ struct LaunchAdvertisingPage {
                   this.trackingLaunchJumpOver()
                   this.trackingLaunchJumpOver()
                 }).margin({right:16})
                 }).margin({right:16})
 
 
-              }.margin({top:10}).width('100%').height('56lpx')
+              }.margin({top:50}).width('100%').height('56lpx')
 
 
               Blank()
               Blank()
 
 
@@ -132,18 +132,21 @@ struct LaunchAdvertisingPage {
                 .margin({
                 .margin({
                   bottom: '51lpx'
                   bottom: '51lpx'
                 })
                 })
+                .borderWidth(1)
+                .borderColor(Color.White)
                 .backgroundColor('#80000000')
                 .backgroundColor('#80000000')
                 .onClick(()=>{
                 .onClick(()=>{
                   this.action()
                   this.action()
                 })
                 })
               }
               }
-              if(this.defaultModel.screenType === '1') {
+              if(this.defaultModel.screenType == '1') {
                 Column(){
                 Column(){
                   Image($r('app.media.LaunchPage_logo'))
                   Image($r('app.media.LaunchPage_logo'))
                     .width('278lpx')
                     .width('278lpx')
                     .height('154lpx')
                     .height('154lpx')
                     .margin({top:20})
                     .margin({top:20})
-                }.width('100%').height('16%').backgroundColor(Color.White).expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+                }.width('100%').height('16%').backgroundColor(Color.White)
+                // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
               }
               }
             }
             }
             .width('100%')
             .width('100%')
@@ -157,7 +160,7 @@ struct LaunchAdvertisingPage {
       .height('100%')
       .height('100%')
       .margin({top:'0'})
       .margin({top:'0'})
     }
     }
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+    // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
@@ -212,7 +215,7 @@ struct LaunchAdvertisingPage {
       this.defaultModel.screenName = dataModel.launchAdInfo[0].matInfo.advTitle
       this.defaultModel.screenName = dataModel.launchAdInfo[0].matInfo.advTitle
       this.defaultModel.durations = dataModel.launchAdInfo[0].displayDuration
       this.defaultModel.durations = dataModel.launchAdInfo[0].displayDuration
       this.defaultModel.linkUrl = dataModel.launchAdInfo[0].matInfo.linkUrl
       this.defaultModel.linkUrl = dataModel.launchAdInfo[0].matInfo.linkUrl
-      if (dataModel.launchAdInfo[0].matInfo.startStyle === '1') {
+      if (dataModel.launchAdInfo[0].matInfo.startStyle == '1') {
         this.defaultModel.screenType = '2'
         this.defaultModel.screenType = '2'
       }else {
       }else {
         this.defaultModel.screenType = '1'
         this.defaultModel.screenType = '1'