Skip to content

Commit 2609505

Browse files
BlankjBlankj
committed
see 01/31 log
1 parent 788b57a commit 2609505

File tree

4 files changed

+110
-61
lines changed

4 files changed

+110
-61
lines changed

‎utilcode/README-CN.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,30 @@ readRaw2String : 从 raw 中读取字符串
679679
readRaw2List : 从 raw 中按行读取字符串
680680
```
681681

682+
* ### Rom 相关 -> [RomUtils.java][rom.java] -> [Demo][rom.demo]
683+
```
684+
isHuawei : 是否华为
685+
isVivo : 是否 VIVO
686+
isXiaomi : 是否小米
687+
isOppo : 是否 OPPO
688+
isLeeco : 是否乐视
689+
is360 : 是否 360
690+
isZte : 是否中兴
691+
isOneplus : 是否一加
692+
isNubia : 是否努比亚
693+
isCoolpad : 是否酷派
694+
isLg : 是否 LG
695+
isGoogle : 是否谷歌
696+
isSamsung : 是否三星
697+
isMeizu : 是否魅族
698+
isLenovo : 是否联想
699+
isSmartisan: 是否锤子
700+
isHtc : 是否 HTC
701+
isSony : 是否索尼
702+
isAmigo : 是否金立
703+
getRomInfo : 获取 ROM 信息
704+
```
705+
682706
* ### 屏幕相关 -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
683707
```
684708
getScreenWidth : 获取屏幕的宽度（单位：px）
@@ -1055,6 +1079,9 @@ getComments : 获取压缩文件中的注释链表
10551079
[resource.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
10561080
[resource.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/resource/ResourceActivity.kt
10571081

1082+
[rom.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/RomUtils.java
1083+
[rom.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/rom/RomActivity.kt
1084+
10581085
[screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
10591086
[screen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/screen/ScreenActivity.kt
10601087

‎utilcode/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,30 @@ readRaw2String
679679
readRaw2List
680680
```
681681

682+
* ### About Rom -> [RomUtils.java][rom.java] -> [Demo][rom.demo]
683+
```
684+
isHuawei
685+
isVivo
686+
isXiaomi
687+
isOppo
688+
isLeeco
689+
is360
690+
isZte
691+
isOneplus
692+
isNubia
693+
isCoolpad
694+
isLg
695+
isGoogle
696+
isSamsung
697+
isMeizu
698+
isLenovo
699+
isSmartisan
700+
isHtc
701+
isSony
702+
isAmigo
703+
getRomInfo
704+
```
705+
682706
* ### About Screen -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
683707
```
684708
getScreenWidth

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public static boolean isDeviceRooted() {
4545
String[] locations = {"/system/bin/", "/system/xbin/", "/sbin/", "/system/sd/xbin/",
4646
"/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/",
4747
"/system/sbin/", "/usr/bin/", "/vendor/bin/"};
48-
4948
for (String location : locations) {
5049
if (new File(location + su).exists()) {
5150
return true;

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

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,35 @@
2323
*/
2424
public final class RomUtils {
2525

26-
public static final String[] ROM_HUAWEI = {"huawei"};
27-
public static final String[] ROM_VIVO = {"vivo"};
28-
public static final String[] ROM_XIAOMI = {"xiaomi"};
29-
public static final String[] ROM_OPPO = {"oppo"};
30-
public static final String[] ROM_LEECO = {"leeco", "letv"};
31-
public static final String[] ROM_360 = {"360", "qiku"};
32-
public static final String[] ROM_ZTE = {"zte"};
33-
public static final String[] ROM_ONEPLUS = {"oneplus"};
34-
public static final String[] ROM_NUBIA = {"nubia"};
35-
36-
public static final String[] ROM_COOLPAD = {"coolpad", "yulong"};
37-
public static final String[] ROM_LG = {"lg", "lge"};
38-
public static final String[] ROM_GOOGLE = {"google"};
39-
public static final String[] ROM_SAMSUNG = {"samsung"};
40-
public static final String[] ROM_MEIZU = {"meizu"};
41-
public static final String[] ROM_LENOVO = {"lenovo"};
42-
public static final String[] ROM_SMARTISAN = {"smartisan"};
43-
public static final String[] ROM_HTC = {"htc"};
44-
public static final String[] ROM_SONY = {"sony"};
45-
public static final String[] ROM_AMIGO = {"amigo"};
46-
47-
public static final String VERSION_PROPERTY_HUAWEI = "ro.build.version.emui";
48-
public static final String VERSION_PROPERTY_VIVO = "ro.vivo.os.build.display.id";
49-
public static final String VERSION_PROPERTY_XIAOMI = "ro.build.version.incremental";
50-
public static final String VERSION_PROPERTY_OPPO = "ro.build.version.opporom";
51-
public static final String VERSION_PROPERTY_LEECO = "ro.letv.release.version";
52-
public static final String VERSION_PROPERTY_360 = "ro.build.uiversion";
53-
public static final String VERSION_PROPERTY_ZTE = "ro.build.MiFavor_version";
54-
public static final String VERSION_PROPERTY_ONEPLUS = "ro.rom.version";
55-
public static final String VERSION_PROPERTY_NUBIA = "ro.build.rom.id";
26+
private static final String[] ROM_HUAWEI = {"huawei"};
27+
private static final String[] ROM_VIVO = {"vivo"};
28+
private static final String[] ROM_XIAOMI = {"xiaomi"};
29+
private static final String[] ROM_OPPO = {"oppo"};
30+
private static final String[] ROM_LEECO = {"leeco", "letv"};
31+
private static final String[] ROM_360 = {"360", "qiku"};
32+
private static final String[] ROM_ZTE = {"zte"};
33+
private static final String[] ROM_ONEPLUS = {"oneplus"};
34+
private static final String[] ROM_NUBIA = {"nubia"};
35+
private static final String[] ROM_COOLPAD = {"coolpad", "yulong"};
36+
private static final String[] ROM_LG = {"lg", "lge"};
37+
private static final String[] ROM_GOOGLE = {"google"};
38+
private static final String[] ROM_SAMSUNG = {"samsung"};
39+
private static final String[] ROM_MEIZU = {"meizu"};
40+
private static final String[] ROM_LENOVO = {"lenovo"};
41+
private static final String[] ROM_SMARTISAN = {"smartisan"};
42+
private static final String[] ROM_HTC = {"htc"};
43+
private static final String[] ROM_SONY = {"sony"};
44+
private static final String[] ROM_AMIGO = {"amigo"};
45+
46+
private static final String VERSION_PROPERTY_HUAWEI = "ro.build.version.emui";
47+
private static final String VERSION_PROPERTY_VIVO = "ro.vivo.os.build.display.id";
48+
private static final String VERSION_PROPERTY_XIAOMI = "ro.build.version.incremental";
49+
private static final String VERSION_PROPERTY_OPPO = "ro.build.version.opporom";
50+
private static final String VERSION_PROPERTY_LEECO = "ro.letv.release.version";
51+
private static final String VERSION_PROPERTY_360 = "ro.build.uiversion";
52+
private static final String VERSION_PROPERTY_ZTE = "ro.build.MiFavor_version";
53+
private static final String VERSION_PROPERTY_ONEPLUS = "ro.rom.version";
54+
private static final String VERSION_PROPERTY_NUBIA = "ro.build.rom.id";
5655
private final static String UNKNOWN = "unknown";
5756

5857
private static RomInfo bean = null;
@@ -67,7 +66,7 @@ private RomUtils() {
6766
* @return {@code true}: yes<br>{@code false}: no
6867
*/
6968
public static boolean isHuawei() {
70-
return ROM_HUAWEI.equals(getRomInfo().name);
69+
return ROM_HUAWEI[0].equals(getRomInfo().name);
7170
}
7271

7372
/**
@@ -76,7 +75,7 @@ public static boolean isHuawei() {
7675
* @return {@code true}: yes<br>{@code false}: no
7776
*/
7877
public static boolean isVivo() {
79-
return ROM_VIVO.equals(getRomInfo().name);
78+
return ROM_VIVO[0].equals(getRomInfo().name);
8079
}
8180

8281
/**
@@ -85,7 +84,7 @@ public static boolean isVivo() {
8584
* @return {@code true}: yes<br>{@code false}: no
8685
*/
8786
public static boolean isXiaomi() {
88-
return ROM_XIAOMI.equals(getRomInfo().name);
87+
return ROM_XIAOMI[0].equals(getRomInfo().name);
8988
}
9089

9190
/**
@@ -94,7 +93,7 @@ public static boolean isXiaomi() {
9493
* @return {@code true}: yes<br>{@code false}: no
9594
*/
9695
public static boolean isOppo() {
97-
return ROM_OPPO.equals(getRomInfo().name);
96+
return ROM_OPPO[0].equals(getRomInfo().name);
9897
}
9998

10099
/**
@@ -121,7 +120,7 @@ public static boolean is360() {
121120
* @return {@code true}: yes<br>{@code false}: no
122121
*/
123122
public static boolean isZte() {
124-
return ROM_ZTE.equals(getRomInfo().name);
123+
return ROM_ZTE[0].equals(getRomInfo().name);
125124
}
126125

127126
/**
@@ -130,7 +129,7 @@ public static boolean isZte() {
130129
* @return {@code true}: yes<br>{@code false}: no
131130
*/
132131
public static boolean isOneplus() {
133-
return ROM_ONEPLUS.equals(getRomInfo().name);
132+
return ROM_ONEPLUS[0].equals(getRomInfo().name);
134133
}
135134

136135
/**
@@ -139,7 +138,7 @@ public static boolean isOneplus() {
139138
* @return {@code true}: yes<br>{@code false}: no
140139
*/
141140
public static boolean isNubia() {
142-
return ROM_NUBIA.equals(getRomInfo().name);
141+
return ROM_NUBIA[0].equals(getRomInfo().name);
143142
}
144143

145144
/**
@@ -166,7 +165,7 @@ public static boolean isLg() {
166165
* @return {@code true}: yes<br>{@code false}: no
167166
*/
168167
public static boolean isGoogle() {
169-
return ROM_GOOGLE.equals(getRomInfo().name);
168+
return ROM_GOOGLE[0].equals(getRomInfo().name);
170169
}
171170

172171
/**
@@ -175,7 +174,7 @@ public static boolean isGoogle() {
175174
* @return {@code true}: yes<br>{@code false}: no
176175
*/
177176
public static boolean isSamsung() {
178-
return ROM_SAMSUNG.equals(getRomInfo().name);
177+
return ROM_SAMSUNG[0].equals(getRomInfo().name);
179178
}
180179

181180
/**
@@ -184,7 +183,7 @@ public static boolean isSamsung() {
184183
* @return {@code true}: yes<br>{@code false}: no
185184
*/
186185
public static boolean isMeizu() {
187-
return ROM_MEIZU.equals(getRomInfo().name);
186+
return ROM_MEIZU[0].equals(getRomInfo().name);
188187
}
189188

190189
/**
@@ -193,7 +192,7 @@ public static boolean isMeizu() {
193192
* @return {@code true}: yes<br>{@code false}: no
194193
*/
195194
public static boolean isLenovo() {
196-
return ROM_LENOVO.equals(getRomInfo().name);
195+
return ROM_LENOVO[0].equals(getRomInfo().name);
197196
}
198197

199198
/**
@@ -202,7 +201,7 @@ public static boolean isLenovo() {
202201
* @return {@code true}: yes<br>{@code false}: no
203202
*/
204203
public static boolean isSmartisan() {
205-
return ROM_SMARTISAN.equals(getRomInfo().name);
204+
return ROM_SMARTISAN[0].equals(getRomInfo().name);
206205
}
207206

208207
/**
@@ -211,7 +210,7 @@ public static boolean isSmartisan() {
211210
* @return {@code true}: yes<br>{@code false}: no
212211
*/
213212
public static boolean isHtc() {
214-
return ROM_HTC.equals(getRomInfo().name);
213+
return ROM_HTC[0].equals(getRomInfo().name);
215214
}
216215

217216
/**
@@ -220,7 +219,7 @@ public static boolean isHtc() {
220219
* @return {@code true}: yes<br>{@code false}: no
221220
*/
222221
public static boolean isSony() {
223-
return ROM_SONY.equals(getRomInfo().name);
222+
return ROM_SONY[0].equals(getRomInfo().name);
224223
}
225224

226225
/**
@@ -229,7 +228,7 @@ public static boolean isSony() {
229228
* @return {@code true}: yes<br>{@code false}: no
230229
*/
231230
public static boolean isAmigo() {
232-
return ROM_AMIGO.equals(getRomInfo().name);
231+
return ROM_AMIGO[0].equals(getRomInfo().name);
233232
}
234233

235234
/**
@@ -243,7 +242,7 @@ public static RomInfo getRomInfo() {
243242
final String brand = getBrand();
244243
final String manufacturer = getManufacturer();
245244
if (isRightRom(brand, manufacturer, ROM_HUAWEI)) {
246-
bean.name = ROM_HUAWEI;
245+
bean.name = ROM_HUAWEI[0];
247246
String version = getRomVersion(VERSION_PROPERTY_HUAWEI);
248247
String[] temp = version.split("_");
249248
if (temp.length > 1) {
@@ -254,17 +253,17 @@ public static RomInfo getRomInfo() {
254253
return bean;
255254
}
256255
if (isRightRom(brand, manufacturer, ROM_VIVO)) {
257-
bean.name = ROM_VIVO;
256+
bean.name = ROM_VIVO[0];
258257
bean.version = getRomVersion(VERSION_PROPERTY_VIVO);
259258
return bean;
260259
}
261260
if (isRightRom(brand, manufacturer, ROM_XIAOMI)) {
262-
bean.name = ROM_XIAOMI;
261+
bean.name = ROM_XIAOMI[0];
263262
bean.version = getRomVersion(VERSION_PROPERTY_XIAOMI);
264263
return bean;
265264
}
266265
if (isRightRom(brand, manufacturer, ROM_OPPO)) {
267-
bean.name = ROM_OPPO;
266+
bean.name = ROM_OPPO[0];
268267
bean.version = getRomVersion(VERSION_PROPERTY_OPPO);
269268
return bean;
270269
}
@@ -280,17 +279,17 @@ public static RomInfo getRomInfo() {
280279
return bean;
281280
}
282281
if (isRightRom(brand, manufacturer, ROM_ZTE)) {
283-
bean.name = ROM_ZTE;
282+
bean.name = ROM_ZTE[0];
284283
bean.version = getRomVersion(VERSION_PROPERTY_ZTE);
285284
return bean;
286285
}
287286
if (isRightRom(brand, manufacturer, ROM_ONEPLUS)) {
288-
bean.name = ROM_ONEPLUS;
287+
bean.name = ROM_ONEPLUS[0];
289288
bean.version = getRomVersion(VERSION_PROPERTY_ONEPLUS);
290289
return bean;
291290
}
292291
if (isRightRom(brand, manufacturer, ROM_NUBIA)) {
293-
bean.name = ROM_NUBIA;
292+
bean.name = ROM_NUBIA[0];
294293
bean.version = getRomVersion(VERSION_PROPERTY_NUBIA);
295294
return bean;
296295
}
@@ -300,21 +299,21 @@ public static RomInfo getRomInfo() {
300299
} else if (isRightRom(brand, manufacturer, ROM_LG)) {
301300
bean.name = ROM_LG[0];
302301
} else if (isRightRom(brand, manufacturer, ROM_GOOGLE)) {
303-
bean.name = ROM_GOOGLE;
302+
bean.name = ROM_GOOGLE[0];
304303
} else if (isRightRom(brand, manufacturer, ROM_SAMSUNG)) {
305-
bean.name = ROM_SAMSUNG;
304+
bean.name = ROM_SAMSUNG[0];
306305
} else if (isRightRom(brand, manufacturer, ROM_MEIZU)) {
307-
bean.name = ROM_MEIZU;
306+
bean.name = ROM_MEIZU[0];
308307
} else if (isRightRom(brand, manufacturer, ROM_LENOVO)) {
309-
bean.name = ROM_LENOVO;
308+
bean.name = ROM_LENOVO[0];
310309
} else if (isRightRom(brand, manufacturer, ROM_SMARTISAN)) {
311-
bean.name = ROM_SMARTISAN;
310+
bean.name = ROM_SMARTISAN[0];
312311
} else if (isRightRom(brand, manufacturer, ROM_HTC)) {
313-
bean.name = ROM_HTC;
312+
bean.name = ROM_HTC[0];
314313
} else if (isRightRom(brand, manufacturer, ROM_SONY)) {
315-
bean.name = ROM_SONY;
314+
bean.name = ROM_SONY[0];
316315
} else if (isRightRom(brand, manufacturer, ROM_AMIGO)) {
317-
bean.name = ROM_AMIGO;
316+
bean.name = ROM_AMIGO[0];
318317
} else {
319318
bean.name = manufacturer;
320319
}

0 commit comments

Comments
 (0)