处理横竖屏切换，界面可能不销毁的问题

listenzz · Feb 7, 2025 · 87c9d12 · 87c9d12
1 parent 0522849
commit 87c9d12
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -33,5 +33,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.facebook.react:react-native:+'
     // api project(':navigation')
-    api 'io.github.listenzz:AndroidNavigation:13.6.9'
+    api 'io.github.listenzz:AndroidNavigation:13.7.0'
 }
diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactFragment.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactFragment.java
@@ -12,6 +12,7 @@
 import static com.reactnative.hybridnavigation.HBDEventEmitter.ON_COMPONENT_DISAPPEAR;
 import static com.reactnative.hybridnavigation.HBDEventEmitter.ON_COMPONENT_RESULT;
 
+import android.annotation.SuppressLint;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -142,13 +143,13 @@ public void onStart() {
         }
     }
 
+    @SuppressLint("SourceLockedOrientationActivity")
     @Override
     public void onStop() {
-        super.onStop();
-        if (forceScreenLandscape() && isRemoving()) {
-            requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-            unmountReactView();
+        if (isRemoving() && forceScreenLandscape()) {
+            requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
+        super.onStop();
     }
 
     @Override
@@ -163,14 +164,14 @@ private void mountReactView() {
 
     private void unmountReactView() {
         getReactBridgeManager().removeReactBridgeReloadListener(this);
-        
+
         ReactContext reactContext = getCurrentReactContext();
         if (reactContext == null || !reactContext.hasActiveCatalystInstance()) {
             return;
         }
 
         if (reactRootView != null) {
-            FLog.w(TAG, "销毁页面：" + getModuleName());
+            FLog.w(TAG, "销毁页面-：" + getModuleName());
             reactRootView.unmountReactApplication();
             ViewGroup parent = (ViewGroup) reactRootView.getParent();
             parent.removeView(reactRootView);

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/navigator/ScreenNavigator.java b/android/src/main/java/com/reactnative/hybridnavigation/navigator/ScreenNavigator.java
@@ -129,7 +129,7 @@ private void handleShowModalLayout(@NonNull AwesomeFragment presenting, @NonNull
         }
         presented.setPresentationStyle(PresentationStyle.OverFullScreen);
         int requestCode = extras.getInt("requestCode");
-        presenting.presentFragment(presented, requestCode, () -> callback.invoke(null, true), TransitionAnimation.Fade);
+        presenting.presentFragment(presented, requestCode, () -> callback.invoke(null, true), TransitionAnimation.None);
     }
 
     private void handlePresentLayout(@NonNull AwesomeFragment presenting, @NonNull ReadableMap extras, @NonNull Callback callback) {
@@ -164,11 +164,11 @@ private void handleShowModal(@NonNull AwesomeFragment presenting, @NonNull Reada
         presented.setPresentationStyle(PresentationStyle.OverFullScreen);
         int requestCode = extras.getInt("requestCode");
 
-        presenting.presentFragment(presented, requestCode, () -> callback.invoke(null, true), TransitionAnimation.Fade);
+        presenting.presentFragment(presented, requestCode, () -> callback.invoke(null, true), TransitionAnimation.None);
     }
 
     private void handleHideModal(@NonNull AwesomeFragment presented, @NonNull Callback callback) {
-        presented.dismissFragment(() -> callback.invoke(null, true), TransitionAnimation.Fade);
+        presented.dismissFragment(() -> callback.invoke(null, true), TransitionAnimation.None);
     }
 
     private void handleDismiss(@NonNull AwesomeFragment presented, @NonNull Callback callback) {