Skip to content

Commit 632a5a9

Browse files
committed
see 07/29 log
1 parent 253bebf commit 632a5a9

File tree

16 files changed

+356
-211
lines changed

16 files changed

+356
-211
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* `19/07/31` [add] DeviceUtils#getUniqueDeviceId, DeviceUtils#isSameDevice. Publish v1.25.5.
2+
* `19/07/30` [fix] ThreadUtils's task can only be executed once. PhoneUtils#getIMEI wrong.
13
* `19/07/29` [fix] BusUtils post father class useless. KeyboardUtils#hideSoft bug. Publish v1.25.4.
24
* `19/07/28` [add] NetworkUtils#(un)registerNetworkStatusChangedListener. Publish v1.25.3.
35
* `19/07/27` [fix] ThreadUtils memory leak.

README-CN.md

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

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.4-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.5-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

5151
[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
@@ -45,7 +45,7 @@ If this project helps you a lot and you want to support the project's developmen
4545

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.4-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.5-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

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

buildSrc/src/main/groovy/Config.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 28
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 28
17-
static versionCode = 1_025_004
18-
static versionName = '1.25.4'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_005
18+
static versionName = '1.25.5'// E.g. 1.9.72 => 1,009,072
1919

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

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/device/DeviceActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ class DeviceActivity : CommonTitleActivity() {
5757
.appendLine("getModel: " + DeviceUtils.getModel())
5858
.appendLine("getABIs: " + Arrays.asList(*DeviceUtils.getABIs()))
5959
.appendLine("isTablet: " + DeviceUtils.isTablet())
60-
.append("isEmulator: " + DeviceUtils.isEmulator())
60+
.appendLine("isEmulator: " + DeviceUtils.isEmulator())
61+
.appendLine("getUniqueDeviceId: " + DeviceUtils.getUniqueDeviceId("util"))
62+
.appendLine("isSameDevice: " + DeviceUtils.isSameDevice(DeviceUtils.getUniqueDeviceId()))
6163
.create()
6264
}
6365

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/network/NetworkActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class NetworkActivity : CommonTitleActivity(), NetworkUtils.OnNetworkStatusChang
128128

129129
override fun onDestroy() {
130130
task.cancel()
131-
NetworkUtils.unregisterOnNetworkChangedListener(this)
131+
NetworkUtils.unregisterNetworkStatusChangedListener(this)
132132
super.onDestroy()
133133
}
134134
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/phone/PhoneActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class PhoneActivity : CommonTitleActivity() {
5050
SpanUtils.with(phoneAboutTv)
5151
.appendLine("isPhone: " + PhoneUtils.isPhone())
5252
.appendLine("getDeviceId: " + PhoneUtils.getDeviceId())
53+
.appendLine("getSerial: " + PhoneUtils.getSerial())
5354
.appendLine("getIMEI: " + PhoneUtils.getIMEI())
5455
.appendLine("getMEID: " + PhoneUtils.getMEID())
5556
.appendLine("getIMSI: " + PhoneUtils.getIMSI())

lib/utilcode/README-CN.md

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.25.4'
5+
implementation 'com.blankj:utilcode:1.25.5'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.25.4'
8+
implementation 'com.blankj:utilcodex:1.25.5'
99
```
1010

1111

@@ -295,6 +295,8 @@ getModel : 获取设备型号
295295
getABIs : 获取设备 ABIs
296296
isTablet : 判断是否是平板
297297
isEmulator : 判断是否是模拟器
298+
getUniqueDeviceId: 获取唯一设备 ID
299+
isSameDevice : 判断是否同一设备
298300
```
299301

300302
* ### 闪光灯相关 -> [FlashlightUtils.java][flashlight.java] -> [Demo][flashlight.demo]
@@ -546,26 +548,28 @@ getMetaDataInReceiver: 获取 receiver 的 meta-data 值
546548

547549
* ### 网络相关 -> [NetworkUtils.java][network.java] -> [Demo][network.demo]
548550
```
549-
openWirelessSettings : 打开网络设置界面
550-
isConnected : 判断网络是否连接
551-
isAvailable[Async] : 判断网络是否可用
552-
isAvailableByPing[Async]: 用 ping 判断网络是否可用
553-
isAvailableByDns[Async] : 用 DNS 判断网络是否可用
554-
getMobileDataEnabled : 判断移动数据是否打开
555-
isMobileData : 判断网络是否是移动数据
556-
is4G : 判断网络是否是 4G
557-
getWifiEnabled : 判断 wifi 是否打开
558-
setWifiEnabled : 打开或关闭 wifi
559-
isWifiConnected : 判断 wifi 是否连接状态
560-
isWifiAvailable[Async] : 判断 wifi 数据是否可用
561-
getNetworkOperatorName : 获取移动网络运营商名称
562-
getNetworkType : 获取当前网络类型
563-
getIPAddress[Async] : 获取 IP 地址
564-
getDomainAddress[Async] : 获取域名 IP 地址
565-
getIpAddressByWifi : 根据 WiFi 获取网络 IP 地址
566-
getGatewayByWifi : 根据 WiFi 获取网关 IP 地址
567-
getNetMaskByWifi : 根据 WiFi 获取子网掩码 IP 地址
568-
getServerAddressByWifi : 根据 WiFi 获取服务端 IP 地址
551+
openWirelessSettings : 打开网络设置界面
552+
isConnected : 判断网络是否连接
553+
isAvailable[Async] : 判断网络是否可用
554+
isAvailableByPing[Async] : 用 ping 判断网络是否可用
555+
isAvailableByDns[Async] : 用 DNS 判断网络是否可用
556+
getMobileDataEnabled : 判断移动数据是否打开
557+
isMobileData : 判断网络是否是移动数据
558+
is4G : 判断网络是否是 4G
559+
getWifiEnabled : 判断 wifi 是否打开
560+
setWifiEnabled : 打开或关闭 wifi
561+
isWifiConnected : 判断 wifi 是否连接状态
562+
isWifiAvailable[Async] : 判断 wifi 数据是否可用
563+
getNetworkOperatorName : 获取移动网络运营商名称
564+
getNetworkType : 获取当前网络类型
565+
getIPAddress[Async] : 获取 IP 地址
566+
getDomainAddress[Async] : 获取域名 IP 地址
567+
getIpAddressByWifi : 根据 WiFi 获取网络 IP 地址
568+
getGatewayByWifi : 根据 WiFi 获取网关 IP 地址
569+
getNetMaskByWifi : 根据 WiFi 获取子网掩码 IP 地址
570+
getServerAddressByWifi : 根据 WiFi 获取服务端 IP 地址
571+
registerNetworkStatusChangedListener : 注册网络状态改变监听器
572+
unregisterNetworkStatusChangedListener: 注销网络状态改变监听器
569573
```
570574

571575
* ### 对象相关 -> [ObjectUtils.java][object.java] -> [Test][object.test]

lib/utilcode/README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.25.4'
5+
implementation 'com.blankj:utilcode:1.25.5'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.25.4'
8+
implementation 'com.blankj:utilcodex:1.25.5'
99
```
1010

1111

@@ -295,6 +295,8 @@ getModel
295295
getABIs
296296
isTablet
297297
isEmulator
298+
getUniqueDeviceId
299+
isSameDevice
298300
```
299301

300302
* ### About Flashlight -> [FlashlightUtils.java][flashlight.java] -> [Demo][flashlight.demo]
@@ -548,24 +550,26 @@ getMetaDataInReceiver
548550
```
549551
openWirelessSettings
550552
isConnected
551-
isAvailable[Async] : 判断网络是否可用
552-
isAvailableByPing[Async]: 用 ping 判断网络是否可用
553-
isAvailableByDns[Async] : 用 DNS 判断网络是否可用
553+
isAvailable[Async] : 判断网络是否可用
554+
isAvailableByPing[Async] : 用 ping 判断网络是否可用
555+
isAvailableByDns[Async] : 用 DNS 判断网络是否可用
554556
getMobileDataEnabled
555557
isMobileData
556558
is4G
557559
getWifiEnabled
558560
setWifiEnabled
559561
isWifiConnected
560-
isWifiAvailable[Async] : 判断 wifi 数据是否可用
562+
isWifiAvailable[Async] : 判断 wifi 数据是否可用
561563
getNetworkOperatorName
562564
getNetworkType
563-
getIPAddress[Async] : 获取 IP 地址
564-
getDomainAddress[Async] : 获取域名 IP 地址
565+
getIPAddress[Async] : 获取 IP 地址
566+
getDomainAddress[Async] : 获取域名 IP 地址
565567
getIpAddressByWifi
566568
getGatewayByWifi
567569
getNetMaskByWifi
568570
getServerAddressByWifi
571+
registerNetworkStatusChangedListener
572+
unregisterNetworkStatusChangedListener
569573
```
570574

571575
* ### About Object -> [ObjectUtils.java][object.java] -> [Test][object.test]

0 commit comments

Comments
 (0)