Merge pull request #43 from wyjsonGo/develop

wyjsonGo · web-flow · commit 65abfc86ca35 · 2024-01-24T11:16:01.000+08:00
publish v2.4.9
优化路由帮助类
diff --git a/GoRouter-Gradle-Plugin/src/main/kotlin/com/wyjson/router/gradle_plugin/helper/AssembleGoRouteHelperCode.kt b/GoRouter-Gradle-Plugin/src/main/kotlin/com/wyjson/router/gradle_plugin/helper/AssembleGoRouteHelperCode.kt
@@ -127,6 +127,7 @@ class AssembleGoRouteHelperCode(private val model: RouteHelperModel) {
 
                 val getCardMetaMethod = MethodSpec.methodBuilder("getCardMeta")
                     .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                    .addAnnotation(Nullable)
                     .returns(CardMeta)
                     .addStatement(
                         "return \$T.getInstance().build(\$N()).getCardMeta()",
@@ -361,6 +362,7 @@ class AssembleGoRouteHelperCode(private val model: RouteHelperModel) {
         if (routeModel.type == "Activity") {
             newGoMethod.addStatement("\$N(\$L).go()", buildMethod.build().name, goParamCodeString)
         } else {
+            newGoMethod.addAnnotation(Nullable)
             newGoMethod.returns(Fragment)
             newGoMethod.addStatement("return (Fragment) \$N(\$L).go()", buildMethod.build().name, goParamCodeString)
         }
@@ -393,6 +395,7 @@ class AssembleGoRouteHelperCode(private val model: RouteHelperModel) {
         if (routeModel.type == "Activity") {
             newGoMethod.addStatement("\$N(\$L).go()", buildMethod.build().name, goParamCodeString)
         } else {
+            newGoMethod.addAnnotation(Nullable)
             newGoMethod.returns(Fragment)
             newGoMethod.addStatement("return (Fragment) \$N(\$L).go()", buildMethod.build().name, goParamCodeString)
         }
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ dependencyResolutionManagement {
 }
 
 dependencies {
-    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.8'
+    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.9'
 }
 // Kotlin配置参见8-1
 ```
@@ -89,7 +89,7 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.9'
 }
 ```
 
@@ -157,7 +157,7 @@ pluginManagement {
 // 项目根目录下的build.gradle
 buildscript {
     dependencies {
-        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.8'
+        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.9'
     }
 }
 ```
@@ -894,7 +894,7 @@ kapt {
 }
 
 dependencies {
-    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'
+    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.9'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     dependencies {
-        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
+//        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -25,4 +25,4 @@ android.nonTransitiveRClass=true
 # org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 
 GROUP_ID=com.github.wyjsonGo.GoRouter
-VERSION=2.4.8
+VERSION=2.4.9
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_kotlin/group_kotlin/KotlinActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_kotlin/group_kotlin/KotlinActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_kotlin.group_kotlin;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/kotlin/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_main.group_main;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/main/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainEventActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainEventActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_main.group_main;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/main/event/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainEventFragmentGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainEventFragmentGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_main.group_main;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
@@ -16,6 +17,7 @@ public static String getPath() {
         return "/main/event/fragment";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
@@ -28,6 +30,7 @@ public static Card build() {
         return GoRouter.getInstance().build(getPath());
     }
 
+    @Nullable
     public static Fragment go() {
         return (Fragment) build().go();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainSplashActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_main/group_main/MainSplashActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_main.group_main;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/main/splash/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_user/group_new/NewParamActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_user/group_new/NewParamActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_user.group_new;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/new/param/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_user/group_new/NewParamFragmentGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_user/group_new/NewParamFragmentGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_user.group_new;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
@@ -16,6 +17,7 @@ public static String getPath() {
         return "/new/param/fragment";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
@@ -28,6 +30,7 @@ public static Card build() {
         return GoRouter.getInstance().build(getPath());
     }
 
+    @Nullable
     public static Fragment go() {
         return (Fragment) build().go();
     }
@@ -40,6 +43,7 @@ public static Card build(int age, String name) {
         return create().setAge(age).setName(name).build();
     }
 
+    @Nullable
     public static Fragment go(int age, String name) {
         return (Fragment) build(age, name).go();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserCardFragmentGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserCardFragmentGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_user.group_user;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
@@ -16,6 +17,7 @@ public static String getPath() {
         return "/user/card/fragment";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
@@ -28,6 +30,7 @@ public static Card build() {
         return GoRouter.getInstance().build(getPath());
     }
 
+    @Nullable
     public static Fragment go() {
         return (Fragment) build().go();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserInfoActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserInfoActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_user.group_user;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/user/info/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserSignInActivityGoRouter.java b/module_common/src/main/java/com/wyjson/router/helper/module_user/group_user/UserSignInActivityGoRouter.java
@@ -1,5 +1,6 @@
 package com.wyjson.router.helper.module_user.group_user;
 
+import androidx.annotation.Nullable;
 import com.wyjson.router.GoRouter;
 import com.wyjson.router.model.Card;
 import com.wyjson.router.model.CardMeta;
@@ -15,6 +16,7 @@ public static String getPath() {
         return "/user/sign_in/activity";
     }
 
+    @Nullable
     public static CardMeta getCardMeta() {
         return GoRouter.getInstance().build(getPath()).getCardMeta();
     }
diff --git a/settings.gradle b/settings.gradle
@@ -18,11 +18,11 @@ dependencyResolutionManagement {
 
 rootProject.name = "GoRouter"
 
-include ':app'
-include ':module_main'
-include ':module_user'
-include ':module_kotlin'
-include ':module_common'
+//include ':app'
+//include ':module_main'
+//include ':module_user'
+//include ':module_kotlin'
+//include ':module_common'
 
 include ':GoRouter-Api'
 include ':GoRouter-Annotation'

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ dependencyResolutionManagement {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`dependencies {`
`72`		`- api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.8'`
	`72`	`+ api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.9'`
`73`	`73`	`}`
`74`	`74`	`// Kotlin配置参见8-1`
`75`	`75`	```
`@@ -89,7 +89,7 @@ android {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`dependencies {`
`92`		`- annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'`
	`92`	`+ annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.9'`
`93`	`93`	`}`
`94`	`94`	```
`95`	`95`
`@@ -157,7 +157,7 @@ pluginManagement {`
`157`	`157`	`// 项目根目录下的build.gradle`
`158`	`158`	`buildscript {`
`159`	`159`	`dependencies {`
`160`		`- classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.8'`
	`160`	`+ classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.9'`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	```
`@@ -894,7 +894,7 @@ kapt {`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`dependencies {`
`897`		`- kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'`
	`897`	`+ kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.9'`
`898`	`898`	`}`
`899`	`899`	```
`900`	`900`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`	`2`	`buildscript {`
`3`	`3`	`dependencies {`
`4`		`- classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"`
	`4`	`+// classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.wyjson.router.helper.module_kotlin.group_kotlin;`
`2`	`2`
	`3`	`+import androidx.annotation.Nullable;`
`3`	`4`	`import com.wyjson.router.GoRouter;`
`4`	`5`	`import com.wyjson.router.model.Card;`
`5`	`6`	`import com.wyjson.router.model.CardMeta;`
`@@ -15,6 +16,7 @@ public static String getPath() {`
`15`	`16`	`return "/kotlin/activity";`
`16`	`17`	`}`
`17`	`18`
	`19`	`+ @Nullable`
`18`	`20`	`public static CardMeta getCardMeta() {`
`19`	`21`	`return GoRouter.getInstance().build(getPath()).getCardMeta();`
`20`	`22`	`}`