fix:16922 早晚报-退出早晚报列表不该有下拉展示顶部效果

@@ -99,8 +99,8 @@ export struct MorningEveningPaperComponent {
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
-    await windowHight.setWindowLayoutFullScreen(true);
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+    // await windowHight.setWindowLayoutFullScreen(true);
+    // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
 
 
     const dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
     const dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
@@ -178,9 +178,9 @@ export struct MorningEveningPaperComponent {
   }
   }
 
 
   async aboutToDisappear() {
   async aboutToDisappear() {
-    let windowHight: window.Window = await window.getLastWindow(getContext(this));
-    await windowHight.setWindowLayoutFullScreen(false);
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    // let windowHight: window.Window = await window.getLastWindow(getContext(this));
+    // await windowHight.setWindowLayoutFullScreen(false);
+    // WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
   }
 
 
   onPageHide() {
   onPageHide() {
@@ -209,25 +209,18 @@ export struct MorningEveningPaperComponent {
             })
             })
         }
         }
       }
       }
-      // .backgroundColor('#fff7b348')
-      // .backgroundColor(Color.Blue)
       .height('100%')
       .height('100%')
 
 
-      // .margin({ left: 12, right: 12 })
-
-      PaperTitleComponent()// PaperTitleComponent({
-        //   // title: this.morningEveningPaperDTO?.topicInfo?.title ?? "",
-        //   title: this.title  ?? "",
-        //   // subtitle: this.morningEveningPaperDTO?.topicInfo?.topicDate ?? ''
-        //   subtitle: this.subTitle
-        // })
-        // .margin({ left: 14, right: 14 })
+      PaperTitleComponent().margin({
+        top: this.topSafeHeight
+      })
     }
     }
     .width('100%')
     .width('100%')
+    .height('100%')
     // .backgroundColor(Color.Black)
     // .backgroundColor(Color.Black)
     // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
     // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
     .backgroundColor(this.mixedBgColor ?? Color.Black)
     .backgroundColor(this.mixedBgColor ?? Color.Black)
-    .padding({ top: this.topSafeHeight })
+
   }
   }
 
 
   @Builder
   @Builder

@@ -11,15 +11,13 @@ struct ENewspaper {
   // 获取UIAbility上下文
   // 获取UIAbility上下文
   context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
   context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
 
 
-  async setSystemBar(color: string) {
+  async setSystemBar(color: string, barColor: string) {
     // 获取当前应用窗口
     // 获取当前应用窗口
     let windowClass: window.Window = await window.getLastWindow(this.context)
     let windowClass: window.Window = await window.getLastWindow(this.context)
     // 将状态栏和导航栏的背景色设置为跟应用窗口相同的颜色
     // 将状态栏和导航栏的背景色设置为跟应用窗口相同的颜色
     await windowClass.setWindowSystemBarProperties({
     await windowClass.setWindowSystemBarProperties({
       navigationBarColor: color,
       navigationBarColor: color,
-      statusBarColor: color,
-      // navigationBarContentColor: "#00FF00",
-      // statusBarContentColor: "#00FF00"
+      statusBarColor: barColor,
     })
     })
   }
   }
 
 
@@ -47,12 +45,12 @@ struct ENewspaper {
   }
   }
 
 
   onPageShow() {
   onPageShow() {
-    this.setSystemBar('#80000000')
+    this.setSystemBar('#80000000','#80000000')
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
   }
   }
 
 
   onPageHide() {
   onPageHide() {
-    this.setSystemBar('#FFFFFFFF')
+    this.setSystemBar('#FFFFFFFF','#00000000')
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
   }
   }
 
 

 import { MorningEveningPaperComponent } from 'wdComponent';
 import { MorningEveningPaperComponent } from 'wdComponent';
-import { Logger } from 'wdKit';
+import { Logger, WindowModel } from 'wdKit';
 
 
 const TAG = 'MorningEveningPaperPage';
 const TAG = 'MorningEveningPaperPage';
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct MorningEveningPaperPage {
 struct MorningEveningPaperPage {
+  @State isPageShow: boolean = false
   build() {
   build() {
     Column() {
     Column() {
       MorningEveningPaperComponent()
       MorningEveningPaperComponent()
     }
     }
+    .width('100%')
+    .height('100%')
   }
   }
 
 
   pageTransition() {
   pageTransition() {
     // 定义页面进入时的效果，从底侧滑入
     // 定义页面进入时的效果，从底侧滑入
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
-      .slide(SlideEffect.Bottom)
+      .slide(SlideEffect.Bottom).onEnter((type: RouteType, progress: number) => {
+      if (progress >= 0.99) {
+        WindowModel.shared.setWindowLayoutFullScreen(true)
+        WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+      }
+    })
     // 定义页面退出时的效果，向底侧滑出
     // 定义页面退出时的效果，向底侧滑出
     PageTransitionExit({ type: RouteType.None, duration: 300 })
     PageTransitionExit({ type: RouteType.None, duration: 300 })
       .slide(SlideEffect.Bottom)
       .slide(SlideEffect.Bottom)
@@ -31,9 +39,16 @@ struct MorningEveningPaperPage {
 
 
   onPageShow() {
   onPageShow() {
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
+    if (this.isPageShow) {
+      WindowModel.shared.setWindowLayoutFullScreen(true)
+      WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+    }
   }
   }
 
 
   onPageHide() {
   onPageHide() {
+    WindowModel.shared.setWindowLayoutFullScreen(false)
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    this.isPageShow = true
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
   }
   }