Skip to content

Commit 377f063

Browse files
committed
see 04/07 log
1 parent f15de03 commit 377f063

File tree

10 files changed

+46
-15
lines changed

10 files changed

+46
-15
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ dependencies {
5050
implementation fileTree(include: ['*.jar'], dir: 'libs')
5151
implementation project(':utilcode')
5252
implementation project(':subutil')
53+
5354
implementation "com.android.support:appcompat-v7:$support_version"
5455
implementation "com.android.support:design:$support_version"
5556
implementation 'com.r0adkll:slidableactivity:2.0.5'

app/proguard-rules.pro

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,13 @@
1717
#}
1818
-keep class com.blankj.utilcode.** { *; }
1919
-keepclassmembers class com.blankj.utilcode.** { *; }
20-
-dontwarn com.blankj.utilcode.**
20+
-dontwarn com.blankj.utilcode.**
21+
22+
# Gson
23+
-keepattributes Signature
24+
-keepattributes *Annotation*
25+
-keep class sun.misc.Unsafe { *; }
26+
-keep class com.google.gson.stream.** { *; }
27+
# 使用Gson时需要配置Gson的解析对象及变量都不混淆。不然Gson会找不到变量。
28+
# 将下面替换成自己的实体类
29+
#-keep class com.example.bean.** { *; }

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ext {
3737
version_name = '1.13.7'// E.g 1.9.72 => 1,009,072
3838

3939
// App dependencies
40-
support_version = '27.0.2'
40+
support_version = '27.1.0'
4141

4242
leakcanary_version = '1.5.4'
4343
gson_version = '2.8.2'

subutil/README-CN.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ copyIntent: 复制意图到剪贴板
2525
getIntent : 获取剪贴板的意图
2626
```
2727

28+
* ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
29+
```
30+
getGson : 获取 Gson 对象
31+
toJson : 对象转 Json 串
32+
fromJson: Json 串转对象
33+
```
34+
2835
* ### 定位相关 -> [LocationUtils.java][location.java] -> [Demo][location.demo]
2936
```
3037
isGpsEnabled : 判断 Gps 是否可用
@@ -77,6 +84,9 @@ scheduleWithFixedDelay: 延迟并以固定休息时间循环执行命令
7784
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
7885
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
7986

87+
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/GsonUtils.java
88+
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
89+
8090
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
8191
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/sub/location/LocationActivity.java
8292

subutil/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ copyIntent
2525
getIntent
2626
```
2727

28+
* ### About Gson -> [GsonUtils.java][gson.java] -> [Test][gson.test]
29+
```
30+
getGson
31+
toJson
32+
fromJson
33+
```
34+
2835
* ### About Location -> [LocationUtils.java][location.java] -> [Demo][location.demo]
2936
```
3037
isGpsEnabled
@@ -77,6 +84,9 @@ scheduleWithFixedDelay
7784
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
7885
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
7986

87+
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/GsonUtils.java
88+
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
89+
8090
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
8191
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/sub/location/LocationActivity.java
8292

subutil/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ android {
3535
dependencies {
3636
compileOnly "com.android.support:appcompat-v7:$support_version"
3737
compileOnly "com.android.support:design:$support_version"
38-
compileOnly "com.google.code.gson:gson:$gson_version"
3938

40-
testImplementation "com.google.code.gson:gson:$gson_version"
4139
testImplementation "junit:junit:$junit_version"
4240
testImplementation "org.robolectric:robolectric:$robolectric_version"
41+
42+
implementation "com.google.code.gson:gson:$gson_version"
4343
}

subutil/src/main/java/com/blankj/subutil/util/BitUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* author: Blankj
88
* blog : http://blankj.com
99
* time : 2018/03/21
10-
* desc :
10+
* desc : 位运算工具类
1111
* </pre>
1212
*/
13-
public class BitUtils {
13+
public final class BitUtils {
1414

1515
private BitUtils() {
1616
throw new UnsupportedOperationException("u can't instantiate me...");

subutil/src/main/java/com/blankj/subutil/util/BrightnessUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* desc : 亮度相关工具类
1919
* </pre>
2020
*/
21-
public class BrightnessUtils {
21+
public final class BrightnessUtils {
2222

2323
private BrightnessUtils() {
2424
throw new UnsupportedOperationException("u can't instantiate me...");

subutil/src/main/java/com/blankj/subutil/util/CoordinateConvertUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* author: Blankj
88
* blog : http://blankj.com
99
* time : 2018/03/21
10-
* desc :
10+
* desc : 坐标转换工具类
1111
* </pre>
1212
*/
13-
public class CoordinateConvertUtils {
13+
public final class CoordinateConvertUtils {
1414

1515
private final static double X_PI = 3.14159265358979324 * 3000.0 / 180.0;
1616
private final static double A = 6378245.0;

update_log.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/04/06 新增 GsonUtils 及单元测试
12
* 18/04/05 完善 README 文档
23
* 18/04/03 修复 LogUtils 在 Android Studio 3.1 版本日志丑陋的问题,发布 1.13.7 版本
34
* 18/03/29 兼容 Utils 的初始化传入 application,发布 1.13.6 版本
@@ -28,12 +29,12 @@
2829
* 18/01/31 修复 default 相关的逻辑错误,发布 1.12.4,修复 ToastUtils 在 kotlin 中转义失败,发布 1.12.5
2930
* 18/01/28 修复 ToastUtils 默认样式问题,发布 1.12.2,新增 DeviceUtils#getSDKVersionName,发布 1.12.3
3031
* 18/01/27 修复 PermissionUtils 某些机型闪烁问题,发布 1.12.1
31-
* 18/01/17 完善 ReflectUtils 及 单元测试,发布 1.12.0 版本
32-
* 18/01/16 完善 ReflectUtils 及 单元测试
33-
* 18/01/15 完善 ReflectUtils 及 单元测试
34-
* 18/01/14 完善 ReflectUtils 及 单元测试
35-
* 18/01/13 完善 ReflectUtils 及 单元测试
36-
* 18/01/12 完善 ReflectUtils 及 单元测试
32+
* 18/01/17 完善 ReflectUtils 及单元测试,发布 1.12.0 版本
33+
* 18/01/16 完善 ReflectUtils 及单元测试
34+
* 18/01/15 完善 ReflectUtils 及单元测试
35+
* 18/01/14 完善 ReflectUtils 及单元测试
36+
* 18/01/13 完善 ReflectUtils 及单元测试
37+
* 18/01/12 完善 ReflectUtils 及单元测试
3738
* 18/01/11 修复 ImageUtils 的 fastBlur radius 为 1 recycle 的 bug,新增 CrashUtils 初始化崩溃监听事件,发布 1.11.1 版本
3839
* 18/01/10 完善 PermissionUtils 及 readme,发布 1.11.0 版本
3940
* 18/01/09 完善 demo 动态权限适配

0 commit comments

Comments
 (0)