Skip to content

Commit 71c7499

Browse files
BlankjBlankj
committed
see 10/14 log
1 parent 72b8c17 commit 71c7499

11 files changed

+43
-41
lines changed

‎utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,13 @@ public static boolean isAppForeground(Context context) {
445445
*/
446446
public static class AppInfo {
447447

448-
private String name;
448+
private String name;
449449
private Drawable icon;
450-
private String packageName;
451-
private String packagePath;
452-
private String versionName;
453-
private int versionCode;
454-
private boolean isSystem;
450+
private String packageName;
451+
private String packagePath;
452+
private String versionName;
453+
private int versionCode;
454+
private boolean isSystem;
455455

456456
public Drawable getIcon() {
457457
return icon;

‎utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ private ConstUtils() {
2222
/**
2323
* KB与Byte的倍数
2424
*/
25-
public static final int KB = 1024;
25+
public static final int KB = 1024;
2626
/**
2727
* MB与Byte的倍数
2828
*/
29-
public static final int MB = 1048576;
29+
public static final int MB = 1048576;
3030
/**
3131
* GB与Byte的倍数
3232
*/
33-
public static final int GB = 1073741824;
33+
public static final int GB = 1073741824;
3434

3535
public enum MemoryUnit {
3636
BYTE,
@@ -47,19 +47,19 @@ public enum MemoryUnit {
4747
/**
4848
* 秒与毫秒的倍数
4949
*/
50-
public static final int SEC = 1000;
50+
public static final int SEC = 1000;
5151
/**
5252
* 分与毫秒的倍数
5353
*/
54-
public static final int MIN = 60000;
54+
public static final int MIN = 60000;
5555
/**
5656
* 时与毫秒的倍数
5757
*/
5858
public static final int HOUR = 3600000;
5959
/**
6060
* 天与毫秒的倍数
6161
*/
62-
public static final int DAY = 86400000;
62+
public static final int DAY = 86400000;
6363

6464
public enum TimeUnit {
6565
MSEC,
@@ -82,41 +82,41 @@ public enum TimeUnit {
8282
* <p>全球星：1349</p>
8383
* <p>虚拟运营商：170</p>
8484
*/
85-
public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(147))\\d{8}$";
85+
public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(147))\\d{8}$";
8686
/**
8787
* 正则：电话号码
8888
*/
89-
public static final String REGEX_TEL = "^0\\d{2,3}[- ]?\\d{7,8}";
89+
public static final String REGEX_TEL = "^0\\d{2,3}[- ]?\\d{7,8}";
9090
/**
9191
* 正则：身份证号码15位
9292
*/
93-
public static final String REGEX_IDCARD15 = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$";
93+
public static final String REGEX_IDCARD15 = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$";
9494
/**
9595
* 正则：身份证号码18位
9696
*/
97-
public static final String REGEX_IDCARD18 = "^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9Xx])$";
97+
public static final String REGEX_IDCARD18 = "^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9Xx])$";
9898
/**
9999
* 正则：邮箱
100100
*/
101-
public static final String REGEX_EMAIL = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
101+
public static final String REGEX_EMAIL = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
102102
/**
103103
* 正则：URL
104104
*/
105-
public static final String REGEX_URL = "http(s)?://([\\w-]+\\.)+[\\w-]+(/[\\w-./?%&=]*)?";
105+
public static final String REGEX_URL = "http(s)?://([\\w-]+\\.)+[\\w-]+(/[\\w-./?%&=]*)?";
106106
/**
107107
* 正则：汉字
108108
*/
109-
public static final String REGEX_CHZ = "^[\\u4e00-\\u9fa5]+$";
109+
public static final String REGEX_CHZ = "^[\\u4e00-\\u9fa5]+$";
110110
/**
111111
* 正则：用户名，取值范围为a-z,A-Z,0-9,"_",汉字，不能以"_"结尾,用户名必须是6-20位
112112
*/
113-
public static final String REGEX_USERNAME = "^[\\w\\u4e00-\\u9fa5]{6,20}(?<!_)$";
113+
public static final String REGEX_USERNAME = "^[\\w\\u4e00-\\u9fa5]{6,20}(?<!_)$";
114114
/**
115115
* 正则：yyyy-MM-dd格式的日期校验，已考虑平闰年
116116
*/
117-
public static final String REGEX_DATE = "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$";
117+
public static final String REGEX_DATE = "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$";
118118
/**
119119
* 正则：IP地址
120120
*/
121-
public static final String REGEX_IP = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
121+
public static final String REGEX_IP = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
122122
}

‎utilcode/src/main/java/com/blankj/utilcode/utils/CrashUtils.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
public class CrashUtils implements Thread.UncaughtExceptionHandler {
2727

2828
private static CrashUtils mInstance = new CrashUtils();
29-
private UncaughtExceptionHandler mHandler;
30-
private boolean mInitialized;
31-
private static String crashDir;
32-
private String versionName;
33-
private int versionCode;
29+
private UncaughtExceptionHandler mHandler;
30+
private boolean mInitialized;
31+
private static String crashDir;
32+
private String versionName;
33+
private int versionCode;
3434

3535
private CrashUtils() {
3636
}

‎utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ private LogUtils() {
2626
throw new UnsupportedOperationException("u can't instantiate me...");
2727
}
2828

29-
private static boolean logSwitch = true;
29+
private static boolean logSwitch = true;
3030
private static boolean log2FileSwitch = false;
31-
private static char logFilter = 'v';
32-
private static String tag = "TAG";
31+
private static char logFilter = 'v';
32+
private static String tag = "TAG";
3333
private static String dir;
3434

3535
/**
@@ -72,10 +72,10 @@ public static Builder getBuilder(Context context) {
7272

7373
public static class Builder {
7474

75-
private boolean logSwitch = true;
75+
private boolean logSwitch = true;
7676
private boolean log2FileSwitch = false;
77-
private char logFilter = 'v';
78-
private String tag = "TAG";
77+
private char logFilter = 'v';
78+
private String tag = "TAG";
7979

8080
public Builder setLogSwitch(boolean logSwitch) {
8181
this.logSwitch = logSwitch;

‎utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class NetworkUtils {
2727
private NetworkUtils() {
2828
throw new UnsupportedOperationException("u can't instantiate me...");
2929
}
30-
30+
3131
public static final int NETWORK_WIFI = 1; // wifi network
3232
public static final int NETWORK_4G = 4; // "4G" networks
3333
public static final int NETWORK_3G = 3; // "3G" networks

‎utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public static String getIMEI(Context context) {
6161

6262
/**
6363
* 获取IMSI码
64-
*<p>需添加权限 {@code <uses-permission android:name="android.permission.READ_PHONE_STATE"/>}</p>
64+
* <p>需添加权限 {@code <uses-permission android:name="android.permission.READ_PHONE_STATE"/>}</p>
65+
*
6566
* @param context 上下文
6667
* @return IMSI码
6768
*/

‎utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ public static SDCardInfo getSDCardInfo() {
128128

129129
private static class SDCardInfo {
130130
boolean isExist;
131-
long totalBlocks;
132-
long freeBlocks;
133-
long availableBlocks;
131+
long totalBlocks;
132+
long freeBlocks;
133+
long availableBlocks;
134134

135135
long blockByteSize;
136136

‎utilcode/src/main/java/com/blankj/utilcode/utils/SPUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
public class SPUtils {
1717

18-
private SharedPreferences sp;
18+
private SharedPreferences sp;
1919
private SharedPreferences.Editor editor;
2020

2121
/**

‎utilcode/src/main/java/com/blankj/utilcode/utils/ShellUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static class CommandResult {
144144
/**
145145
* 结果码
146146
**/
147-
public int result;
147+
public int result;
148148
/**
149149
* 成功信息
150150
**/

‎utilcode/src/main/java/com/blankj/utilcode/utils/SizeUtils.java

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public static float applyDimension(int unit, float value, DisplayMetrics metrics
107107
* }
108108
* });
109109
* </pre>
110+
*
110111
* @param view 视图
111112
* @param listener 监听器
112113
*/

‎utilcode/src/main/java/com/blankj/utilcode/utils/ThreadPoolUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public enum Type {
3232
SingleThread,
3333
}
3434

35-
private ExecutorService exec;
35+
private ExecutorService exec;
3636
private ScheduledExecutorService scheduleExec;
3737

3838
/**

0 commit comments

Comments
 (0)