feat(android):优化插件配置升级版本 3.7.14-kotlin-13

Jason8Zhang · Mar 28, 2023 · c4d72db · c4d72db
1 parent 621ab1d
commit c4d72db
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 57 deletions.
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt
@@ -15,13 +15,6 @@ import com.didichuxing.doraemonkit.plugin.thirdlib.ThirdLibInfo
  */
 object DoKitExtUtil {
 
-    /**
-     * 是否包含dokitx-rpc模块
-     */
-    var HAS_DOKIT_RPC_MODULE = false
-
-    var HAS_DOKIT_TCP_HOOK_DJ = false
-
     var DOKIT_GPS_MOCK_INCLUDE = false
 
     /**

diff --git a/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt b/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt
@@ -43,33 +43,27 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                 var thirdLibInfo: ThirdLibInfo? = null
                 if (variants.size == 3) {
                     thirdLibInfo = ThirdLibInfo(variants[0], artifactResult.file.length())
-                    if (thirdLibInfo.variant.contains("dokitx-rpc")) {
-                        DoKitExtUtil.HAS_DOKIT_RPC_MODULE = true
-                    }
-                    if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
-                        DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
-                    }
-
-                    if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")) {
-                        DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
-                    }
+                    checkConfig(thirdLibInfo.variant)
                 } else if (variants.size == 4) {
                     thirdLibInfo = ThirdLibInfo("porject ${variants[1]}", artifactResult.file.length())
-                    if (thirdLibInfo.variant.contains("doraemonkit-rpc")) {
-                        DoKitExtUtil.HAS_DOKIT_RPC_MODULE = true
-                    }
-                    if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
-                        DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
-                    }
-
-                    if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")) {
-                        DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
-                    }
+                    checkConfig(thirdLibInfo.variant)
                 }
             }
         }
+        //查找AndroidManifest.xml 文件 并处理
+        processApplicationVariant(variant)
+
+    }
 
 
+    private fun checkConfig(variant: String) {
+        if (variant.contains("dokitx-gps-mock") || variant.contains("dokit-gps-mock")) {
+            DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
+        }
+    }
+
+
+    private fun processApplicationVariant(variant: BaseVariant) {
         //查找application module下的配置
         if (variant is ApplicationVariant) {
 
@@ -105,7 +99,6 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                 }
             }
 
-
         } else {
             "${variant.project.name}-不建议在Library Module下引入dokit插件".println()
         }

diff --git a/Android/config.gradle b/Android/config.gradle
@@ -14,7 +14,7 @@ ext {
         use_local    : true,
 //        group_id     : 'io.github.didi.dokit',
         group_id     : 'com.didichuxing.doraemonkit',
-        version      : '3.7.13-kotlin-13'
+        version      : '3.7.14-kotlin-13'
     ]
 
     android = [compileSdkVersion             : 31,

diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt
@@ -15,13 +15,6 @@ import com.didichuxing.doraemonkit.plugin.thirdlib.ThirdLibInfo
  */
 object DoKitExtUtil {
 
-    /**
-     * 是否包含dokitx-rpc模块
-     */
-    var HAS_DOKIT_RPC_MODULE = false
-
-    var HAS_DOKIT_TCP_HOOK_DJ = false
-
     var DOKIT_GPS_MOCK_INCLUDE = false
 
     /**

diff --git a/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt b/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt
@@ -43,33 +43,27 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                 var thirdLibInfo: ThirdLibInfo? = null
                 if (variants.size == 3) {
                     thirdLibInfo = ThirdLibInfo(variants[0], artifactResult.file.length())
-                    if (thirdLibInfo.variant.contains("dokitx-rpc")) {
-                        DoKitExtUtil.HAS_DOKIT_RPC_MODULE = true
-                    }
-                    if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
-                        DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
-                    }
-
-                    if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")) {
-                        DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
-                    }
+                    checkConfig(thirdLibInfo.variant)
                 } else if (variants.size == 4) {
                     thirdLibInfo = ThirdLibInfo("porject ${variants[1]}", artifactResult.file.length())
-                    if (thirdLibInfo.variant.contains("doraemonkit-rpc")) {
-                        DoKitExtUtil.HAS_DOKIT_RPC_MODULE = true
-                    }
-                    if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
-                        DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
-                    }
-
-                    if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")) {
-                        DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
-                    }
+                    checkConfig(thirdLibInfo.variant)
                 }
             }
         }
+        //查找AndroidManifest.xml 文件 并处理
+        processApplicationVariant(variant)
+
+    }
 
 
+    private fun checkConfig(variant: String) {
+        if (variant.contains("dokitx-gps-mock") || variant.contains("dokit-gps-mock")) {
+            DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
+        }
+    }
+
+
+    private fun processApplicationVariant(variant: BaseVariant) {
         //查找application module下的配置
         if (variant is ApplicationVariant) {
 
@@ -105,7 +99,6 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                 }
             }
 
-
         } else {
             "${variant.project.name}-不建议在Library Module下引入dokit插件".println()
         }