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

@@ -29,12 +29,15 @@ struct MultiPictureDetailPage {
     .backgroundColor(Color.Black)
     .backgroundColor(Color.Black)
   }
   }
 
 
-  pageTransition(){
-    // 定义页面进入时的效果，从右边侧滑入
-    PageTransitionEnter({ type: RouteType.None, duration: 300 })
+  pageTransition() {
+    // 为目标页面时，进入：从右边侧滑入，退出：是右侧划出；跳转别的页面：左侧划出，返回：左侧划入。
+    PageTransitionEnter({ type: RouteType.Push, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
-    // 定义页面退出时的效果，向右边侧滑出
-    PageTransitionExit({ type: RouteType.None, duration: 300 })
+    PageTransitionEnter({ type: RouteType.Pop, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Push, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Pop, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
   }
   }
 
 
@@ -62,6 +65,17 @@ struct MultiPictureDetailPage {
     this.closeFullScreen()
     this.closeFullScreen()
   }
   }
 
 
+  onPageShow(): void {
+    console.log(TAG, 'onPageShow')
+    this.openFullScreen()
+
+  }
+
+  onPageHide(): void {
+    console.log(TAG, 'onPageHide')
+    this.closeFullScreen()
+  }
+
   /**
   /**
    * 开启沉浸式
    * 开启沉浸式
    * TODO:颜色待根据业务接口修改
    * TODO:颜色待根据业务接口修改