[feat] 回公司测试

Author: Leifzhang

.gitignore

@@ -38,3 +38,5 @@ captures/
 
 # Keystore files
 *.jks
+
+.repo/

.idea/gradle.xml

@@ -1,16 +1,16 @@
 apply plugin: 'groovy'
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
+    implementation gradleApi()
+    implementation localGroovy()
 }
 
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile 'com.android.tools.build:gradle:3.4.1'
-    compile 'commons-io:commons-io:2.4'
-    compile 'org.javassist:javassist:3.20.0-GA'
+    implementation 'com.android.tools.build:gradle:3.3.1'
+    implementation 'commons-io:commons-io:2.4'
+    implementation 'org.javassist:javassist:3.20.0-GA'
 }
 apply from: '../upload.gradle'

.idea/misc.xml

@@ -36,7 +36,7 @@ class AutoRegisterTransform extends Transform {
 
     @Override
     boolean isIncremental() {
-        return true
+        return false
     }
 
     @Override
@@ -45,7 +45,6 @@ class AutoRegisterTransform extends Transform {
         def inputs = transformInvocation.getInputs()
         def outputProvider = transformInvocation.outputProvider
         def context = transformInvocation.context
-        def jarFile
         HashSet<String> items = new HashSet<>()
         inputs.each { TransformInput input ->
             input.jarInputs.each { JarInput jarInput ->
@@ -61,7 +60,8 @@ class AutoRegisterTransform extends Transform {
                         directoryInput.file.eachFileRecurse {
                             dir.traverse(type: FileType.FILES, nameFilter: ~/.*\.class/) {
                                 File classFile ->
-                                    String absolutePath = classFile.absolutePath.replace(dir.absolutePath + File.separator, "")
+                                    String absolutePath = classFile.absolutePath.replace(dir.absolutePath + File.separator,
+                                            "")
                                     String className = path2Classname(absolutePath)
                                     if (checkClassName(className)) {
                                         //key为相对路径
@@ -124,8 +124,7 @@ class AutoRegisterTransform extends Transform {
      * @param jarFile
      * @return
      */
-    static boolean addJarInitList(File jarFile, HashSet<String> items) {
-        boolean modified = false
+    static void addJarInitList(File jarFile, HashSet<String> items) {
         if (jarFile) {
             /**
              * 读取原jar
@@ -139,18 +138,16 @@ class AutoRegisterTransform extends Transform {
                 if (entryName.endsWith(".class")) {
                     className = entryName.replace("/", ".").replace(".class", "")
                     if (!checkPackage(className)) {
-                        return false
+                        return
                     }
                     if (checkClassName(className)) {
                         items.add(entryName)
-                        modified = true
                         break
                     }
                 }
             }
             file.close()
         }
-        return modified
     }
 
     /**
@@ -174,6 +171,7 @@ class AutoRegisterTransform extends Transform {
                     className = entryName.replace("/", ".")
                             .replace(".class", "")
                     if (!checkPackage(className)) {
+                        file.close()
                         return false
                     }
                     if (checkRouterInitClassName(className)) {

.idea/modules.xml

@@ -4,6 +4,8 @@ import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 
+import java.awt.Label
+
 class ClassFilterVisitor extends ClassVisitor {
     private HashSet<String> classItems
 
@@ -12,29 +14,25 @@ class ClassFilterVisitor extends ClassVisitor {
         this.classItems = classItems
     }
 
+    @Override
+    void visitEnd() {
+        super.visitEnd()
+    }
+
     @Override
     MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-        if (name == "injectInit") {
+        Log.info("name:$name  desc:$desc ")
+        if (name == "injectInit" && desc == "()V") {
             MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions)
             MethodVisitor mv = new MethodVisitor(Opcodes.ASM5, methodVisitor) {
-            /*    @Override
-                void visitCode() {
-                    super.visitCode()
-                    methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/System", "currentTimeMillis", "()J", false)
-                    methodVisitor.visitVarInsn(Opcodes.LSTORE, 1)
-                }*/
-
                 @Override
-                void visitInsn(int opcode) {
-                    if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
-                            || opcode == Opcodes.ATHROW) {
-                        classItems.each { String input ->
-                            input = input.replace(".class", "")
-                            Log.info("item:" + input)
-                            methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, input, "init", "()V;", false)
-                        }
+                void visitCode() {
+                    classItems.each { String input ->
+                        input = input.replace(".class", "")
+                        Log.info("item:" + input)
+                       // mv.visitMethodInsn(Opcodes.INVOKESTATIC, input, "init", "()V;", false)
                     }
-                    methodVisitor.visitInsn(opcode)
+                    super.visitCode()
                 }
             }
             return mv

AutoRegister/build.gradle

@@ -21,12 +21,15 @@ class InjectHelper {
         this.classItems = classItems
     }
 
+    void setClassItems(classItems) {
+        this.classItems = classItems
+    }
 
     private byte[] modifyClass(byte[] srcClass) throws IOException {
         ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS)
         ClassVisitor methodFilterCV = new ClassFilterVisitor(classWriter, classItems)
         ClassReader cr = new ClassReader(srcClass)
-        cr.accept(methodFilterCV, ClassReader.EXPAND_FRAMES)
+        cr.accept(methodFilterCV, 0)
         return classWriter.toByteArray()
     }
 
@@ -58,6 +61,7 @@ class InjectHelper {
                 className = AutoRegisterTransform.path2Classname(entryName)
                 if (checkRouterInitClassName(className)) {
                     try {
+                        Log.info("modifyClass $entryName")
                         modifiedClassBytes = modifyClass(sourceClassBytes)
                     } catch (Exception e) {
                         e.printStackTrace()
@@ -67,7 +71,6 @@ class InjectHelper {
             if (modifiedClassBytes == null) {
                 jarOutputStream.write(sourceClassBytes)
             } else {
-                Log.info("modify:RouterLoader")
                 jarOutputStream.write(modifiedClassBytes)
             }
             jarOutputStream.closeEntry()
@@ -79,6 +82,6 @@ class InjectHelper {
 
     static boolean checkRouterInitClassName(String className) {
         String dexClassName = "com.kronos.router.RouterLoader"
-        return dexClassName.equals(className)
+        return dexClassName == className
     }
 }

AutoRegister/src/main/groovy/com/kronos/autoregister/AutoRegisterTransform.groovy

@@ -6,14 +6,5 @@ package com.kronos.router
  */
 
 object RouterBind {
-    fun bind(className: String) {
-        try {
-            val routerInit = Class.forName(className)
-            val method = routerInit.getMethod("init")
-            method.invoke(null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
 
-    }
 }

AutoRegister/src/main/groovy/com/kronos/autoregister/helper/ClassFilterVisitor.groovy

@@ -0,0 +1,15 @@
+package com.kronos.router;
+
+public class RouterLoader {
+
+    public void attach() {
+        injectInit();
+    }
+
+    void injectInit() {
+
+    }
+    public boolean isLoadingFinish(){
+        return true;
+    }
+}

AutoRegister/src/main/groovy/com/kronos/autoregister/helper/InjectHelper.groovy

@@ -51,7 +51,9 @@ private RouterParams getParams(String url, Map<String, HostParams> hosts) throws
                 Collections.sort(params, new Comparator<RouterParams>() {
                     @Override
                     public int compare(RouterParams o1, RouterParams o2) {
-                        return o1.getWeight().compareTo(o2.getWeight());
+                        Integer o1Weight = o1.getWeight();
+                        Integer o2Weight = o2.getWeight();
+                        return o1Weight.compareTo(o2Weight);
                     }
                 });
                 routerParams = params.get(0);

RouterLib/src/main/java/com/kronos/router/RouterBind.kt

@@ -6,23 +6,20 @@ import java.util.HashMap
  * Created by zhangyang on 16/7/16.
  */
 class HostParams(val host: String) {
-    private val _routes = HashMap<String, RouterOptions>()
-
-    val routes: Map<String, RouterOptions>
-        get() = _routes
+    val routes = HashMap<String, RouterOptions>()
 
     fun setRoute(path: String, options: RouterOptions) {
         if (routes.containsKey(path)) {
-            val oldOptions = _routes[path]
-            if (oldOptions!!.weight < options.weight) {
-                _routes.put(path, options)
+            val oldOptions = routes[path]
+            if (oldOptions?.weight ?: 0 < options.weight) {
+                routes[path] = options
             }
         } else {
-            _routes.put(path, options)
+            routes[path] = options
         }
     }
 
     fun getOptions(path: String): RouterOptions? {
-        return _routes[path]
+        return routes[path]
     }
 }

RouterLib/src/main/java/com/kronos/router/RouterLoader.java

@@ -9,35 +9,32 @@ import com.kronos.router.RouterCallback
  * Created by zhangyang on 16/7/16.
  */
 class RouterOptions {
+
     var openClass: Class<out Activity>? = null
     var callback: RouterCallback? = null
-    private var _defaultParams: Bundle? = null
+    private val _defaultParams: Bundle by lazy {
+        Bundle()
+    }
     var weight = 0
 
     var defaultParams: Bundle?
         get() = this._defaultParams
         set(defaultParams) {
-            if (_defaultParams == null) {
-                _defaultParams = Bundle()
-            }
-            if (defaultParams != null) {
-                _defaultParams!!.putAll(defaultParams)
-            }
+
+            _defaultParams.putAll(defaultParams)
+
         }
 
     constructor() {
-        if (_defaultParams == null) {
-            _defaultParams = Bundle()
-        }
-    }
 
+    }
 
     constructor(defaultParams: Bundle) {
         this.defaultParams = defaultParams
     }
 
 
     fun putParams(key: String, value: String) {
-        _defaultParams!!.putString(key, value)
+        _defaultParams.putString(key, value)
     }
 }

RouterLib/src/main/java/com/kronos/router/RouterLoader.kt

@@ -5,26 +5,18 @@ package com.kronos.router.model
  */
 class RouterParams {
     var url: String? = null
-    private var weight: Int = 0
+    var weight: Int = 0
     var routerOptions: RouterOptions? = null
     var openParams: Map<String, String>? = null
 
     val realPath: String
         get() {
             try {
-
-                return url!!.subSequence(1, url!!.length).toString()
+                return url?.let { it.subSequence(1, it.length).toString() } ?: ""
             } catch (e: Exception) {
                 e.printStackTrace()
             }
             return ""
         }
 
-    fun getWeight(): Int? {
-        return weight
-    }
-
-    fun setWeight(weight: Int) {
-        this.weight = weight
-    }
 }