Skip to content

Commit 25e9e04

Browse files
committed
see 03/04 log
1 parent 3e28baa commit 25e9e04

19 files changed

+54
-38
lines changed

app/src/main/java/com/blankj/androidutilcode/feature/core/phone/PhoneActivity.java

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

3+
import android.annotation.SuppressLint;
34
import android.content.Context;
45
import android.content.Intent;
56
import android.os.Bundle;
@@ -51,11 +52,14 @@ public void initView(Bundle savedInstanceState, View view) {
5152

5253
PermissionHelper.requestPhone(
5354
new PermissionHelper.OnPermissionGrantedListener() {
55+
@SuppressLint("MissingPermission")
5456
@Override
5557
public void onPermissionGranted() {
5658
tvAboutPhone.setText(new SpanUtils()
5759
.appendLine("isPhone: " + PhoneUtils.isPhone())
60+
.appendLine("getDeviceId: " + PhoneUtils.getDeviceId())
5861
.appendLine("getIMEI: " + PhoneUtils.getIMEI())
62+
.appendLine("getMEID: " + PhoneUtils.getMEID())
5963
.appendLine("getIMSI: " + PhoneUtils.getIMSI())
6064
.appendLine("getPhoneType: " + PhoneUtils.getPhoneType())
6165
.appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())
@@ -70,7 +74,9 @@ public void onPermissionGranted() {
7074
public void onPermissionDenied() {
7175
tvAboutPhone.setText(new SpanUtils()
7276
.appendLine("isPhone: " + PhoneUtils.isPhone())
77+
.appendLine("getDeviceId: " + "need permission")
7378
.appendLine("getIMEI: " + "need permission")
79+
.appendLine("getMEID: " + "need permission")
7480
.appendLine("getIMSI: " + "need permission")
7581
.appendLine("getPhoneType: " + PhoneUtils.getPhoneType())
7682
.appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@
1212
* author: Blankj
1313
* blog : http://blankj.com
1414
* time : 2018/01/30
15-
* desc : 克隆相关工具类
15+
* desc : utils about clone
1616
* </pre>
1717
*/
1818
public final class CloneUtils {
1919

20+
/**
21+
* Deep clone.
22+
*
23+
* @param data The data.
24+
* @param <T> The value type.
25+
* @return The object of cloned
26+
*/
2027
public static <T> T deepClone(final Serializable data) {
2128
if (data == null) return null;
2229
return (T) bytes2Object(serializable2Bytes((Serializable) data));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,10 @@ public ScheduledFuture<?> schedule(final Runnable command,
304304
* @param callable 命令
305305
* @param delay 延迟时间
306306
* @param unit 时间单位
307-
* @param <V> 泛型
307+
* @param <T> 泛型
308308
* @return 可用于提取结果或取消的ScheduledFuture
309309
*/
310-
public <V> ScheduledFuture<V> schedule(final Callable<V> callable,
310+
public <T> ScheduledFuture<T> schedule(final Callable<T> callable,
311311
final long delay,
312312
final TimeUnit unit) {
313313
return scheduleExec.schedule(callable, delay, unit);

update_log.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* 18/03/03 完善 Javadoc 中文版为英文版
2+
* 18/03/02 完善 Javadoc 中文版为英文版
3+
* 18/03/01 完善 Javadoc 中文版为英文版
4+
* 18/02/28 完善 Javadoc 中文版为英文版
5+
* 18/02/27 完善 Javadoc 中文版为英文版
16
* 18/02/26 完善 Javadoc 中文版为英文版
27
* 18/02/25 完善 Javadoc 中文版为英文版
38
* 18/02/24 完善 Javadoc 中文版为英文版

utilcode/README-CN.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -397,20 +397,22 @@ hashCode : 获取对象哈希值
397397

398398
* ### 权限相关 -> [PermissionUtils.java][permission.java] -> [Demo][permission.demo]
399399
```
400-
getPermissions : 获取应用权限
401-
isGranted : 判断权限是否被授予
402-
openAppSettings: 打开应用具体设置
403-
permission : 设置请求权限
404-
rationale : 设置拒绝权限后再次请求的回调接口
405-
callback : 设置回调
406-
theme : 设置主题
407-
request : 开始请求
400+
getPermissions : 获取应用权限
401+
isGranted : 判断权限是否被授予
402+
launchAppDetailsSettings: 打开应用具体设置
403+
permission : 设置请求权限
404+
rationale : 设置拒绝权限后再次请求的回调接口
405+
callback : 设置回调
406+
theme : 设置主题
407+
request : 开始请求
408408
```
409409

410410
* ### 手机相关 -> [PhoneUtils.java][phone.java] -> [Demo][phone.demo]
411411
```
412412
isPhone : 判断设备是否是手机
413+
getDeviceId : 获取设备码
413414
getIMEI : 获取 IMEI 码
415+
getMEID : 获取 MEID 码
414416
getIMSI : 获取 IMSI 码
415417
getPhoneType : 获取移动终端类型
416418
isSimCardReady : 判断 sim 卡是否准备好
@@ -421,9 +423,6 @@ dial : 跳至拨号界面
421423
call : 拨打 phoneNumber
422424
sendSms : 跳至发送短信界面
423425
sendSmsSilent : 发送短信
424-
getAllContactInfo : 获取手机联系人
425-
getContactNum : 打开手机联系人界面点击联系人后便获取该号码
426-
getAllSMS : 获取手机短信并保存到 xml 中
427426
```
428427

429428
* ### 进程相关 -> [ProcessUtils.java][process.java] -> [Demo][process.demo]
@@ -489,12 +488,12 @@ getSDCardPaths: 获取 SD 卡路径
489488

490489
* ### 服务相关 -> [ServiceUtils.java][service.java]
491490
```
492-
getAllRunningService: 获取所有运行的服务
493-
startService : 启动服务
494-
stopService : 停止服务
495-
bindService : 绑定服务
496-
unbindService : 解绑服务
497-
isServiceRunning : 判断服务是否运行
491+
getAllRunningServices: 获取所有运行的服务
492+
startService : 启动服务
493+
stopService : 停止服务
494+
bindService : 绑定服务
495+
unbindService : 解绑服务
496+
isServiceRunning : 判断服务是否运行
498497
```
499498

500499
* ### Shell 相关 -> [ShellUtils.java][shell.java]

utilcode/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ hashCode
399399
```
400400
getPermissions
401401
isGranted
402-
openAppSettings
402+
launchAppDetailsSettings
403403
permission
404404
rationale
405405
callback
@@ -410,7 +410,9 @@ request
410410
* ### About Phone -> [PhoneUtils.java][phone.java] -> [Demo][phone.demo]
411411
```
412412
isPhone
413+
getDeviceId
413414
getIMEI
415+
getMEID
414416
getIMSI
415417
getPhoneType
416418
isSimCardReady
@@ -421,9 +423,6 @@ dial
421423
call
422424
sendSms
423425
sendSmsSilent
424-
getAllContactInfo
425-
getContactNum
426-
getAllSMS
427426
```
428427

429428
* ### About Process -> [ProcessUtils.java][process.java] -> [Demo][process.demo]
@@ -489,7 +488,7 @@ getSDCardPaths
489488

490489
* ### About Service -> [ServiceUtils.java][service.java]
491490
```
492-
getAllRunningService
491+
getAllRunningServices
493492
startService
494493
stopService
495494
bindService

utilcode/src/test/java/com/blankj/utilcode/util/CacheUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* author: Blankj
3333
* blog : http://blankj.com
3434
* time : 2017/05/26
35-
* desc : CacheUtils 单元测试
35+
* desc : test CacheUtils
3636
* </pre>
3737
*/
3838
@RunWith(RobolectricTestRunner.class)

utilcode/src/test/java/com/blankj/utilcode/util/ConvertUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* author: Blankj
1818
* blog : http://blankj.com
1919
* time : 2016/08/13
20-
* desc : ConvertUtils 单元测试
20+
* desc : test ConvertUtils
2121
* </pre>
2222
*/
2323
public class ConvertUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/EncodeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* author: Blankj
1616
* blog : http://blankj.com
1717
* time : 2016/08/12
18-
* desc : EncodeUtils 单元测试
18+
* desc : test EncodeUtils
1919
* </pre>
2020
*/
2121
@RunWith(RobolectricTestRunner.class)

utilcode/src/test/java/com/blankj/utilcode/util/EncryptUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* author: Blankj
1919
* blog : http://blankj.com
2020
* time : 2016/08/06
21-
* desc : EncryptUtils 单元测试
21+
* desc : test EncryptUtils
2222
* </pre>
2323
*/
2424
@RunWith(RobolectricTestRunner.class)

utilcode/src/test/java/com/blankj/utilcode/util/FileIOUtilsTest.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/05/24
17-
* desc : FileIOUtils 单元测试
17+
* desc : test FileIOUtils
1818
* </pre>
1919
*/
2020
public class FileIOUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/FileUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* author: Blankj
2020
* blog : http://blankj.com
2121
* time : 2016/08/19
22-
* desc : FileUtils 单元测试
22+
* desc : test FileUtils
2323
* </pre>
2424
*/
2525
public class FileUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* author: Blankj
2424
* blog : http://blankj.com
2525
* time : 2017/12/24
26-
* desc : ObjectUtils 单元测试
26+
* desc : test ObjectUtils
2727
* </pre>
2828
*/
2929
@RunWith(RobolectricTestRunner.class)

utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* author: Blankj
1313
* blog : http://blankj.com
1414
* time : 2016/08/16
15-
* desc : RegexUtils 单元测试
15+
* desc : test RegexUtils
1616
* </pre>
1717
*/
1818
public class RegexUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/StringUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* author: Blankj
1313
* blog : http://blankj.com
1414
* time : 2016/08/16
15-
* desc : StringUtils 单元测试
15+
* desc : test StringUtils
1616
* </pre>
1717
*/
1818
public class StringUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/TestConfig.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/09/10
8-
* desc : 单元测试配置文件
8+
* desc : config of test
99
* </pre>
1010
*/
1111
public class TestConfig {

utilcode/src/test/java/com/blankj/utilcode/util/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* author: Blankj
1212
* blog : http://blankj.com
1313
* time : 2016/08/21
14-
* desc : 单元测试工具类
14+
* desc : utils about test
1515
* </pre>
1616
*/
1717
@RunWith(RobolectricTestRunner.class)

utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* author: Blankj
2020
* blog : http://blankj.com
2121
* time : 2016/08/12
22-
* desc : TimeUtils 单元测试
22+
* desc : test TimeUtils
2323
* </pre>
2424
*/
2525
public class TimeUtilsTest {

utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* author: Blankj
1717
* blog : http://blankj.com
1818
* time : 2016/09/10
19-
* desc : ZipUtils 单元测试
19+
* desc : test ZipUtils
2020
* </pre>
2121
*/
2222
public class ZipUtilsTest {

0 commit comments

Comments
 (0)