Skip to content

Commit 09989db

Browse files
BlankjBlankj
committed
see 06/14 log
1 parent 2e8fd52 commit 09989db

24 files changed

+3643
-860
lines changed

‎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.16.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.17.0-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.16.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.17.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.blankj.androidutilcode.base;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Activity;
45
import android.os.Bundle;
56
import android.support.annotation.LayoutRes;
@@ -37,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
3738
doBusiness();
3839
}
3940

41+
@SuppressLint("ResourceType")
4042
protected void setBaseView(@LayoutRes int layoutId) {
4143
if (layoutId <= 0) return;
4244
setContentView(mContentView = LayoutInflater.from(this).inflate(layoutId, null));

‎app/src/main/java/com/blankj/androidutilcode/feature/core/fragment/FragmentActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public void onWidgetClick(View view) {
7878

7979
// @Override
8080
// public void onBackPressed() {
81-
//// if (!FragmentUtils.dispatchBackPress(getSupportFragmentManager())) {
82-
//// super.onBackPressed();
83-
//// }
81+
// if (!FragmentUtils.dispatchBackPress(getSupportFragmentManager())) {
82+
// super.onBackPressed();
83+
// }
8484
// }
8585

8686
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener

‎app/src/main/res_core/layout/activity_keyboard.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
android:layout_width="match_parent"
5-
android:layout_height="wrap_content"
4+
android:layout_height="match_parent"
65
android:gravity="center_horizontal"
76
android:orientation="vertical"
87
android:padding="@dimen/spacing_16">
@@ -13,12 +12,6 @@
1312
android:layout_width="match_parent"
1413
android:layout_height="wrap_content" />
1514

16-
<EditText
17-
android:id="@+id/et_input"
18-
android:layout_width="match_parent"
19-
android:layout_height="wrap_content"
20-
android:inputType="text" />
21-
2215
<Button
2316
android:id="@+id/btn_hide_soft_input"
2417
style="@style/WideBtnStyle"
@@ -47,4 +40,11 @@
4740
android:layout_height="wrap_content"
4841
android:text="@string/keyboard_show_dialog" />
4942

43+
<EditText
44+
android:id="@+id/et_input"
45+
android:layout_width="match_parent"
46+
android:layout_height="match_parent"
47+
android:layout_gravity="bottom"
48+
android:inputType="text" />
49+
5050
</LinearLayout>

‎build.gradle

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3+
4+
ext{
5+
// Sdk and tools
6+
compile_sdk_version = 27
7+
min_sdk_version = 14
8+
target_sdk_version = 27
9+
10+
version_code = 1_017_000
11+
version_name = '1.17.0'// E.g 1.9.72 => 1,009,072
12+
13+
// App dependencies
14+
support_version = '27.1.0'
15+
16+
leakcanary_version = '1.5.4'
17+
gson_version = '2.8.2'
18+
glide_version = '4.7.1'
19+
20+
junit_version = '4.12'
21+
robolectric_version = '3.1.2'
22+
}
23+
324
repositories {
425
google()
526
jcenter()
@@ -36,24 +57,4 @@ allprojects {
3657

3758
task clean(type: Delete) {
3859
delete rootProject.buildDir
39-
}
40-
41-
ext {
42-
// Sdk and tools
43-
compile_sdk_version = 27
44-
min_sdk_version = 14
45-
target_sdk_version = 27
46-
47-
version_code = 1_016_004
48-
version_name = '1.16.4'// E.g 1.9.72 => 1,009,072
49-
50-
// App dependencies
51-
support_version = '27.1.0'
52-
53-
leakcanary_version = '1.5.4'
54-
gson_version = '2.8.2'
55-
glide_version = '4.7.1'
56-
57-
junit_version = '4.12'
58-
robolectric_version = '3.1.2'
5960
}

‎update_log.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* 18/06/14 替换 CacheUtils 为 CacheDiskUtils，CacheUtils 标记 deprecated，发布 1.17.0 版本
2+
* 18/06/13 新增 CacheMemoryUtils 和 CacheDoubleUtils
3+
* 18/06/12 完善 FragmentUtils#add 和 replace 新增 tag
14
* 18/05/30 完善 DeviceUtils#getMacAddress，发布 1.16.4 版本
25
* 18/05/30 修复 ToastUtils 在 targetSdkVersion 为 27 在 api 25 机器快速 show 两次崩溃的异常，发布 1.16.3 版本
36
* 18/05/29 完善 TimeUtils 的 timeSpan 带符号位，ToastUtils 去除弱引用，发布 1.16.2 版本

‎utilcode/README-CN.md

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88

@@ -90,7 +90,54 @@ getNavBarColor : 获取导航栏颜色
9090
isNavBarVisible : 判断导航栏是否可见
9191
```
9292

93-
* ### 缓存相关 -> [CacheUtils.java][cache.java] -> [Test][cache.test]
93+
* ### 磁盘缓存相关 -> [CacheDiskUtils.java][cache_disk.java] -> [Test][cache_disk.test]
94+
```
95+
getInstance : 获取缓存实例
96+
Instance.put : 缓存中写入数据
97+
Instance.getBytes : 缓存中读取字节数组
98+
Instance.getString : 缓存中读取 String
99+
Instance.getJSONObject : 缓存中读取 JSONObject
100+
Instance.getJSONArray : 缓存中读取 JSONArray
101+
Instance.getBitmap : 缓存中读取 Bitmap
102+
Instance.getDrawable : 缓存中读取 Drawable
103+
Instance.getParcelable : 缓存中读取 Parcelable
104+
Instance.getSerializable: 缓存中读取 Serializable
105+
Instance.getCacheSize : 获取缓存大小
106+
Instance.getCacheCount : 获取缓存个数
107+
Instance.remove : 根据键值移除缓存
108+
Instance.clear : 清除所有缓存
109+
```
110+
111+
* ### 二级缓存相关 -> [CacheDoubleUtils.java][cache_double.java] -> [Test][cache_double.test]
112+
```
113+
getInstance : 获取缓存实例
114+
Instance.put : 缓存中写入数据
115+
Instance.getBytes : 缓存中读取字节数组
116+
Instance.getString : 缓存中读取 String
117+
Instance.getJSONObject : 缓存中读取 JSONObject
118+
Instance.getJSONArray : 缓存中读取 JSONArray
119+
Instance.getBitmap : 缓存中读取 Bitmap
120+
Instance.getDrawable : 缓存中读取 Drawable
121+
Instance.getParcelable : 缓存中读取 Parcelable
122+
Instance.getSerializable : 缓存中读取 Serializable
123+
Instance.getCacheDiskSize : 获取磁盘缓存大小
124+
Instance.getCacheDiskCount : 获取磁盘缓存个数
125+
Instance.getCacheMemoryCount: 获取内存缓存个数
126+
Instance.remove : 根据键值移除缓存
127+
Instance.clear : 清除所有缓存
128+
```
129+
130+
* ### 内存缓存相关 -> [CacheMemoryUtils.java][cache_memory.java] -> [Test][cache_memory.test]
131+
```
132+
getInstance : 获取缓存实例
133+
Instance.put : 缓存中写入数据
134+
Instance.get : 缓存中读取字节数组
135+
Instance.getCacheCount: 获取缓存个数
136+
Instance.remove : 根据键值移除缓存
137+
Instance.clear : 清除所有缓存
138+
```
139+
140+
* ### ~~缓存相关 -> [CacheUtils.java][cache.java]~~
94141
```
95142
getInstance : 获取缓存实例
96143
Instance.put : 缓存中写入数据
@@ -721,8 +768,16 @@ getComments : 获取压缩文件中的注释链表
721768
[bar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
722769
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/bar/BarActivity.java
723770

771+
[cache_disk.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
772+
[cache_disk.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheDiskUtilsTest.java
773+
774+
[cache_double.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
775+
[cache_double.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheDoubleUtilsTest.java
776+
777+
[cache_memory.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
778+
[cache_memory.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheMemoryUtilsTest.java
779+
724780
[cache.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java
725-
[cache.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheUtilsTest.java
726781

727782
[clean.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
728783
[clean.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/clean/CleanActivity.java

‎utilcode/README.md

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88

@@ -90,7 +90,54 @@ getNavBarColor
9090
isNavBarVisible
9191
```
9292

93-
* ### About Cache -> [CacheUtils.java][cache.java] -> [Test][cache.test]
93+
* ### About CacheDisk -> [CacheDiskUtils.java][cache_disk.java] -> [Test][cache_disk.test]
94+
```
95+
getInstance
96+
Instance.put
97+
Instance.getBytes
98+
Instance.getString
99+
Instance.getJSONObject
100+
Instance.getJSONArray
101+
Instance.getBitmap
102+
Instance.getDrawable
103+
Instance.getParcelable
104+
Instance.getSerializable
105+
Instance.getCacheSize
106+
Instance.getCacheCount
107+
Instance.remove
108+
Instance.clear
109+
```
110+
111+
* ### About CacheDouble -> [CacheDoubleUtils.java][cache_double.java] -> [Test][cache_double.test]
112+
```
113+
getInstance
114+
Instance.put
115+
Instance.getBytes
116+
Instance.getString
117+
Instance.getJSONObject
118+
Instance.getJSONArray
119+
Instance.getBitmap
120+
Instance.getDrawable
121+
Instance.getParcelable
122+
Instance.getSerializable
123+
Instance.getCacheDiskSize
124+
Instance.getCacheDiskCount
125+
Instance.getCacheMemoryCount
126+
Instance.remove
127+
Instance.clear
128+
```
129+
130+
* ### About CacheMemory -> [CacheMemoryUtils.java][cache_memory.java] -> [Test][cache_memory.test]
131+
```
132+
getInstance
133+
Instance.put
134+
Instance.get
135+
Instance.getCacheCount
136+
Instance.remove
137+
Instance.clear
138+
```
139+
140+
* ### About Cache -> [CacheUtils.java][cache.java]~~
94141
```
95142
getInstance
96143
Instance.put
@@ -721,8 +768,16 @@ getComments
721768
[bar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
722769
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/bar/BarActivity.java
723770

771+
[cache_disk.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
772+
[cache_disk.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheDiskUtilsTest.java
773+
774+
[cache_double.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
775+
[cache_double.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheDoubleUtilsTest.java
776+
777+
[cache_memory.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
778+
[cache_memory.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheMemoryUtilsTest.java
779+
724780
[cache.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java
725-
[cache.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheUtilsTest.java
726781

727782
[clean.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
728783
[clean.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/clean/CleanActivity.java

‎utilcode/src/main/java/com/blankj/utilcode/constant/CacheConstants.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.blankj.utilcode.constant;
2+
3+
/**
4+
* <pre>
5+
* author: Blankj
6+
* blog : http://blankj.com
7+
* time : 2018/06/13
8+
* desc : constants of cache
9+
* </pre>
10+
*/
11+
public interface CacheConstants {
12+
int SEC = 1;
13+
int MIN = 60;
14+
int HOUR = 3600;
15+
int DAY = 86400;
16+
}

‎utilcode/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* author: Blankj
1111
* blog : http://blankj.com
1212
* time : 2017/03/13
13-
* desc : The constants of memory.
13+
* desc : constants of memory
1414
* </pre>
1515
*/
1616
public final class MemoryConstants {

‎utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* author: Blankj
1515
* blog : http://blankj.com
1616
* time : 2017/12/29
17-
* desc : The constants of permission.
17+
* desc : constants of permission
1818
* </pre>
1919
*/
2020
@SuppressLint("InlinedApi")

‎utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* author: Blankj
66
* blog : http://blankj.com
77
* time : 2017/03/13
8-
* desc : The constants of regex.
8+
* desc : constants of regex
99
* </pre>
1010
*/
1111
public final class RegexConstants {

‎utilcode/src/main/java/com/blankj/utilcode/constant/TimeConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* author: Blankj
1111
* blog : http://blankj.com
1212
* time : 2017/03/13
13-
* desc : The constants of time.
13+
* desc : constants of time
1414
* </pre>
1515
*/
1616
public final class TimeConstants {

0 commit comments

Comments
 (0)