Skip to content

Commit 937ef99

Browse files
BlankjBlankj
committed
see 04/03 log
1 parent 4eee99f commit 937ef99

12 files changed

Lines changed: 83 additions & 95 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `20/04/03` [fix] UtilsActivityLifecycleImpl#HashMap#remove IllegalStateException Bug. Publish v1.27.2.
12
* `20/04/02` [fix] PathUtils sdcard enable state is wrong; ActivityUtils finish activity wrong; Publish v1.27.1.
23
* `20/03/31` [add] Publish v1.27.0.
34
* `20/03/30` [add] BatteryUtils in subutil.

‎buildSrc/src/main/groovy/Config.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Config {
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
1717
static versionCode = 1_026_001
18-
static versionName = '1.27.1'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.27.2'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/click/ClickActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ClickActivity : CommonActivity() {
4444
ClickUtils.applyPressedViewAlpha(it)
4545
}),
4646
ClickItem(R.string.click_bg_alpha_default, Utils.Consumer {
47-
ClickUtils.applyPressedBgAlpha(it)
47+
ClickUtils.applyPressedBgAlpha(it, 0.6f)
4848
}),
4949
ClickItem(R.string.click_bg_dark_default, Utils.Consumer {
5050
ClickUtils.applyPressedBgDark(it)

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/shadow/ShadowActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class ShadowActivity : CommonActivity() {
3939

4040
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
4141
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(
4444
SizeUtils.dp2px(16f).toFloat()))
45-
ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))
45+
ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(0x700000FF, 0x7000FF00))
4646
}
4747
}

‎lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* desc : utils about app store
2222
* </pre>
2323
*/
24-
public class AppStoreUtils {
24+
public final class AppStoreUtils {
2525

2626
private static final String TAG = "AppStoreUtils";
2727

‎lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import com.blankj.utilcode.util.ThreadUtils;
1212
import com.blankj.utilcode.util.Utils;
1313

14-
import org.jetbrains.annotations.NotNull;
15-
1614
import java.lang.annotation.Retention;
1715
import java.lang.annotation.RetentionPolicy;
1816
import java.util.HashSet;
@@ -26,7 +24,7 @@
2624
* desc :
2725
* </pre>
2826
*/
29-
public class BatteryUtils {
27+
public final class BatteryUtils {
3028

3129
@IntDef({BatteryStatus.UNKNOWN, BatteryStatus.DISCHARGING, BatteryStatus.CHARGING,
3230
BatteryStatus.NOT_CHARGING, BatteryStatus.FULL})
@@ -137,7 +135,7 @@ public interface OnBatteryStatusChangedListener {
137135
void onBatteryStatusChanged(Status status);
138136
}
139137

140-
public static class Status {
138+
public static final class Status {
141139
private int level;
142140
@BatteryStatus
143141
private int status;
@@ -164,7 +162,6 @@ public void setStatus(int status) {
164162
this.status = status;
165163
}
166164

167-
@NotNull
168165
@Override
169166
public String toString() {
170167
return batteryStatus2String(status) + ": " + level + "%";

‎lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,37 @@ public static Activity getActivityByContext(Context context) {
8383
}
8484

8585
private static Activity getActivityByContextInner(Context context) {
86-
if (context instanceof Activity) return (Activity) context;
87-
if (context != null && context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
88-
try {
89-
Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
90-
mActivityContextField.setAccessible(true);
91-
//noinspection unchecked
92-
return ((WeakReference<Activity>) mActivityContextField.get(context)).get();
93-
} catch (Exception e) {
94-
e.printStackTrace();
95-
}
96-
}
86+
if (context == null) return null;
87+
List<Context> list = new ArrayList<>();
9788
while (context instanceof ContextWrapper) {
9889
if (context instanceof Activity) {
9990
return (Activity) context;
10091
}
92+
Activity activity = getActivityFromDecorContext(context);
93+
if (activity != null) return activity;
94+
list.add(context);
10195
context = ((ContextWrapper) context).getBaseContext();
96+
if (context == null) {
97+
return null;
98+
}
99+
if (list.contains(context)) {
100+
// loop context
101+
return null;
102+
}
103+
}
104+
return null;
105+
}
106+
107+
private static Activity getActivityFromDecorContext(Context context) {
108+
if (context == null) return null;
109+
if (context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
110+
try {
111+
Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
112+
mActivityContextField.setAccessible(true);
113+
//noinspection ConstantConditions,unchecked
114+
return ((WeakReference<Activity>) mActivityContextField.get(context)).get();
115+
} catch (Exception ignore) {
116+
}
102117
}
103118
return null;
104119
}

‎lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ private static void applyMetricsFields(final Resources resources, final float ne
153153
private static DisplayMetrics getMetricsFromField(final Resources resources, final Field field) {
154154
try {
155155
return (DisplayMetrics) field.get(resources);
156-
} catch (Exception e) {
157-
Log.e("AdaptScreenUtils", "getMetricsFromField: " + e);
156+
} catch (Exception ignore) {
158157
return null;
159158
}
160159
}

‎lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,23 +213,23 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
213213
}
214214

215215
private static Drawable createAlphaDrawable(Drawable drawable, float alpha) {
216-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
216+
// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
217217
DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
218218
drawableWrapper.setAlphaFix((int) (alpha * 255));
219219
return drawableWrapper;
220-
}
221-
drawable.setAlpha((int) (alpha * 255));
222-
return drawable;
220+
// }
221+
// drawable.setAlpha((int) (alpha * 255));
222+
// return drawable;
223223
}
224224

225225
private static Drawable createDarkDrawable(Drawable drawable, float alpha) {
226-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
226+
// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
227227
DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
228228
drawableWrapper.setColorFilterFix(getDarkColorFilter(alpha));
229229
return drawableWrapper;
230-
}
231-
drawable.setColorFilter(getDarkColorFilter(alpha));
232-
return drawable;
230+
// }
231+
// drawable.setColorFilter(getDarkColorFilter(alpha));
232+
// return drawable;
233233
}
234234

235235
private static ColorMatrixColorFilter getDarkColorFilter(float darkAlpha) {

‎lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import android.os.Build;
55
import android.support.annotation.NonNull;
66

7-
import org.jetbrains.annotations.NotNull;
8-
97
import java.io.File;
108
import java.lang.Thread.UncaughtExceptionHandler;
119
import java.text.SimpleDateFormat;
@@ -92,7 +90,7 @@ private static UncaughtExceptionHandler getUncaughtExceptionHandler(final String
9290
final OnCrashListener onCrashListener) {
9391
return new UncaughtExceptionHandler() {
9492
@Override
95-
public void uncaughtException(@NotNull final Thread t, @NotNull final Throwable e) {
93+
public void uncaughtException(@NonNull final Thread t, @NonNull final Throwable e) {
9694
final String time = new SimpleDateFormat("MM-dd_HH-mm-ss").format(new Date());
9795
final StringBuilder sb = new StringBuilder();
9896
final String head = "************* Log Head ****************" +

0 commit comments

Comments
 (0)