see 12/04 log

Author: Blankj

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.0-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.0-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/__bus__.json

@@ -1,3 +1,4 @@
 {
-  "CloseAdaptActivity#start": "void com.blankj.androidutilcode.feature.core.adaptScreen.CloseAdaptActivity.start(android.content.Context)"
+  "CloseAdaptActivity#start": "void com.blankj.androidutilcode.feature.core.adaptScreen.CloseAdaptActivity.start(android.content.Context)",
+  "AdaptScreenActivity#start": "void com.blankj.androidutilcode.feature.core.adaptScreen.AdaptScreenActivityKt.start(android.content.Context)"
 }

app/build.gradle

@@ -21,5 +21,5 @@ dependencies {
     // LeakCanary
     debugImplementation dep.leakcanary.android
     releaseImplementation dep.leakcanary.android_no_op
-//    implementation 'com.blankj:utilcode:1.22.0'
+//    implementation 'com.blankj:utilcode:1.22.1'
 }

app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java

@@ -2,7 +2,9 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.view.View;
 
@@ -84,7 +86,6 @@ public void activityClick(View view) {
 
     public void adaptScreenClick(View view) {
         BusUtils.post("AdaptScreenActivity#start", this);
-//        AdaptScreenActivity.start(this);
     }
 
     public void appClick(View view) {
@@ -174,4 +175,14 @@ public void spannableClick(View view) {
     public void toastClick(View view) {
         ToastActivity.start(this);
     }
+
+    public static float getAnimationScale(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            return Settings.Global.getFloat(context.getContentResolver(),
+                    Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f);
+        } else {
+            return Settings.System.getFloat(context.getContentResolver(),
+                    Settings.System.ANIMATOR_DURATION_SCALE, 1.0f);
+        }
+    }
 }

app/src/main/java/com/blankj/androidutilcode/feature/core/adaptScreen/AdaptScreenActivity.kt

@@ -28,10 +28,7 @@ class AdaptScreenActivity : BaseBackActivity() {
     override fun initView(savedInstanceState: Bundle?, contentView: View?) {
         adaptWidthBtn.setOnClickListener { WidthActivity.start(this) }
         adaptHeightBtn.setOnClickListener { HeightActivity.start(this) }
-        closeAdaptBtn.setOnClickListener {
-            BusUtils.post<Any>("CloseAdaptActivity#start", this)
-//            CloseAdaptActivity.start(this)
-        }
+        closeAdaptBtn.setOnClickListener { CloseAdaptActivity.start(this) }
     }
 
     override fun doBusiness() {}

app/src/main/java/com/blankj/androidutilcode/feature/core/adaptScreen/CloseAdaptActivity.kt

@@ -8,13 +8,10 @@ import android.support.v7.app.AppCompatActivity
 import android.view.WindowManager
 import com.blankj.androidutilcode.R
 import com.blankj.utilcode.util.AdaptScreenUtils
-import com.blankj.utilcode.util.BusUtils
 
 class CloseAdaptActivity : AppCompatActivity() {
 
-    companion object Instance {
-        @JvmStatic
-        @BusUtils.Subscribe(name = "CloseAdaptActivity#start")
+    companion object {
         fun start(context: Context) {
             val starter = Intent(context, CloseAdaptActivity::class.java)
             context.startActivity(starter)

bus-gradle-plugin/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Change Log
+
+## v1.5
+升级 javassist 来修复 Kotlin 匿名类 NotFoundException
+
+## v1.4
+优化 inject 兼容 Kotlin 的 bus
+
+## v1.3
+去除 static bus，只注入 utilcode
+
+## v1.2
+修复 bug
+
+## v1.1
+升级 javassist 版本，兼容 Java8
+
+## v1.0
+发布初版本

bus-gradle-plugin/com/blankj/bus/BusUtils.class

@@ -4,27 +4,34 @@ import com.blankj.util.JavassistUtils
 import com.blankj.util.ZipUtils
 import javassist.CtClass
 import javassist.CtMethod
+import javassist.NotFoundException
 import org.apache.commons.io.FileUtils
 
 class BusInject {
 
     static void start(HashMap<String, String> bus, File busJar) {
-            String jarPath = busJar.getAbsolutePath()
-            String decompressedJarPath = jarPath.substring(0, jarPath.length() - 4);
-            File decompressedJar = new File(decompressedJarPath)
-            ZipUtils.unzipFile(busJar, decompressedJar)
+        String jarPath = busJar.getAbsolutePath()
+        String decompressedJarPath = jarPath.substring(0, jarPath.length() - 4);
+        File decompressedJar = new File(decompressedJarPath)
+        ZipUtils.unzipFile(busJar, decompressedJar)
 
-            CtClass busUtils = JavassistUtils.getPool().get(Config.CLASS_BUS_UTILS)
-            CtMethod callMethod = busUtils.getDeclaredMethod("post");
-            callMethod.insertAfter(getInsertContent(bus));
-            busUtils.writeFile(decompressedJarPath)
-            busUtils.defrost();
-            FileUtils.forceDelete(busJar)
-            ZipUtils.zipFile(decompressedJar, busJar)
-            FileUtils.forceDelete(decompressedJar)
+        CtClass busUtils = JavassistUtils.getPool().get(Config.BUS_UTILS_CLASS)
+        CtMethod callMethod;
+        try {
+            callMethod = busUtils.getDeclaredMethod("injectShell");
+            callMethod.insertAfter(getInsertContent(bus, false));
+        } catch (NotFoundException ignore) {
+            callMethod = busUtils.getDeclaredMethod("post");
+            callMethod.insertAfter(getInsertContent(bus, true));
+        }
+        busUtils.writeFile(decompressedJarPath)
+        busUtils.defrost();
+        FileUtils.forceDelete(busJar)
+        ZipUtils.zipFile(decompressedJar, busJar)
+        FileUtils.forceDelete(decompressedJar)
     }
 
-    private static String getInsertContent(HashMap<String, String> bus) {
+    private static String getInsertContent(HashMap<String, String> bus, boolean isLow) {
         StringBuilder sb = new StringBuilder();
         bus.each { String key, String val ->
             String name = key
@@ -72,7 +79,9 @@ class BusInject {
             }
             sb.append("}")
         }
-        sb.append('android.util.Log.e("BusUtils", "bus of <" + $1 + "> didn\'t exist.");')
+        if (isLow) {
+            sb.append('android.util.Log.e("BusUtils", "bus of <" + $1 + "> didn\'t exist.");')
+        }
         return sb.toString()
     }
 }