Skip to content

Commit 1774906

Browse files
author
Blankj
committed
see 08/15 log
1 parent a3872eb commit 1774906

File tree

23 files changed

+4369
-18883
lines changed

23 files changed

+4369
-18883
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* `19/08/13` [add] MapUtils and MapUtilsTest.
2+
* `19/08/12` [add] CollectionUtils and CollectionUtilsTest.
3+
* `19/08/11` [add] ArrayUtils and ArrayUtilsTest.
14
* `19/08/09` [fix] https://www.virustotal.com/gui/home/upload with ESET-NOD32. Publish v1.25.7.
25
* `19/08/08` [add] BusUtils#post tag support one-to-many. Publish v1.25.6.
36
* `19/08/04` [add] ThreadUtils#Task support timeout.

‎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 = 28
1717
static versionCode = 1_025_007
18-
static versionName = '1.25.7'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.25.7-alpha1'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'

‎buildSrc/src/main/groovy/ConfigUtils.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.apache.commons.io.FileUtils
2+
import org.apache.groovy.json.internal.ArrayUtils
23
import org.gradle.BuildListener
34
import org.gradle.BuildResult
45
import org.gradle.api.Project
@@ -9,6 +10,7 @@ import org.gradle.api.execution.TaskExecutionListener
910
import org.gradle.api.initialization.Settings
1011
import org.gradle.api.invocation.Gradle
1112
import org.gradle.api.tasks.TaskState
13+
import org.gradle.internal.impldep.org.apache.commons.collections.MapUtils
1214

1315
import java.text.SimpleDateFormat
1416

‎feature/launcher/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<activity
1313
android:name="com.blankj.main.pkg.MainActivity"
1414
android:configChanges="orientation|keyboardHidden|screenSize"
15+
android:launchMode="singleTask"
1516
android:screenOrientation="user"
1617
android:windowSoftInputMode="stateHidden">
1718
<intent-filter>

‎feature/main/pkg/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.blankj.main.pkg">
2+
package="com.blankj.main.pkg">
33

44
<application>
55
<activity
66
android:name=".MainActivity"
77
android:configChanges="orientation|keyboardHidden|screenSize"
8+
android:launchMode="singleTask"
89
android:screenOrientation="user"
910
android:windowSoftInputMode="stateHidden" />
1011
</application>

‎lib/base/src/main/java/com/blankj/base/rv/BaseItemAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public BaseItemAdapter() {
2525
this(false);
2626
}
2727

28-
public BaseItemAdapter( boolean hasStableIds) {
28+
public BaseItemAdapter(boolean hasStableIds) {
2929
setHasStableIds(hasStableIds);
3030
}
3131

‎lib/utilcode/README-CN.md‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,43 @@ getAppsInfo : 获取所有已安装 App 信息
7878
getApkInfo : 获取 Apk 信息
7979
```
8080

81+
* ### 数组相关 -> [ArrayUtils.java][array.java] -> [Test][array.test]
82+
```
83+
newArray : 新建数组
84+
newLongArray : 新建长整型数组
85+
newIntArray : 新建整型数组
86+
newShortArray : 新建 short 数组
87+
newCharArray : 新建字符数组
88+
newByteArray : 新建字节数组
89+
newDoubleArray : 新建双精度数组
90+
newFloatArray : 新建浮点数数组
91+
newBooleanArray : 新建 boolean 数组
92+
isEmpty : 判断数组是否为空
93+
getLength : 获取数组长度
94+
isSameLength : 判断两数组长度是否相等
95+
get : 获取数组的索引值
96+
set : 设置数组的索引值
97+
equals : 判断数组是否相等
98+
reverse : 逆序数组
99+
copy : 拷贝数组
100+
subArray : 截取数组
101+
add : 增加数组
102+
remove : 移除指定的索引
103+
removeElement : 移除指定的元素
104+
indexOf : 查找第一个元素的索引
105+
lastIndexOf : 查找最后一个元素的索引
106+
contains : 判断是否包含该元素
107+
toPrimitive : 装箱数组转基本类型数组
108+
toObject : 基本类型数组转装箱数组
109+
asList : 转为链表
110+
asUnmodifiableList: 转为不可变链表
111+
asArrayList : 转为数组链表
112+
asLinkedList : 转为双向链表
113+
sort : 排序
114+
forAllDo : 对所有元素做操作
115+
toString : 数组转为字符串
116+
```
117+
81118
* ### 栏相关 -> [BarUtils.java][bar.java] -> [Demo][bar.demo]
82119
```
83120
getStatusBarHeight : 获取状态栏高度（px）
@@ -243,6 +280,46 @@ closeIO : 关闭 IO
243280
closeIOQuietly: 安静关闭 IO
244281
```
245282

283+
* ### 集合相关 -> [CollectionUtils.java][collection.java] -> [Test][collection.test]
284+
```
285+
newUnmodifiableList[NotNull]: 新建只读[非空]链表
286+
newArrayList[NotNull] : 新建数组型[非空]链表
287+
newLinkedList[NotNull] : 新建指针型[非空]链表
288+
newHashSet[NotNull] : 新建哈希[非空]集合
289+
newTreeSet[NotNull] : 新建有序[非空]集合
290+
newSynchronizedCollection : 新建同步集合
291+
newUnmodifiableCollection : 新建只读集合
292+
union : 获取并集
293+
intersection : 获取交集
294+
disjunction : 获取并集减交集
295+
subtract : 获取差集
296+
containsAny : 判断是否有交集
297+
getCardinalityMap : 获取集合中所有元素的基数
298+
isSubCollection : 是否子集
299+
isProperSubCollection : 是否真子集
300+
isEqualCollection : 判断集合是否相等
301+
cardinality : 获取集合中元素的基数
302+
find : 查找第一个符合条件的元素
303+
forAllDo : 对所有元素做操作
304+
filter : 删除原集合中不符合条件的元素
305+
select : 查找出所有符合条件的元素并返回新集合
306+
selectRejected : 查找出所有不符合条件的元素并返回新集合
307+
transform : 对原集合进行转变
308+
collect : 转变为新的集合
309+
countMatches : 查找到匹配的元素个数
310+
exists : 判断集合是否存在符合条件的元素
311+
addIgnoreNull : 新增元素如果不为空
312+
addAll : 新增多个元素
313+
get : 获取集合元素
314+
size : 获取集合个数
315+
sizeIsEmpty : 判断个数是否为零
316+
isEmpty : 判断是否为空
317+
isNotEmpty : 判断是否非空
318+
retainAll : 保留元素
319+
removeAll : 删除下来
320+
toString : 集合转为字符串
321+
```
322+
246323
* ### 颜色相关 -> [ColorUtils.java][color.java]
247324
```
248325
getColor : 获取颜色
@@ -540,6 +617,21 @@ json : log 字符串之 json
540617
xml : log 字符串之 xml
541618
```
542619

620+
* ### Map 相关 -> [MapUtils.java][map.java] -> [Test][map.test]
621+
```
622+
newUnmodifiableMap: 创建 UnmodifiableMap
623+
newHashMap : 创建 HashMap
624+
newLinkedHashMap : 创建 LinkedHashMap
625+
newTreeMap : 创建 TreeMap
626+
newHashTable : 创建 HashTable
627+
isEmpty : 判断 Map 是否为空
628+
isNotEmpty : 判断 Map 是否非空
629+
size : 获取 Map 元素个数
630+
forAllDo : 对所有元素做操作
631+
transform : 对集合做转变
632+
toString : Map 转为字符串
633+
```
634+
543635
* ### MetaData 相关 -> [MetaDataUtils.java][metaData.java] -> [Demo][metaData.demo]
544636
```
545637
getMetaDataInApp : 获取 application 的 meta-data 值
@@ -999,6 +1091,9 @@ getComments : 获取压缩文件中的注释链表
9991091
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
10001092
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
10011093

1094+
[array.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java
1095+
[array.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ArrayUtilsTest.java
1096+
10021097
[bar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
10031098
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarActivity.kt
10041099

@@ -1037,6 +1132,9 @@ getComments : 获取压缩文件中的注释链表
10371132

10381133
[close.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloseUtils.java
10391134

1135+
[collection.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java
1136+
[collection.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CollectionUtilsTest.java
1137+
10401138
[color.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java
10411139
[color.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ColorUtilsTest.java
10421140

@@ -1086,6 +1184,9 @@ getComments : 获取压缩文件中的注释链表
10861184
[log.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
10871185
[log.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/log/LogActivity.kt
10881186

1187+
[map.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MapUtils.java
1188+
[map.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/MapUtilsTest.java
1189+
10891190
[metaData.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
10901191
[metaData.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/metaData/MetaDataActivity.kt
10911192

‎lib/utilcode/README.md‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,43 @@ getAppsInfo
7878
getApkInfo
7979
```
8080

81+
* ### About Array -> [ArrayUtils.java][array.java] -> [Test][array.test]
82+
```
83+
newArray
84+
newLongArray
85+
newIntArray
86+
newShortArray
87+
newCharArray
88+
newByteArray
89+
newDoubleArray
90+
newFloatArray
91+
newBooleanArray
92+
isEmpty
93+
getLength
94+
isSameLength
95+
get
96+
set
97+
equals
98+
reverse
99+
copy
100+
subArray
101+
add
102+
remove
103+
removeElement
104+
indexOf
105+
lastIndexOf
106+
contains
107+
toPrimitive
108+
toObject
109+
asList
110+
asUnmodifiableList
111+
asArrayList
112+
asLinkedList
113+
sort
114+
forAllDo
115+
toString
116+
```
117+
81118
* ### About Bar -> [BarUtils.java][bar.java] -> [Demo][bar.demo]
82119
```
83120
getStatusBarHeight
@@ -243,6 +280,46 @@ closeIO
243280
closeIOQuietly
244281
```
245282

283+
* ### About Collection -> [CollectionUtils.java][collection.java] -> [Test][collection.test]
284+
```
285+
newUnmodifiableList[NotNull]: 新建只读[非空]链表
286+
newArrayList[NotNull] : 新建数组型[非空]链表
287+
newLinkedList[NotNull] : 新建指针型[非空]链表
288+
newHashSet[NotNull] : 新建哈希[非空]集合
289+
newTreeSet[NotNull] : 新建有序[非空]集合
290+
newSynchronizedCollection
291+
newUnmodifiableCollection
292+
union
293+
intersection
294+
disjunction
295+
subtract
296+
containsAny
297+
getCardinalityMap
298+
isSubCollection
299+
isProperSubCollection
300+
isEqualCollection
301+
cardinality
302+
find
303+
forAllDo
304+
filter
305+
select
306+
selectRejected
307+
transform
308+
collect
309+
countMatches
310+
exists
311+
addIgnoreNull
312+
addAll
313+
get
314+
size
315+
sizeIsEmpty
316+
isEmpty
317+
isNotEmpty
318+
retainAll
319+
removeAll
320+
toString
321+
```
322+
246323
* ### About Color -> [ColorUtils.java][color.java]
247324
```
248325
getColor
@@ -540,6 +617,21 @@ json
540617
xml
541618
```
542619

620+
* ### About Map -> [MapUtils.java][map.java] -> [Test][map.test]
621+
```
622+
newUnmodifiableMap
623+
newHashMap
624+
newLinkedHashMap
625+
newTreeMap
626+
newHashTable
627+
isEmpty
628+
isNotEmpty
629+
size
630+
forAllDo
631+
transform
632+
toString
633+
```
634+
543635
* ### About MetaData -> [MetaDataUtils.java][metaData.java] -> [Demo][metaData.demo]
544636
```
545637
getMetaDataInApp
@@ -999,6 +1091,9 @@ getComments
9991091
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
10001092
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
10011093

1094+
[array.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java
1095+
[array.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ArrayUtilsTest.java
1096+
10021097
[bar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
10031098
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarActivity.kt
10041099

@@ -1037,6 +1132,9 @@ getComments
10371132

10381133
[close.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloseUtils.java
10391134

1135+
[collection.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java
1136+
[collection.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CollectionUtilsTest.java
1137+
10401138
[color.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java
10411139
[color.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ColorUtilsTest.java
10421140

@@ -1086,6 +1184,9 @@ getComments
10861184
[log.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
10871185
[log.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/log/LogActivity.kt
10881186

1187+
[map.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MapUtils.java
1188+
[map.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/MapUtilsTest.java
1189+
10891190
[metaData.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
10901191
[metaData.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/metaData/MetaDataActivity.kt
10911192

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,22 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
11+
/**
12+
* <pre>
13+
* author: Blankj
14+
* blog : http://blankj.com
15+
* time : 2018/11/15
16+
* desc : utils about adapt screen
17+
* </pre>
18+
*/
1219
public final class AdaptScreenUtils {
1320

1421
private static List<Field> sMetricsFields;
1522

23+
private AdaptScreenUtils() {
24+
throw new UnsupportedOperationException("u can't instantiate me...");
25+
}
26+
1627
/**
1728
* Adapt for the horizontal screen, and call it in {@link android.app.Activity#getResources()}.
1829
*/

0 commit comments

Comments
 (0)