see 04/03 log

Blankj · Blankj · commit 937ef99a8a79 · 2020-04-03T20:05:48.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* `20/04/03` [fix] UtilsActivityLifecycleImpl#HashMap#remove IllegalStateException Bug. Publish v1.27.2.
 * `20/04/02` [fix] PathUtils sdcard enable state is wrong; ActivityUtils finish activity wrong; Publish v1.27.1.
 * `20/03/31` [add] Publish v1.27.0.
 * `20/03/30` [add] BatteryUtils in subutil.
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 = 29
     static versionCode = 1_026_001
-    static versionName = '1.27.1'// E.g. 1.9.72 => 1,009,072
+    static versionName = '1.27.2'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static gradlePluginVersion = '3.5.0'
diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/click/ClickActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/click/ClickActivity.kt
@@ -44,7 +44,7 @@ class ClickActivity : CommonActivity() {
                     ClickUtils.applyPressedViewAlpha(it)
                 }),
                 ClickItem(R.string.click_bg_alpha_default, Utils.Consumer {
-                    ClickUtils.applyPressedBgAlpha(it)
+                    ClickUtils.applyPressedBgAlpha(it, 0.6f)
                 }),
                 ClickItem(R.string.click_bg_dark_default, Utils.Consumer {
                     ClickUtils.applyPressedBgDark(it)
diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/shadow/ShadowActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/shadow/ShadowActivity.kt
@@ -39,9 +39,9 @@ class ShadowActivity : CommonActivity() {
 
     override fun initView(savedInstanceState: Bundle?, contentView: View?) {
         super.initView(savedInstanceState, contentView)
-        ShadowUtils.apply(shadowRectView, Config().setShadowColor(Color.BLUE, Color.GREEN))
-        ShadowUtils.apply(shadowRoundRectView, Config().setShadowRadius(
+        ShadowUtils.apply(shadowRectView, Config().setShadowColor(0x700000FF, 0x7000FF00))
+        ShadowUtils.apply(shadowRoundRectView, Config().setShadowColor(0x700000FF, 0x7000FF00).setShadowRadius(
                 SizeUtils.dp2px(16f).toFloat()))
-        ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))
+        ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(0x700000FF, 0x7000FF00))
     }
 }
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
@@ -21,7 +21,7 @@
  *     desc  : utils about app store
  * </pre>
  */
-public class AppStoreUtils {
+public final class AppStoreUtils {
 
     private static final String TAG = "AppStoreUtils";
 
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java
@@ -11,8 +11,6 @@
 import com.blankj.utilcode.util.ThreadUtils;
 import com.blankj.utilcode.util.Utils;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashSet;
@@ -26,7 +24,7 @@
  *     desc  :
  * </pre>
  */
-public class BatteryUtils {
+public final class BatteryUtils {
 
     @IntDef({BatteryStatus.UNKNOWN, BatteryStatus.DISCHARGING, BatteryStatus.CHARGING,
             BatteryStatus.NOT_CHARGING, BatteryStatus.FULL})
@@ -137,7 +135,7 @@ public interface OnBatteryStatusChangedListener {
         void onBatteryStatusChanged(Status status);
     }
 
-    public static class Status {
+    public static final class Status {
         private int level;
         @BatteryStatus
         private int status;
@@ -164,7 +162,6 @@ public void setStatus(int status) {
             this.status = status;
         }
 
-        @NotNull
         @Override
         public String toString() {
             return batteryStatus2String(status) + ": " + level + "%";
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
@@ -83,22 +83,37 @@ public static Activity getActivityByContext(Context context) {
     }
 
     private static Activity getActivityByContextInner(Context context) {
-        if (context instanceof Activity) return (Activity) context;
-        if (context != null && context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
-            try {
-                Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
-                mActivityContextField.setAccessible(true);
-                //noinspection unchecked
-                return ((WeakReference<Activity>) mActivityContextField.get(context)).get();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        if (context == null) return null;
+        List<Context> list = new ArrayList<>();
         while (context instanceof ContextWrapper) {
             if (context instanceof Activity) {
                 return (Activity) context;
             }
+            Activity activity = getActivityFromDecorContext(context);
+            if (activity != null) return activity;
+            list.add(context);
             context = ((ContextWrapper) context).getBaseContext();
+            if (context == null) {
+                return null;
+            }
+            if (list.contains(context)) {
+                // loop context
+                return null;
+            }
+        }
+        return null;
+    }
+
+    private static Activity getActivityFromDecorContext(Context context) {
+        if (context == null) return null;
+        if (context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
+            try {
+                Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
+                mActivityContextField.setAccessible(true);
+                //noinspection ConstantConditions,unchecked
+                return ((WeakReference<Activity>) mActivityContextField.get(context)).get();
+            } catch (Exception ignore) {
+            }
         }
         return null;
     }
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
@@ -153,8 +153,7 @@ private static void applyMetricsFields(final Resources resources, final float ne
     private static DisplayMetrics getMetricsFromField(final Resources resources, final Field field) {
         try {
             return (DisplayMetrics) field.get(resources);
-        } catch (Exception e) {
-            Log.e("AdaptScreenUtils", "getMetricsFromField: " + e);
+        } catch (Exception ignore) {
             return null;
         }
     }
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
@@ -213,23 +213,23 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
     }
 
     private static Drawable createAlphaDrawable(Drawable drawable, float alpha) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
             drawableWrapper.setAlphaFix((int) (alpha * 255));
             return drawableWrapper;
-        }
-        drawable.setAlpha((int) (alpha * 255));
-        return drawable;
+//        }
+//        drawable.setAlpha((int) (alpha * 255));
+//        return drawable;
     }
 
     private static Drawable createDarkDrawable(Drawable drawable, float alpha) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
             drawableWrapper.setColorFilterFix(getDarkColorFilter(alpha));
             return drawableWrapper;
-        }
-        drawable.setColorFilter(getDarkColorFilter(alpha));
-        return drawable;
+//        }
+//        drawable.setColorFilter(getDarkColorFilter(alpha));
+//        return drawable;
     }
 
     private static ColorMatrixColorFilter getDarkColorFilter(float darkAlpha) {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
@@ -4,8 +4,6 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.io.File;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.SimpleDateFormat;
@@ -92,7 +90,7 @@ private static UncaughtExceptionHandler getUncaughtExceptionHandler(final String
                                                                         final OnCrashListener onCrashListener) {
         return new UncaughtExceptionHandler() {
             @Override
-            public void uncaughtException(@NotNull final Thread t, @NotNull final Throwable e) {
+            public void uncaughtException(@NonNull final Thread t, @NonNull final Throwable e) {
                 final String time = new SimpleDateFormat("MM-dd_HH-mm-ss").format(new Date());
                 final StringBuilder sb = new StringBuilder();
                 final String head = "************* Log Head ****************" +
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
@@ -782,7 +782,7 @@ private static class LazyHolder {
 //    public static final class NetworkCallbackImpl extends ConnectivityManager.NetworkCallback {
 //
 //        @Override
-//        public void onAvailable(@NotNull Network network) {
+//        public void onAvailable(@NonNull Network network) {
 //            super.onAvailable(network);
 //            LogUtils.d(TAG, "onAvailable: " + network);
 //        }
@@ -794,7 +794,7 @@ private static class LazyHolder {
 //        }
 //
 //        @Override
-//        public void onLost(@NotNull Network network) {
+//        public void onLost(@NonNull Network network) {
 //            super.onLost(network);
 //            LogUtils.e(TAG, "onLost: " + network);
 //        }
@@ -806,7 +806,7 @@ private static class LazyHolder {
 //        }
 //
 //        @Override
-//        public void onCapabilitiesChanged(@NotNull Network network, @NotNull NetworkCapabilities cap) {
+//        public void onCapabilitiesChanged(@NonNull Network network, @NonNull NetworkCapabilities cap) {
 //            super.onCapabilitiesChanged(network, cap);
 //            if (cap.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
 //                if (cap.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsActivityLifecycleImpl.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsActivityLifecycleImpl.java
@@ -6,19 +6,17 @@
 import android.arch.lifecycle.Lifecycle;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * <pre>
@@ -34,9 +32,8 @@ final class UtilsActivityLifecycleImpl implements Application.ActivityLifecycleC
 
     private final LinkedList<Activity> mActivityList = new LinkedList<>();
 
-    private final List<Utils.OnAppStatusChangedListener>                 mStatusListeners               = new ArrayList<>();
-    private final Map<Activity, List<Utils.OnActivityDestroyedListener>> mDestroyedListenerMap          = new HashMap<>();
-    private final Map<Activity, List<Utils.ActivityLifecycleCallbacks>>  mActivityLifecycleCallbacksMap = new HashMap<>();
+    private final List<Utils.OnAppStatusChangedListener>                mStatusListeners               = new ArrayList<>();
+    private final Map<Activity, List<Utils.ActivityLifecycleCallbacks>> mActivityLifecycleCallbacksMap = new ConcurrentHashMap<>();
 
     private int     mForegroundCount = 0;
     private int     mConfigCount     = 0;
@@ -127,19 +124,44 @@ private void removeActivityLifecycleCallbacksInner(final Activity activity,
         }
     }
 
+    private void consumeActivityLifecycleCallbacks(Activity activity, Lifecycle.Event event) {
+        List<Utils.ActivityLifecycleCallbacks> listeners = mActivityLifecycleCallbacksMap.get(activity);
+        if (listeners != null) {
+            for (Utils.ActivityLifecycleCallbacks listener : listeners) {
+                listener.onLifecycleChanged(activity, event);
+                if (event.equals(Lifecycle.Event.ON_CREATE)) {
+                    listener.onActivityCreated(activity);
+                } else if (event.equals(Lifecycle.Event.ON_START)) {
+                    listener.onActivityStarted(activity);
+                } else if (event.equals(Lifecycle.Event.ON_RESUME)) {
+                    listener.onActivityResumed(activity);
+                } else if (event.equals(Lifecycle.Event.ON_PAUSE)) {
+                    listener.onActivityPaused(activity);
+                } else if (event.equals(Lifecycle.Event.ON_STOP)) {
+                    listener.onActivityStopped(activity);
+                } else if (event.equals(Lifecycle.Event.ON_DESTROY)) {
+                    listener.onActivityDestroyed(activity);
+                }
+            }
+            if (event.equals(Lifecycle.Event.ON_DESTROY)) {
+                mActivityLifecycleCallbacksMap.remove(activity);
+            }
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // lifecycle start
     ///////////////////////////////////////////////////////////////////////////
     @Override
-    public void onActivityCreated(@NotNull Activity activity, Bundle savedInstanceState) {
+    public void onActivityCreated(@NonNull Activity activity, Bundle savedInstanceState) {
         UtilsBridge.applyLanguage(activity);
         setAnimatorsEnabled();
         setTopActivity(activity);
         consumeActivityLifecycleCallbacks(activity, Lifecycle.Event.ON_CREATE);
     }
 
     @Override
-    public void onActivityStarted(@NotNull Activity activity) {
+    public void onActivityStarted(@NonNull Activity activity) {
         if (!mIsBackground) {
             setTopActivity(activity);
         }
@@ -152,7 +174,7 @@ public void onActivityStarted(@NotNull Activity activity) {
     }
 
     @Override
-    public void onActivityResumed(@NotNull final Activity activity) {
+    public void onActivityResumed(@NonNull final Activity activity) {
         setTopActivity(activity);
         if (mIsBackground) {
             mIsBackground = false;
@@ -163,7 +185,7 @@ public void onActivityResumed(@NotNull final Activity activity) {
     }
 
     @Override
-    public void onActivityPaused(@NotNull Activity activity) {
+    public void onActivityPaused(@NonNull Activity activity) {
         consumeActivityLifecycleCallbacks(activity, Lifecycle.Event.ON_PAUSE);
     }
 
@@ -183,12 +205,11 @@ public void onActivityStopped(Activity activity) {
     }
 
     @Override
-    public void onActivitySaveInstanceState(@NotNull Activity activity, Bundle outState) {/**/}
+    public void onActivitySaveInstanceState(@NonNull Activity activity, Bundle outState) {/**/}
 
     @Override
-    public void onActivityDestroyed(@NotNull Activity activity) {
+    public void onActivityDestroyed(@NonNull Activity activity) {
         mActivityList.remove(activity);
-        consumeOnActivityDestroyedListener(activity);
         UtilsBridge.fixSoftInputLeaks(activity);
         consumeActivityLifecycleCallbacks(activity, Lifecycle.Event.ON_DESTROY);
     }
@@ -244,49 +265,6 @@ private void setTopActivity(final Activity activity) {
         }
     }
 
-    private void consumeOnActivityDestroyedListener(Activity activity) {
-        Iterator<Map.Entry<Activity, List<Utils.OnActivityDestroyedListener>>> iterator
-                = mDestroyedListenerMap.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<Activity, List<Utils.OnActivityDestroyedListener>> entry = iterator.next();
-            if (entry.getKey() == activity) {
-                List<Utils.OnActivityDestroyedListener> value = entry.getValue();
-                for (Utils.OnActivityDestroyedListener listener : value) {
-                    listener.onActivityDestroyed(activity);
-                }
-                iterator.remove();
-            }
-        }
-    }
-
-    private void consumeActivityLifecycleCallbacks(Activity activity, Lifecycle.Event event) {
-        Iterator<Map.Entry<Activity, List<Utils.ActivityLifecycleCallbacks>>> iterator
-                = mActivityLifecycleCallbacksMap.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<Activity, List<Utils.ActivityLifecycleCallbacks>> entry = iterator.next();
-            if (entry.getKey() == activity) {
-                List<Utils.ActivityLifecycleCallbacks> value = entry.getValue();
-                for (Utils.ActivityLifecycleCallbacks listener : value) {
-                    listener.onLifecycleChanged(activity, event);
-                    if (event.equals(Lifecycle.Event.ON_CREATE)) {
-                        listener.onActivityCreated(activity);
-                    } else if (event.equals(Lifecycle.Event.ON_START)) {
-                        listener.onActivityStarted(activity);
-                    } else if (event.equals(Lifecycle.Event.ON_RESUME)) {
-                        listener.onActivityResumed(activity);
-                    } else if (event.equals(Lifecycle.Event.ON_PAUSE)) {
-                        listener.onActivityPaused(activity);
-                    } else if (event.equals(Lifecycle.Event.ON_STOP)) {
-                        listener.onActivityStopped(activity);
-                    } else if (event.equals(Lifecycle.Event.ON_DESTROY)) {
-                        listener.onActivityDestroyed(activity);
-                        iterator.remove();
-                    }
-                }
-            }
-        }
-    }
-
     private List<Activity> getActivitiesByReflect() {
         LinkedList<Activity> list = new LinkedList<>();
         Activity topActivity = null;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+* `20/04/03` [fix] UtilsActivityLifecycleImpl#HashMap#remove IllegalStateException Bug. Publish v1.27.2.
`1`	`2`	* `20/04/02` [fix] PathUtils sdcard enable state is wrong; ActivityUtils finish activity wrong; Publish v1.27.1.
`2`	`3`	* `20/03/31` [add] Publish v1.27.0.
`3`	`4`	* `20/03/30` [add] BatteryUtils in subutil.
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ class ShadowActivity : CommonActivity() {`
`39`	`39`
`40`	`40`	`override fun initView(savedInstanceState: Bundle?, contentView: View?) {`
`41`	`41`	`super.initView(savedInstanceState, contentView)`
`42`		`- ShadowUtils.apply(shadowRectView, Config().setShadowColor(Color.BLUE, Color.GREEN))`
`43`		`- ShadowUtils.apply(shadowRoundRectView, Config().setShadowRadius(`
	`42`	`+ ShadowUtils.apply(shadowRectView, Config().setShadowColor(0x700000FF, 0x7000FF00))`
	`43`	`+ ShadowUtils.apply(shadowRoundRectView, Config().setShadowColor(0x700000FF, 0x7000FF00).setShadowRadius(`
`44`	`44`	`SizeUtils.dp2px(16f).toFloat()))`
`45`		`- ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))`
	`45`	`+ ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(0x700000FF, 0x7000FF00))`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,7 @@ private static void applyMetricsFields(final Resources resources, final float ne`
`153`	`153`	`private static DisplayMetrics getMetricsFromField(final Resources resources, final Field field) {`
`154`	`154`	`try {`
`155`	`155`	`return (DisplayMetrics) field.get(resources);`
`156`		`- } catch (Exception e) {`
`157`		`- Log.e("AdaptScreenUtils", "getMetricsFromField: " + e);`
	`156`	`+ } catch (Exception ignore) {`
`158`	`157`	`return null;`
`159`	`158`	`}`
`160`	`159`	`}`