Skip to content

Commit b9c35fc

Browse files
committed
fix(Android):fix dokit-plugin
1 parent 1d8ee67 commit b9c35fc

File tree

6 files changed

+24
-2
lines changed

6 files changed

+24
-2
lines changed

Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ object DoKitExtUtil {
2424

2525
var HAS_DOKIT_TCP_HOOK_DJ = false
2626

27+
var DOKIT_GPS_MOCK_INCLUDE = false
28+
2729
/**
2830
* 三方库版本信息
2931
*/

Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class CommClassTransformer : AbsClassTransformer() {
6767
}
6868

6969
//gps字节码操作
70-
if (DoKitExtUtil.commExt.gpsSwitch) {
70+
if (DoKitExtUtil.commExt.gpsSwitch && DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE) {
7171
//系统 gpsStatus hook
7272
klass.methods.forEach { method ->
7373
method.instructions?.iterator()?.asIterable()

Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
6464
if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
6565
DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
6666
}
67+
68+
if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")){
69+
DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
70+
}
6771
// "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
6872
DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
6973
} else if (variants.size == 4) {
@@ -77,6 +81,11 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
7781
if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
7882
DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
7983
}
84+
85+
if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")){
86+
DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
87+
}
88+
8089
// "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
8190
DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
8291
}

Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ object DoKitExtUtil {
2424

2525
var HAS_DOKIT_TCP_HOOK_DJ = false
2626

27+
var DOKIT_GPS_MOCK_INCLUDE = false
28+
2729
/**
2830
* 三方库版本信息
2931
*/

Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommClassTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class CommClassTransformer : AbsClassTransformer() {
6767
}
6868

6969
//gps字节码操作
70-
if (DoKitExtUtil.commExt.gpsSwitch) {
70+
if (DoKitExtUtil.commExt.gpsSwitch && DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE) {
7171
//系统 gpsStatus hook
7272
klass.methods.forEach { method ->
7373
method.instructions?.iterator()?.asIterable()

Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
6464
if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
6565
DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
6666
}
67+
68+
if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")){
69+
DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
70+
}
6771
// "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
6872
DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
6973
} else if (variants.size == 4) {
@@ -77,6 +81,11 @@ class DoKitPluginConfigProcessor(val project: Project) : VariantProcessor {
7781
if (thirdLibInfo.variant.contains("dokitx-tcp-hook-dj")) {
7882
DoKitExtUtil.HAS_DOKIT_TCP_HOOK_DJ = true
7983
}
84+
85+
if (thirdLibInfo.variant.contains("dokitx-gps-mock") || thirdLibInfo.variant.contains("dokit-gps-mock")){
86+
DoKitExtUtil.DOKIT_GPS_MOCK_INCLUDE = true;
87+
}
88+
8089
// "thirdLibInfo.variant===>${thirdLibInfo.variant}".println()
8190
DoKitExtUtil.THIRD_LIB_INFOS.add(thirdLibInfo)
8291
}

0 commit comments

Comments
 (0)