fix(Android):fix dokit-plugin

cqwang · May 13, 2022 · b9c35fc · b9c35fc
1 parent 1d8ee67
commit b9c35fc
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 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
@@ -24,6 +24,8 @@ object DoKitExtUtil {
 
     var HAS_DOKIT_TCP_HOOK_DJ = false
 
+    var DOKIT_GPS_MOCK_INCLUDE = false
+
     /**
      * 三方库版本信息
      */

diff --git a/...c/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt b/...c/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt
@@ -67,7 +67,7 @@ class CommClassTransformer : AbsClassTransformer() {
         }
 
         //gps字节码操作
-        if (DoKitExtUtil.commExt.gpsSwitch) {
+        if (DoKitExtUtil.commExt.gpsSwitch && DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE) {
             //系统 gpsStatus hook
             klass.methods.forEach { method ->
                 method.instructions?.iterator()?.asIterable()

diff --git a/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt b/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt
@@ -64,6 +64,10 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                     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;
+                    }
 //                    "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
                     DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
                 } else if (variants.size == 4) {
@@ -77,6 +81,11 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                     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;
+                    }
+
 //                    "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
                     DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
                 }

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
@@ -24,6 +24,8 @@ object DoKitExtUtil {
 
     var HAS_DOKIT_TCP_HOOK_DJ = false
 
+    var DOKIT_GPS_MOCK_INCLUDE = false
+
     /**
      * 三方库版本信息
      */

diff --git a/...c/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt b/...c/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt
@@ -67,7 +67,7 @@ class CommClassTransformer : AbsClassTransformer() {
         }
 
         //gps字节码操作
-        if (DoKitExtUtil.commExt.gpsSwitch) {
+        if (DoKitExtUtil.commExt.gpsSwitch && DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE) {
             //系统 gpsStatus hook
             klass.methods.forEach { method ->
                 method.instructions?.iterator()?.asIterable()

diff --git a/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt b/...rc/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt
@@ -64,6 +64,10 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                     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;
+                    }
 //                    "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
                     DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
                 } else if (variants.size == 4) {
@@ -77,6 +81,11 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
                     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;
+                    }
+
 //                    "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
                     DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,8 @@ object DoKitExtUtil { @@
         var HAS_DOKIT_TCP_HOOK_DJ = false
+        var DOKIT_GPS_MOCK_INCLUDE = false
         /**
          * 三方库版本信息
          */
@@ Expand Down @@