1. 调整调用param传递无法序列化的参数时向外抛异常报错

2. 简化activityOptions调用
qstumn · Apr 7, 2021 · 2b12445 · 2b12445
1 parent dc3d3f7
commit 2b12445
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -76,19 +76,16 @@ Router.addRouteGenerator { path ->
 
 #### 4.3 ActivityOptions
 ```kotlin
+findNavigator().path("/route/second").activityOptions(...).push()
 findNavigator().path("/route/second").cast<ActivityTargetNavigator>().activityOptions(...).push()
 ```
 
 #### 4.4 单Activity的Fragment之间导航暂未支持, 可自行继承FragmentTargetNavigator后通过NavigatorEngine实现
 
-```
-    allprojects {
-		repositories {
-			maven { url 'https://jitpack.io' }
-		}
-	}
-
-	dependencies {
-        implementation 'com.github.qstumn:Router:$release'
-    }
+
+### 5. 依赖
+```groovy
+    maven { url 'https://jitpack.io' }
+
+    implementation 'com.github.qstumn:Router:$release'
 ```
diff --git a/router/src/main/java/q/rorbin/router/common.kt b/router/src/main/java/q/rorbin/router/common.kt
@@ -26,7 +26,7 @@ data class RouteTransition(val enterAnim: Int, val exitAnim: Int)
 
 class RouteErrorException(message: String? = null) : Exception(message)
 
-internal const val UNIQUE_DATA_KEY = "navigator_transmit_data_auto_key"
+const val UNIQUE_DATA_KEY = "navigator_transmit_data_auto_key"
 
 data class NavigatorResult<T>(val requestCode: Int, val intent: Intent) {
 

diff --git a/router/src/main/java/q/rorbin/router/ktx.kt b/router/src/main/java/q/rorbin/router/ktx.kt
@@ -38,6 +38,8 @@ internal fun Any.putToBundle(bundleKey: String = UNIQUE_DATA_KEY, bundle: Bundle
             }
             value.putToBundle(key, newBundle)
         }
+    } else {
+        throw RouteErrorException("cannot pass param with key $bundleKey, unsupport this data type")
     }
     return newBundle
 }
@@ -109,8 +111,9 @@ fun <R> Fragment.registerForNavigatorResult(resultCallback: ResultCallback<R>):
     return register
 }
 
-private fun <R> registerForNavigatorResult(register: NavigatorResultRegister<R>, fragmentManager: () -> FragmentManager,
-                                           lifecycle: Lifecycle
+private fun <R> registerForNavigatorResult(
+    register: NavigatorResultRegister<R>, fragmentManager: () -> FragmentManager,
+    lifecycle: Lifecycle
 ) {
     val bindRequest = {
         val fragment = ResultBlankFragment.obtainSelfByFragmentManager(fragmentManager())

diff --git a/router/src/main/java/q/rorbin/router/navigator/base.kt b/router/src/main/java/q/rorbin/router/navigator/base.kt
@@ -1,6 +1,8 @@
 package q.rorbin.router.navigator
 
+import android.content.Intent
 import android.os.Bundle
+import androidx.core.app.ActivityOptionsCompat
 import q.rorbin.router.NavigatorResultRegister
 import q.rorbin.router.ResultCallback
 import q.rorbin.router.putToBundle
@@ -62,4 +64,14 @@ abstract class Navigator internal constructor() {
      */
     abstract fun pop(resultData: Any?)
 
+}
+
+fun Navigator.activityOptions(options: ActivityOptionsCompat): Navigator {
+    (this as? ActivityTargetNavigator)?.activityOptions(options)
+    return this
+}
+
+fun Navigator.intent(intent: Intent): Navigator {
+    (this as? ActivityTargetNavigator)?.intent(intent)
+    return this
 }