Merge pull request #41 from wyjsonGo/develop

publish v2.4.7
优化路由路径支持(a-zA-Z0-9_-.#)

Author: wyjsonGo

GoRouter-Compiler/src/main/java/com/wyjson/router/compiler/processor/GenerateRouteModuleProcessor.java

@@ -211,7 +211,10 @@ private LinkedHashSet<MethodSpec> addRouteGroup(RoundEnvironment roundEnvironmen
 
         for (Map.Entry<String, Set<Element>> entry : routeGroupMap.entrySet()) {
             List<RouteModel> routeModelDocList = new ArrayList<>();
-            String groupName = entry.getKey();
+            String groupName = entry.getKey()
+                    .replace("-", "_")
+                    .replace(".", "_")
+                    .replace("#", "_");
             // 首字母大写
             String groupNameToUpperCase = groupName.substring(0, 1).toUpperCase() + groupName.substring(1);
             String methodName = String.format(METHOD_NAME_LOAD_ROUTE_FOR_x_GROUP, groupNameToUpperCase);

GoRouter-Gradle-Plugin/src/main/kotlin/com/wyjson/router/gradle_plugin/helper/AssembleGoRouteHelperCode.kt

@@ -218,31 +218,18 @@ class AssembleGoRouteHelperCode(private val model: RouteHelperModel) {
             return projectName
         }
         var str = projectName
-        // 去除开头字母是0-9和_的情况
-        str = str.replace("^[0-9_]+".toRegex(), "")
+        // 去除开头字母是0-9的情况
+        str = str.replace("^[0-9]+".toRegex(), "")
         str = str.replace("-", "_")
-        // 首字母小写
-        str = str.substring(0, 1).lowercase() + str.substring(1)
-        // 处理大写
-        val len = str.length
-        val sb = StringBuilder(len)
-        for (i in 0 until len) {
-            val c = str[i]
-            if (Character.isUpperCase(c)) {
-                if (str[i - 1] != '_') {
-                    sb.append("_")
-                }
-                sb.append(str[i].lowercaseChar())
-            } else {
-                sb.append(c)
-            }
-        }
-        return sb.toString()
+        str = str.lowercase()
+        return str
     }
 
     private fun extractClassNameByPath(path: String): String {
         var methodName = ""
-        val replace = path.replace(".", "").replace("-", "")
+        val replace = path.replace("-", "_")
+            .replace(".", "_")
+            .replace("#", "_")
         for (item in replace.split("/")) {
             if (item.contains("_")){
                 for (_item in item.split("_")) {

README.md

@@ -69,7 +69,7 @@ dependencyResolutionManagement {
 }
 
 dependencies {
-    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.6'
+    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.7'
 }
 // Kotlin配置参见8-1
 ```
@@ -89,7 +89,7 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.6'
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.7'
 }
 ```
 
@@ -157,7 +157,7 @@ pluginManagement {
 // 项目根目录下的build.gradle
 buildscript {
     dependencies {
-        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.6'
+        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.7'
     }
 }
 ```
@@ -894,7 +894,7 @@ kapt {
 }
 
 dependencies {
-    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.6'
+    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.7'
 }
 ```
 
@@ -906,6 +906,7 @@ module_kotlin模块Demo示例[module_kotlin/build.gradle](https://github.com/wyj
 
 ##### 3.  路由中的分组概念
 
+*   路由路径支持(a-zA-Z0-9_-.#)
 *   SDK中针对所有的路径`/test/1`、`/test/2`进行分组，分组只有在分组中的某一个路径第一次被访问的时候，该分组才会被初始化。分组使用路径中第一段字符串(/*/)作为分组，这里的路径需要注意的是至少需要有两级`/xx/xx`。
 *   GRouter允许一个module中存在多个分组，也允许多个module中存在相同的分组，但是最好不要在多个module中存在相同的分组，因为在注册路由组时发现存在相同的分组，会立即注册老的路由组里的全部路由，然后更新新的路由组信息。
 

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}"
     }
 }
 

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.6
+VERSION=2.4.7

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'