feat(android): 升级版本 3.7.13-kotlin-13

Jason8Zhang · Mar 28, 2023 · e159dc9 · e159dc9
1 parent 84bdfce
commit e159dc9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 36 deletions.
diff --git a/...lin/com/didichuxing/doraemonkit/plugin/transform/classtransform/BigImgClassTransformer.kt b/...lin/com/didichuxing/doraemonkit/plugin/transform/classtransform/BigImgClassTransformer.kt
@@ -1,10 +1,10 @@
 package com.didichuxing.doraemonkit.plugin.transform.classtransform
 
+import com.didichuxing.doraemonkit.plugin.DoKitExtUtil
 import com.didichuxing.doraemonkit.plugin.extension.DoKitExtension
 import com.didichuxing.doraemonkit.plugin.getMethodExitInsnNodes
 import com.didichuxing.doraemonkit.plugin.lastPath
 import com.didichuxing.doraemonkit.plugin.println
-import com.didichuxing.doraemonkit.plugin.transform.DoKitTransformContext
 import com.didiglobal.booster.transform.TransformContext
 import com.didiglobal.booster.transform.asm.className
 import org.gradle.api.Project
@@ -25,23 +25,16 @@ import org.objectweb.asm.tree.VarInsnNode
  */
 class BigImgClassTransformer : AbsClassTransformer() {
 
-    override fun transform(context: TransformContext, klass: ClassNode): ClassNode {
-        if (onDoKitClassInterceptor(context, klass)) {
-            return klass
-        }
-        if (context is DoKitTransformContext) {
-            val project = context.project()
-            val dokit = context.dokitExtension()
-            transform(project, dokit, context, klass)
-        }
-        return klass
-    }
 
     override fun transform(project: Project, dokit: DoKitExtension, context: TransformContext, klass: ClassNode): ClassNode {
         if (!dokit.bigImageEnable) {
             return klass
         }
 
+            return klass
+            if (DoKitExtUtil.ignorePackageNames(klass.className)) {
+            }
+
         val className = klass.className
         //glide
         if (dokit.bigImage.glide && className == "com.bumptech.glide.request.SingleRequest") {

diff --git a/...otlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/CommClassTransformer.kt b/...otlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/CommClassTransformer.kt
@@ -6,7 +6,6 @@ import com.didichuxing.doraemonkit.plugin.extension.SlowMethodExtension
 import com.didichuxing.doraemonkit.plugin.formatSuperName
 import com.didichuxing.doraemonkit.plugin.lastPath
 import com.didichuxing.doraemonkit.plugin.println
-import com.didichuxing.doraemonkit.plugin.transform.DoKitTransformContext
 import com.didiglobal.booster.transform.TransformContext
 import com.didiglobal.booster.transform.asm.className
 import org.gradle.api.Project
@@ -25,18 +24,6 @@ import org.objectweb.asm.tree.*
 class CommClassTransformer : AbsClassTransformer() {
 
 
-    override fun transform(context: TransformContext, klass: ClassNode): ClassNode {
-        if (onDoKitClassInterceptor(context, klass)) {
-            return klass
-        }
-        if (context is DoKitTransformContext) {
-            val project = context.project()
-            val dokit = context.dokitExtension()
-            transform(project, dokit, context, klass)
-        }
-        return klass
-    }
-
     /**
      * 类处理转化实现
      */

diff --git a/Android/config.gradle b/Android/config.gradle
@@ -12,13 +12,13 @@ ext {
         run_env      : 1,
         //是否使用本地仓库，需要使用绝对路径，仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL
         use_local    : true,
-        group_id     : 'io.github.didi.dokit',
-//        group_id     : 'com.didichuxing.doraemonkit',
-        version      : '3.7.11'
+//        group_id     : 'io.github.didi.dokit',
+        group_id     : 'com.didichuxing.doraemonkit',
+        version      : '3.7.13-kotlin-13'
     ]
 
-    android = [compileSdkVersion             : 29,
-               applicationId                 : "com.didichuxing.doraemondemo",
+    android = [compileSdkVersion             : 31,
+               applicationId                 : "com.didichuxing.doraemondemo.app",
                minSdkVersion_16              : 16,
                minSdkVersion_21              : 21,
                targetSdkVersion              : 31,
@@ -162,9 +162,7 @@ ext {
     //定义全局方法
     needKotlinV14 = {
         String version = publish_config["version"]
-        //分割字符串
-        String[] vs = version.split("\\.")
-        return vs.length == 3
+        return !version.contains("kotlin-13")
     }
 
     usePrivateEnv = {

diff --git a/...kotlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/AbsClassTransformer.kt b/...kotlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/AbsClassTransformer.kt
@@ -42,9 +42,7 @@ open class AbsClassTransformer : ClassTransformer {
         if (onDoKitClassInterceptor(context, klass)) {
             return klass
         }
-        if (DoKitExtUtil.ignorePackageNames(klass.className)) {
-            return klass
-        }
+
         if (context is DoKitTransformContext) {
             val project = context.project()
             val dokit = context.dokitExtension()

diff --git a/...lin/com/didichuxing/doraemonkit/plugin/transform/classtransform/BigImgClassTransformer.kt b/...lin/com/didichuxing/doraemonkit/plugin/transform/classtransform/BigImgClassTransformer.kt
@@ -1,5 +1,6 @@
 package com.didichuxing.doraemonkit.plugin.transform.classtransform
 
+import com.didichuxing.doraemonkit.plugin.DoKitExtUtil
 import com.didichuxing.doraemonkit.plugin.extension.DoKitExtension
 import com.didichuxing.doraemonkit.plugin.getMethodExitInsnNodes
 import com.didichuxing.doraemonkit.plugin.lastPath
@@ -24,11 +25,16 @@ import org.objectweb.asm.tree.VarInsnNode
  */
 class BigImgClassTransformer : AbsClassTransformer() {
 
+
     override fun transform(project: Project, dokit: DoKitExtension, context: TransformContext, klass: ClassNode): ClassNode {
         if (!dokit.bigImageEnable) {
             return klass
         }
 
+            return klass
+            if (DoKitExtUtil.ignorePackageNames(klass.className)) {
+            }
+
         val className = klass.className
         //glide
         if (dokit.bigImage.glide && className == "com.bumptech.glide.request.SingleRequest") {

diff --git a/...otlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/CommClassTransformer.kt b/...otlin/com/didichuxing/doraemonkit/plugin/transform/classtransform/CommClassTransformer.kt
@@ -23,6 +23,7 @@ import org.objectweb.asm.tree.*
  */
 class CommClassTransformer : AbsClassTransformer() {
 
+
     /**
      * 类处理转化实现
      */