see 01/06 log

Developerarif2 · Developerarif2 · commit e442281e6c5c · 2020-01-06T21:58:42.000+08:00
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -15,7 +15,7 @@ class Config {
     static minSdkVersion = 14
     static targetSdkVersion = 28
     static versionCode = 1_026_001
-    static versionName = '1.26.1-alpha1'// E.g. 1.9.72 => 1,009,072
+    static versionName = '1.26.1-alpha0'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static gradlePluginVersion = '3.5.2'
@@ -27,7 +27,7 @@ class Config {
             /*Never delete this line*/
             /*Generated by "config.json"*/
             plugin_api_gradle_plugin   : new DepConfig(true, true, ":plugin:api-gradle-plugin"),
-            plugin_bus_gradle_plugin   : new DepConfig(true, true, ":plugin:bus-gradle-plugin"),
+            plugin_bus_gradle_plugin   : new DepConfig(false, true, ":plugin:bus-gradle-plugin"),
             feature_mock               : new DepConfig(false, true, ":feature:mock"),
             feature_launcher_app       : new DepConfig(true, true, ":feature:launcher:app"),
             feature_main_app           : new DepConfig(false, true, ":feature:main:app"),
@@ -54,7 +54,7 @@ class Config {
             // 本地第一次上传插件新的版本需设置 isApply = false, useLocal = true
             // 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
             // 发布版本的话把 isApply = false, useLocal = false，更新版本号，发布成功后 isApply = true 即可使用远程库版本
-            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.3", pluginId: "com.blankj.api"),
+            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.3-release", pluginId: "com.blankj.api"),
             plugin_bus                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.5", pluginId: "com.blankj.bus"),
 
             support_appcompat_v7       : new DepConfig("com.android.support:appcompat-v7:$supportVersion"),
diff --git a/config.json b/config.json
@@ -6,7 +6,7 @@
   "proConfigDesc": "proConfig 配置的是使用本地还是仓库，优先级低于 appConfig 和 pkgConfig",
   "proConfig": [
     {"isApply": true, "useLocal": true, "localPath": ":plugin:api-gradle-plugin"},
-    {"isApply": true, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
+    {"isApply": false, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:mock"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:launcher:app"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:main:app"},
diff --git a/feature/main/pkg/src/main/java/com/blankj/main/pkg/MainActivity.kt b/feature/main/pkg/src/main/java/com/blankj/main/pkg/MainActivity.kt
@@ -9,7 +9,10 @@ import com.blankj.common.item.CommonItem
 import com.blankj.common.item.CommonItemClick
 import com.blankj.subutil.export.api.SubUtilApi
 import com.blankj.utilcode.export.api.UtilCodeApi
-import com.blankj.utilcode.util.*
+import com.blankj.utilcode.util.ApiUtils
+import com.blankj.utilcode.util.BarUtils
+import com.blankj.utilcode.util.ClickUtils
+import com.blankj.utilcode.util.CollectionUtils
 import kotlinx.android.synthetic.main.activity_main.*
 
 
@@ -66,6 +69,6 @@ class MainActivity : CommonActivity() {
     }
 
     override fun onBackPressed() {
-        ActivityUtils.startHomeActivity()
+        ClickUtils.back2HomeFriendly("Press again to exit.")
     }
 }
diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
@@ -3,8 +3,6 @@ package com.blankj.utilcode.pkg.feature.adaptScreen
 import android.content.Context
 import android.content.Intent
 import com.blankj.common.activity.CommonActivity
-import com.blankj.common.activity.CommonActivityItemsView
-import com.blankj.common.activity.CommonActivityTitleView
 import com.blankj.common.item.CommonItem
 import com.blankj.common.item.CommonItemClick
 import com.blankj.utilcode.pkg.R
diff --git a/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java b/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java
@@ -9,6 +9,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import java.util.List;
+
 /**
  * <pre>
  *     author: Blankj
@@ -117,6 +119,14 @@ public void update() {
         getAdapter().updateItem((T) this);
     }
 
+    public List<T> getItems() {
+        return getAdapter().getItems();
+    }
+
+    public int getCount() {
+        return getAdapter().getItemCount();
+    }
+
     public int getIndex() {
         //noinspection SuspiciousMethodCalls
         return getAdapter().getItems().indexOf(this);
diff --git a/lib/common/src/main/assets/test_install b/lib/common/src/main/assets/test_install
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
@@ -272,6 +272,7 @@ applyPressedBgAlpha                 : 应用点击后对背景改变透明度
 applyPressedBgDark                  : 应用点击后对背景加深
 applySingleDebouncing               : 对单视图应用防抖点击
 applyGlobalDebouncing               : 对所有设置 GlobalDebouncing 的视图应用防抖点击
+back2HomeFriendly                   : 友好地返回桌面
 ClickUtils#OnDebouncingClickListener: 防抖点击监听器
 ClickUtils#OnMultiClickListener     : 连续点击监听器
 ```
diff --git a/lib/utilcode/src/main/AndroidManifest.xml b/lib/utilcode/src/main/AndroidManifest.xml
@@ -21,7 +21,9 @@
                 android:resource="@xml/util_code_provider_paths" />
         </provider>
 
-        <service android:name="com.blankj.utilcode.util.MessengerUtils$ServerService">
+        <service
+            android:name="com.blankj.utilcode.util.MessengerUtils$ServerService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="${applicationId}.messenger" />
             </intent-filter>
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -1352,7 +1352,7 @@ public static void startActivities(@NonNull final Activity activity,
     /**
      * Start home activity.
      */
-    public static void startHomeActivity() throws SecurityException {
+    public static void startHomeActivity() {
         Intent homeIntent = new Intent(Intent.ACTION_MAIN);
         homeIntent.addCategory(Intent.CATEGORY_HOME);
         homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -651,7 +651,7 @@ public static boolean isSupportNavBar() {
      */
     public static void setNavBarLightMode(@NonNull final Activity activity,
                                           final boolean isLightMode) {
-        setStatusBarLightMode(activity.getWindow(), isLightMode);
+        setNavBarLightMode(activity.getWindow(), isLightMode);
     }
 
     /**
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java
@@ -1,5 +1,6 @@
 package com.blankj.utilcode.util;
 
+import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -345,9 +346,55 @@ public void onDebouncingClick(View v) {
         }
     }
 
-    private static int dp2px(final float dpValue) {
-        final float scale = Resources.getSystem().getDisplayMetrics().density;
-        return (int) (dpValue * scale + 0.5f);
+    private static final long TIP_DURATION = 2000L;
+    private static       long sLastClickMillis;
+    private static       int  sClickCount;
+
+    public static void back2HomeFriendly(final CharSequence tip) {
+        back2HomeFriendly(tip, TIP_DURATION, Back2HomeFriendlyListener.DEFAULT);
+    }
+
+    public static void back2HomeFriendly(@NonNull final CharSequence tip,
+                                         final long duration,
+                                         @NonNull Back2HomeFriendlyListener listener) {
+        long nowMillis = System.currentTimeMillis();
+        if (nowMillis - sLastClickMillis < duration) {
+            sClickCount++;
+            if (sClickCount == 2) {
+                startHomeActivity();
+                listener.dismiss();
+                sLastClickMillis = 0;
+            }
+        } else {
+            sClickCount = 1;
+            listener.show(tip, duration);
+            sLastClickMillis = nowMillis;
+        }
+    }
+
+    public interface Back2HomeFriendlyListener {
+        Back2HomeFriendlyListener DEFAULT = new Back2HomeFriendlyListener() {
+            @Override
+            public void show(CharSequence text, long duration) {
+                Utils.toastShowShort(text);
+            }
+
+            @Override
+            public void dismiss() {
+                Utils.toastCancel();
+            }
+        };
+
+        void show(CharSequence text, long duration);
+
+        void dismiss();
+    }
+
+    private static void startHomeActivity() {
+        Intent homeIntent = new Intent(Intent.ACTION_MAIN);
+        homeIntent.addCategory(Intent.CATEGORY_HOME);
+        homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Utils.getApp().startActivity(homeIntent);
     }
 
     public static abstract class OnDebouncingClickListener implements View.OnClickListener {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java
@@ -1557,7 +1557,7 @@ public static boolean isImage(final String filePath) {
         options.inJustDecodeBounds = true;
         try {
             Bitmap bitmap = BitmapFactory.decodeFile(filePath, options);
-            return options.outWidth != -1 && options.outHeight != -1;
+            return bitmap != null && options.outWidth != -1 && options.outHeight != -1;
         } catch (Exception e) {
             return false;
         }
@@ -1942,8 +1942,8 @@ public static int[] getSize(File file) {
      * @return the sample size
      */
     public static int calculateInSampleSize(final BitmapFactory.Options options,
-                                             final int maxWidth,
-                                             final int maxHeight) {
+                                            final int maxWidth,
+                                            final int maxHeight) {
         int height = options.outHeight;
         int width = options.outWidth;
         int inSampleSize = 1;
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
@@ -280,7 +280,7 @@ private void startPermissionActivity() {
     }
 
     @RequiresApi(api = Build.VERSION_CODES.M)
-    private boolean rationale(final Activity activity) {
+    private boolean rationale(final Activity activity, final Runnable againRunnable) {
         boolean isRationale = false;
         if (mOnRationaleListener != null) {
             for (String permission : mPermissionsRequest) {
@@ -289,12 +289,12 @@ private boolean rationale(final Activity activity) {
                     mOnRationaleListener.rationale(new ShouldRequest() {
                         @Override
                         public void again(boolean again) {
-                            activity.finish();
                             if (again) {
                                 mPermissionsDenied = new ArrayList<>();
                                 mPermissionsDeniedForever = new ArrayList<>();
-                                startPermissionActivity();
+                                againRunnable.run();
                             } else {
+                                activity.finish();
                                 requestCallback();
                             }
                         }
@@ -373,7 +373,7 @@ public Void call(Intent data) {
         }
 
         @Override
-        public void onCreated(Activity activity, @Nullable Bundle savedInstanceState) {
+        public void onCreated(final Activity activity, @Nullable Bundle savedInstanceState) {
             activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
                     | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);
             int type = activity.getIntent().getIntExtra(TYPE, -1);
@@ -386,17 +386,15 @@ public void onCreated(Activity activity, @Nullable Bundle savedInstanceState) {
                 if (sInstance.mThemeCallback != null) {
                     sInstance.mThemeCallback.onActivityCreate(activity);
                 }
-                if (sInstance.rationale(activity)) {
-                    return;
-                }
-                if (sInstance.mPermissionsRequest != null) {
-                    int size = sInstance.mPermissionsRequest.size();
-                    if (size <= 0) {
-                        activity.finish();
-                        return;
+                if (sInstance.rationale(activity, new Runnable() {
+                    @Override
+                    public void run() {
+                        requestPermissions(activity);
                     }
-                    activity.requestPermissions(sInstance.mPermissionsRequest.toArray(new String[size]), 1);
+                })) {
+                    return;
                 }
+                requestPermissions(activity);
             } else if (type == TYPE_WRITE_SETTINGS) {
                 startWriteSettingsActivity(activity, TYPE_WRITE_SETTINGS);
             } else if (type == TYPE_DRAW_OVERLAYS) {
@@ -407,6 +405,17 @@ public void onCreated(Activity activity, @Nullable Bundle savedInstanceState) {
             }
         }
 
+        private void requestPermissions(Activity activity) {
+            if (sInstance.mPermissionsRequest != null) {
+                int size = sInstance.mPermissionsRequest.size();
+                if (size <= 0) {
+                    activity.finish();
+                    return;
+                }
+                activity.requestPermissions(sInstance.mPermissionsRequest.toArray(new String[size]), 1);
+            }
+        }
+
         @Override
         public void onRequestPermissionsResult(Activity activity,
                                                int requestCode,
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -210,6 +210,14 @@ static SPUtils getSpUtils4Utils() {
         return SPUtils.getInstance("Utils");
     }
 
+    static void toastShowShort(final CharSequence text) {
+        ToastUtils.showShort(text);
+    }
+
+    static void toastCancel() {
+        ToastUtils.cancel();
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // private method
     ///////////////////////////////////////////////////////////////////////////
diff --git a/plugin/api-gradle-plugin/reports/profile/css/base-style.css b/plugin/api-gradle-plugin/reports/profile/css/base-style.css
diff --git a/plugin/api-gradle-plugin/reports/profile/css/style.css b/plugin/api-gradle-plugin/reports/profile/css/style.css
diff --git a/plugin/api-gradle-plugin/reports/profile/js/report.js b/plugin/api-gradle-plugin/reports/profile/js/report.js
diff --git a/plugin/api-gradle-plugin/reports/profile/profile-2019-12-05-14-55-48.html b/plugin/api-gradle-plugin/reports/profile/profile-2019-12-05-14-55-48.html
diff --git a/plugin/api-gradle-plugin/src/main/java/com/blankj/api/ApiPlugin.groovy b/plugin/api-gradle-plugin/src/main/java/com/blankj/api/ApiPlugin.groovy

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ import com.blankj.common.item.CommonItem`
`9`	`9`	`import com.blankj.common.item.CommonItemClick`
`10`	`10`	`import com.blankj.subutil.export.api.SubUtilApi`
`11`	`11`	`import com.blankj.utilcode.export.api.UtilCodeApi`
`12`		`-import com.blankj.utilcode.util.*`
	`12`	`+import com.blankj.utilcode.util.ApiUtils`
	`13`	`+import com.blankj.utilcode.util.BarUtils`
	`14`	`+import com.blankj.utilcode.util.ClickUtils`
	`15`	`+import com.blankj.utilcode.util.CollectionUtils`
`13`	`16`	`import kotlinx.android.synthetic.main.activity_main.*`
`14`	`17`
`15`	`18`
`@@ -66,6 +69,6 @@ class MainActivity : CommonActivity() {`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`override fun onBackPressed() {`
`69`		`- ActivityUtils.startHomeActivity()`
	`72`	`+ ClickUtils.back2HomeFriendly("Press again to exit.")`
`70`	`73`	`}`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ public static boolean isSupportNavBar() {`
`651`	`651`	`*/`
`652`	`652`	`public static void setNavBarLightMode(@NonNull final Activity activity,`
`653`	`653`	`final boolean isLightMode) {`
`654`		`- setStatusBarLightMode(activity.getWindow(), isLightMode);`
	`654`	`+ setNavBarLightMode(activity.getWindow(), isLightMode);`
`655`	`655`	`}`
`656`	`656`
`657`	`657`	`/**`