Skip to content

Commit ce548a9

Browse files
BlankjBlankj
authored
Merge pull request Blankj#786 from Blankj/1.22.10
1.22.10
2 parents 1cb90ba + 0dd56ce commit ce548a9

File tree

68 files changed

+349
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+349
-323
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* `19/01/02` [fix] LogUtils log object. Publish v1.22.10.
2+
* `19/01/01` [add] GsonUtils.
13
* `18/12/29` [add] AntiShakeUtils and VibrateUtils. Publish v1.22.9.
24
* `18/12/28` [fix] ToastUtils show behind the dialog when close notification.
35
* `18/12/27` [fix] LogUtils print StringBuilder failed.

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.10-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.10-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎config.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ext {
55
compileSdkVersion = 27
66
minSdkVersion = 14
77
targetSdkVersion = 27
8-
versionCode = 1_022_009
9-
versionName = '1.22.9'// E.g. 1.9.72 => 1,009,072
8+
versionCode = 1_022_010
9+
versionName = '1.22.10'// E.g. 1.9.72 => 1,009,072
1010

1111
bus = [
1212
isDebug: false,

‎lib/base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies {
1515
api dep.free_proguard
1616
api 'com.r0adkll:slidableactivity:2.0.5'
1717
compileOnly dep.leakcanary.android_no_op
18-
// api 'com.blankj:utilcode:1.22.9'
18+
// api 'com.blankj:utilcode:1.22.10'
1919
}

‎lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
3636
}
3737

3838
override fun onClick(view: View) {
39-
if (AntiShakeUtils.isValid(view, 200)) {
39+
if (AntiShakeUtils.isValid(view)) {
4040
onWidgetClick(view)
4141
}
4242
}

‎lib/base/src/main/java/com/blankj/lib/base/BaseFragment.kt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.util.Log
99
import android.view.LayoutInflater
1010
import android.view.View
1111
import android.view.ViewGroup
12+
import com.blankj.utilcode.util.AntiShakeUtils
1213

1314
/**
1415
* ```
@@ -29,18 +30,6 @@ abstract class BaseFragment : Fragment(), IBaseView {
2930
protected lateinit var mInflater: LayoutInflater
3031
protected lateinit var mContentView: View
3132

32-
private var lastClick: Long = 0
33-
34-
private val isFastClick: Boolean
35-
get() {
36-
val now = System.currentTimeMillis()
37-
if (now - lastClick >= 200) {
38-
lastClick = now
39-
return false
40-
}
41-
return true
42-
}
43-
4433
override fun onAttach(context: Context?) {
4534
super.onAttach(context)
4635
mActivity = context as Activity;
@@ -105,7 +94,9 @@ abstract class BaseFragment : Fragment(), IBaseView {
10594
}
10695

10796
override fun onClick(view: View) {
108-
if (!isFastClick) onWidgetClick(view)
97+
if (AntiShakeUtils.isValid(view)) {
98+
onWidgetClick(view)
99+
}
109100
}
110101

111102
fun <T : View> findViewById(@IdRes id: Int): T {

‎subutil/README-CN.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ Instance.isFlashlightOn : 判断闪光灯是否打开
5151
isFlashlightEnable : 判断设备是否支持闪光灯
5252
```
5353

54-
* ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
55-
```
56-
getGson : 获取 Gson 对象
57-
toJson : 对象转 Json 串
58-
fromJson: Json 串转对象
59-
```
60-
6154
* ### 定位相关 -> [LocationUtils.java][location.java] -> [Demo][location.demo]
6255
```
6356
isGpsEnabled : 判断 Gps 是否可用
@@ -87,7 +80,6 @@ getSurnameFirstLetter: 根据名字获取姓氏的首字母
8780

8881
[brightness.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/BrightnessUtils.java
8982
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
90-
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
9183

9284
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
9385
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
@@ -101,9 +93,6 @@ getSurnameFirstLetter: 根据名字获取姓氏的首字母
10193
[flashlight.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/FlashlightUtils.java
10294
[flashlight.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java
10395

104-
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/GsonUtils.java
105-
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
106-
10796
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
10897
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.java
10998

‎subutil/README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ Instance.isFlashlightOn
5151
isFlashlightEnable
5252
```
5353

54-
* ### About Gson -> [GsonUtils.java][gson.java] -> [Test][gson.test]
55-
```
56-
getGson
57-
toJson
58-
fromJson
59-
```
60-
6154
* ### About Location -> [LocationUtils.java][location.java] -> [Demo][location.demo]
6255
```
6356
isGpsEnabled
@@ -87,7 +80,6 @@ getSurnameFirstLetter
8780

8881
[brightness.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/BrightnessUtils.java
8982
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
90-
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
9183

9284
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
9385
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
@@ -101,9 +93,6 @@ getSurnameFirstLetter
10193
[flashlight.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/FlashlightUtils.java
10294
[flashlight.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java
10395

104-
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/GsonUtils.java
105-
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
106-
10796
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
10897
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.java
10998

‎subutil/lib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ readme {
1515
dependencies {
1616
compileOnly dep.support.appcompat_v7
1717
compileOnly dep.support.design
18-
api dep.gson
1918
api(dep.glide) {
2019
exclude group: "com.android.support"
2120
}

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/SubUtilActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6+
import android.support.annotation.NonNull;
67
import android.support.annotation.Nullable;
78
import android.view.View;
89

@@ -41,7 +42,7 @@ public int bindLayout() {
4142
}
4243

4344
@Override
44-
public void initView(Bundle savedInstanceState, View contentView) {
45+
public void initView(Bundle savedInstanceState, @NonNull View contentView) {
4546
setTitle(R.string.sub_util);
4647
}
4748

@@ -51,7 +52,7 @@ public void doBusiness() {
5152
}
5253

5354
@Override
54-
public void onWidgetClick(View view) {
55+
public void onWidgetClick(@NonNull View view) {
5556

5657
}
5758

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Build;
77
import android.os.Bundle;
88
import android.provider.Settings;
9+
import android.support.annotation.NonNull;
910
import android.support.annotation.Nullable;
1011
import android.view.View;
1112
import android.widget.CompoundButton;
@@ -89,7 +90,7 @@ public int bindLayout() {
8990
}
9091

9192
@Override
92-
public void initView(Bundle savedInstanceState, View contentView) {
93+
public void initView(Bundle savedInstanceState, @NonNull View contentView) {
9394
tvBrightness = findViewById(R.id.tv_brightness);
9495
sbBrightness = findViewById(R.id.sb_brightness);
9596
tvWindowBrightness = findViewById(R.id.tv_window_brightness);
@@ -135,7 +136,7 @@ public void doBusiness() {
135136
}
136137

137138
@Override
138-
public void onWidgetClick(View view) {
139+
public void onWidgetClick(@NonNull View view) {
139140

140141
}
141142

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6+
import android.support.annotation.NonNull;
67
import android.support.annotation.Nullable;
78
import android.view.View;
89
import android.widget.TextView;
@@ -41,7 +42,7 @@ public int bindLayout() {
4142
}
4243

4344
@Override
44-
public void initView(Bundle savedInstanceState, View contentView) {
45+
public void initView(Bundle savedInstanceState, @NonNull View contentView) {
4546
tvAboutFlashlight = findViewById(R.id.tv_about_flashlight);
4647
findViewById(R.id.btn_set_flashlight_on).setOnClickListener(this);
4748
findViewById(R.id.btn_set_flashlight_off).setOnClickListener(this);
@@ -56,7 +57,7 @@ public void doBusiness() {
5657
}
5758

5859
@Override
59-
public void onWidgetClick(View view) {
60+
public void onWidgetClick(@NonNull View view) {
6061
if (!FlashlightUtils.isFlashlightEnable()) return;
6162
int i = view.getId();
6263
if (i == R.id.btn_set_flashlight_on) {

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.content.ServiceConnection;
77
import android.os.Bundle;
88
import android.os.IBinder;
9+
import android.support.annotation.NonNull;
910
import android.support.annotation.Nullable;
1011
import android.view.View;
1112
import android.widget.TextView;
@@ -43,7 +44,7 @@ public int bindLayout() {
4344
}
4445

4546
@Override
46-
public void initView(Bundle savedInstanceState, View contentView) {
47+
public void initView(Bundle savedInstanceState, @NonNull View contentView) {
4748
setTitle(R.string.demo_location);
4849

4950
tvAboutLocation = findViewById(R.id.tv_about_location);
@@ -65,7 +66,7 @@ public void doBusiness() {
6566
}
6667

6768
@Override
68-
public void onWidgetClick(View view) {
69+
public void onWidgetClick(@NonNull View view) {
6970

7071
}
7172

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6+
import android.support.annotation.NonNull;
67
import android.support.annotation.Nullable;
78
import android.view.View;
89
import android.widget.TextView;
@@ -37,7 +38,7 @@ public int bindLayout() {
3738
}
3839

3940
@Override
40-
public void initView(Bundle savedInstanceState, View contentView) {
41+
public void initView(Bundle savedInstanceState, @NonNull View contentView) {
4142
setTitle(R.string.demo_pinyin);
4243

4344
TextView tvAboutPinyin = findViewById(R.id.tv_about_pinyin);
@@ -69,7 +70,7 @@ public void doBusiness() {
6970
}
7071

7172
@Override
72-
public void onWidgetClick(View view) {
73+
public void onWidgetClick(@NonNull View view) {
7374

7475
}
7576
}

‎utilcode/README-CN.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.22.9'
5+
implementation 'com.blankj:utilcode:1.22.10'
66
```
77

88

@@ -324,6 +324,13 @@ setBackgroundResource : 设置背景资源
324324
setBackground : 设置背景
325325
```
326326

327+
* ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
328+
```
329+
getGson : 获取 Gson 对象
330+
toJson : 对象转 Json 串
331+
fromJson: Json 串转对象
332+
```
333+
327334
* ### 图片相关 -> [ImageUtils.java][image.java] -> [Demo][image.demo]
328335
```
329336
bitmap2Bytes, bytes2Bitmap : bitmap 与 bytes 互转
@@ -879,6 +886,9 @@ getComments : 获取压缩文件中的注释链表
879886
[fragment.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
880887
[fragment.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.java
881888

889+
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/GsonUtils.java
890+
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/GsonUtilsTest.java
891+
882892
[image.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
883893
[image.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.java
884894

‎utilcode/README-STATIC-BUS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
2727
给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
2828

2929
```groovy
30-
api "com.blankj:utilcode:1.22.9"
30+
api "com.blankj:utilcode:1.22.10"
3131
```
3232

3333
比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

‎utilcode/README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.22.9'
5+
implementation 'com.blankj:utilcode:1.22.10'
66
```
77

88

@@ -324,6 +324,13 @@ setBackgroundResource
324324
setBackground
325325
```
326326

327+
* ### About Gson -> [GsonUtils.java][gson.java] -> [Test][gson.test]
328+
```
329+
getGson
330+
toJson
331+
fromJson
332+
```
333+
327334
* ### About Image -> [ImageUtils.java][image.java] -> [Demo][image.demo]
328335
```
329336
bitmap2Bytes, bytes2Bitmap
@@ -879,6 +886,9 @@ getComments
879886
[fragment.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
880887
[fragment.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.java
881888

889+
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/GsonUtils.java
890+
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/GsonUtilsTest.java
891+
882892
[image.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
883893
[image.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.java
884894

‎utilcode/lib/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ readme {
1515
apply from: "${rootDir.path}/gradle/bintrayUploadAndroid.gradle"
1616

1717
dependencies {
18+
api dep.gson
19+
1820
compileOnly dep.support.appcompat_v7
1921
compileOnly dep.support.design
2022

‎subutil/lib/src/main/java/com/blankj/subutil/util/GsonUtils.java renamed to ‎utilcode/lib/src/main/java/com/blankj/utilcode/util/GsonUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.subutil.util;
1+
package com.blankj.utilcode.util;
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;

0 commit comments

Comments
 (0)