fix:修复pop逻辑错误 (#6)

foxsofter · Mar 19, 2020 · e86d540 · e86d540
1 parent 0505660
commit e86d540
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/android/src/main/kotlin/com/hellobike/flutter/thrio/navigator/NavigationController.kt b/android/src/main/kotlin/com/hellobike/flutter/thrio/navigator/NavigationController.kt
@@ -74,15 +74,20 @@ internal object NavigationController {
             val record = PageRouteStack.last()
             record.resultParams = params
             record.animated = animated
-            record.poppedResult?.get()?.let { it(record.resultParams) }
-            PageRouteStack.pop(record)
-            onPop(record) { check(it) { "flutter must not pop fail" } }
-            val intent = Intent(context, record.clazz)
-            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            context.startActivity(intent)
-            action = RouteAction.NONE
-            result(true)
+            onPop(record) {
+                action = RouteAction.NONE
+                result(it)
+                if (!it) {
+                    // Flutter WillPopScope is false
+                    return@onPop
+                }
+                record.poppedResult?.get()?.let { it(record.resultParams) }
+                PageRouteStack.pop(record)
+                val intent = Intent(context, record.clazz)
+                intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                context.startActivity(intent)
+            }
         }
 
         private fun onPop(record: PageRoute, result: Result) {

diff --git a/android/src/main/kotlin/com/hellobike/flutter/thrio/navigator/ReceiveChannel.kt b/android/src/main/kotlin/com/hellobike/flutter/thrio/navigator/ReceiveChannel.kt
@@ -128,6 +128,9 @@ internal class ReceiveChannel(private val id: String) : MethodChannel.MethodCall
             "popTo" -> popTo(call, result)
             /** notify **/
             "notify" -> notify(call, result)
+            /** setPopDisabled **/
+            "setPopDisabled" -> {
+            }
             /** hotRestart **/
             "hotRestart" -> {