refactor: only visible Scene can intercept app back event

bytedance · Feb 25, 2020 · 3dc15e1 · 3dc15e1
1 parent f7f4d71
commit 3dc15e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/library/scene/src/main/java/com/bytedance/scene/navigation/NavigationScene.java b/library/scene/src/main/java/com/bytedance/scene/navigation/NavigationScene.java
@@ -553,9 +553,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             parentSceneNavigation.addOnBackPressedListener(this, new OnBackPressedListener() {
                 @Override
                 public boolean onBackPressed() {
-                    if (getState().value < State.STARTED.value) {
-                        return false;
-                    }
                     return NavigationScene.this.onBackPressed();
                 }
             });

diff --git a/library/scene/src/main/java/com/bytedance/scene/navigation/NavigationSceneManager.java b/library/scene/src/main/java/com/bytedance/scene/navigation/NavigationSceneManager.java
@@ -17,6 +17,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.arch.lifecycle.Lifecycle;
 import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.os.Build;
@@ -358,7 +359,8 @@ public boolean interceptOnBackPressed() {
         List<NonNullPair<LifecycleOwner, OnBackPressedListener>> copy = new ArrayList<>(mOnBackPressedListenerList);
         for (int i = copy.size() - 1; i >= 0; i--) {
             NonNullPair<LifecycleOwner, OnBackPressedListener> pair = copy.get(i);
-            if (pair.second.onBackPressed()) {
+            if (pair.first.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
+                    && pair.second.onBackPressed()) {
                 return true;
             }
         }

diff --git a/library/scene_ui/src/main/java/com/bytedance/scene/ui/template/NavigationViewScene.java b/library/scene_ui/src/main/java/com/bytedance/scene/ui/template/NavigationViewScene.java
@@ -86,9 +86,6 @@ public void onClick(View v) {
         requireNavigationScene().addOnBackPressedListener(this, new OnBackPressedListener() {
             @Override
             public boolean onBackPressed() {
-                if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
-                    return false;
-                }
                 if (mDrawerLayout.isDrawerOpen(mNavigationView)) {
                     mDrawerLayout.closeDrawer(mNavigationView);
                     return true;