Skip to content

Commit 3efd2e3

Browse files
getActivitygetActivity
committed
优化对设备品牌判断的相关代码
1 parent c1357db commit 3efd2e3

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

‎library/src/main/java/com/hjq/device/compat/DeviceBrand.java‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -13,100 +13,100 @@
1313
public final class DeviceBrand {
1414

1515
private static final String BRAND_NAME_HUAWEI = "HuaWei";
16-
private static final String[] BRAND_ID_HUAWEI = { "huawei" };
16+
private static final String[] BRAND_ID_LOWER_CASE_HUAWEI = { "huawei" };
1717

1818
private static final String BRAND_NAME_VIVO = "Vivo";
19-
private static final String[] BRAND_ID_VIVO = { "vivo" };
19+
private static final String[] BRAND_ID_LOWER_CASE_VIVO = { "vivo" };
2020

2121
private static final String BRAND_NAME_XIAOMI = "XiaoMi";
22-
private static final String[] BRAND_ID_XIAOMI = { "xiaomi" };
22+
private static final String[] BRAND_ID_LOWER_CASE_XIAOMI = { "xiaomi" };
2323

24-
private static final String BRAND_NAME_REDMI = "Redmi";
25-
private static final String[] BRAND_ID_REDMI = { "Redmi" };
24+
private static final String BRAND_NAME_REDMI = "RedMi";
25+
private static final String[] BRAND_ID_LOWER_CASE_REDMI = { "redmi" };
2626

2727
private static final String BRAND_NAME_OPPO = "Oppo";
28-
private static final String[] BRAND_ID_OPPO = { "oppo" };
28+
private static final String[] BRAND_ID_LOWER_CASE_OPPO = { "oppo" };
2929

3030
private static final String BRAND_NAME_REALME = "RealMe";
31-
private static final String[] BRAND_ID_REALME = { "realme" };
31+
private static final String[] BRAND_ID_LOWER_CASE_REALME = { "realme" };
3232

3333
private static final String BRAND_NAME_LEECO = "LeEco";
34-
private static final String[] BRAND_ID_LEECO = { "leeco", "letv" };
34+
private static final String[] BRAND_ID_LOWER_CASE_LEECO = { "leeco", "letv" };
3535

3636
private static final String BRAND_NAME_360 = "360";
37-
private static final String[] BRAND_ID_360 = { "360", "qiku" };
37+
private static final String[] BRAND_ID_LOWER_CASE_360 = { "360", "qiku" };
3838

3939
private static final String BRAND_NAME_ZTE = "ZTE";
40-
private static final String[] BRAND_ID_ZTE = { "zte" };
40+
private static final String[] BRAND_ID_LOWER_CASE_ZTE = { "zte" };
4141

4242
private static final String BRAND_NAME_ONEPLUS = "OnePlus";
43-
private static final String[] BRAND_ID_ONEPLUS = { "oneplus" };
43+
private static final String[] BRAND_ID_LOWER_CASE_ONEPLUS = { "oneplus" };
4444

4545
private static final String BRAND_NAME_NUBIA = "Nubia";
46-
private static final String[] BRAND_ID_NUBIA = { "nubia" };
46+
private static final String[] BRAND_ID_LOWER_CASE_NUBIA = { "nubia" };
4747

4848
private static final String BRAND_NAME_SAMSUNG = "Samsung";
49-
private static final String[] BRAND_ID_SAMSUNG = { "samsung" };
49+
private static final String[] BRAND_ID_LOWER_CASE_SAMSUNG = { "samsung" };
5050

5151
private static final String BRAND_NAME_HONOR = "Honor";
52-
private static final String[] BRAND_ID_HONOR = { "honor" };
52+
private static final String[] BRAND_ID_LOWER_CASE_HONOR = { "honor" };
5353

5454
private static final String BRAND_NAME_SMARTISAN = "Smartisan";
55-
private static final String[] BRAND_ID_SMARTISAN = { "smartisan", "deltainno" };
55+
private static final String[] BRAND_ID_LOWER_CASE_SMARTISAN = { "smartisan", "deltainno" };
5656

5757
private static final String BRAND_NAME_COOLPAD = "CoolPad";
58-
private static final String[] BRAND_ID_COOLPAD = { "coolpad", "yulong", "cp" };
58+
private static final String[] BRAND_ID_LOWER_CASE_COOLPAD = { "coolpad", "yulong", "cp" };
5959

6060
private static final String BRAND_NAME_LG = "LG";
61-
private static final String[] BRAND_ID_LG = { "lg", "lge" };
61+
private static final String[] BRAND_ID_LOWER_CASE_LG = { "lg", "lge" };
6262

6363
private static final String BRAND_NAME_GOOGLE = "Google";
64-
private static final String[] BRAND_ID_GOOGLE = { "google" };
64+
private static final String[] BRAND_ID_LOWER_CASE_GOOGLE = { "google" };
6565

6666
private static final String BRAND_NAME_MEIZU = "MeiZu";
67-
private static final String[] BRAND_ID_MEIZU = { "meizu" };
67+
private static final String[] BRAND_ID_LOWER_CASE_MEIZU = { "meizu" };
6868

6969
private static final String BRAND_NAME_LENOVO = "Lenovo";
70-
private static final String[] BRAND_ID_LENOVO = { "lenovo", "ZUK" };
70+
private static final String[] BRAND_ID_LOWER_CASE_LENOVO = { "lenovo", "zuk" };
7171

7272
private static final String BRAND_NAME_HTC = "HTC";
73-
private static final String[] BRAND_ID_HTC = { "htc" };
73+
private static final String[] BRAND_ID_LOWER_CASE_HTC = { "htc" };
7474

7575
private static final String BRAND_NAME_SONY = "Sony";
76-
private static final String[] BRAND_ID_SONY = { "sony" };
76+
private static final String[] BRAND_ID_LOWER_CASE_SONY = { "sony" };
7777

7878
private static final String BRAND_NAME_GIONEE = "Gionee";
79-
private static final String[] BRAND_ID_GIONEE = { "gionee", "amigo" };
79+
private static final String[] BRAND_ID_LOWER_CASE_GIONEE = { "gionee", "amigo" };
8080

8181
private static final String BRAND_NAME_MOTOROLA = "Motorola";
82-
private static final String[] BRAND_ID_MOTOROLA = { "motorola" };
82+
private static final String[] BRAND_ID_LOWER_CASE_MOTOROLA = { "motorola" };
8383

8484
private static final String BRAND_NAME_ASUS = "Asus";
85-
private static final String[] BRAND_ID_ASUS = { "asus" };
85+
private static final String[] BRAND_ID_LOWER_CASE_ASUS = { "asus" };
8686

8787
private static final String BRAND_NAME_TRANSSION = "Transsion";
88-
private static final String[] BRAND_ID_TRANSSION = { "INFINIX MOBILITY LIMITED", "itel", "TECNO" };
88+
private static final String[] BRAND_ID_LOWER_CASE_TRANSSION = { "infinix mobility limited", "itel", "tecno" };
8989

9090
private static final String BRAND_NAME_DOOV = "DOOV";
91-
private static final String[] BRAND_ID_DOOV = { "DOOV" };
91+
private static final String[] BRAND_ID_LOWER_CASE_DOOV = { "DOOV" };
9292

9393
private static final String BRAND_NAME_PHILIPS = "Philips";
94-
private static final String[] BRAND_ID_PHILIPS = { "Philips" };
94+
private static final String[] BRAND_ID_LOWER_CASE_PHILIPS = { "philips" };
9595

9696
private static final String BRAND_NAME_BLACKSHARK = "BlackShark";
97-
private static final String[] BRAND_ID_BLACKSHARK = { "blackshark" };
97+
private static final String[] BRAND_ID_LOWER_CASE_BLACKSHARK = { "blackshark" };
9898

9999
private static final String BRAND_NAME_HISENSE = "Hisense";
100-
private static final String[] BRAND_ID_HISENSE = { "Hisense" };
100+
private static final String[] BRAND_ID_LOWER_CASE_HISENSE = { "hisense" };
101101

102102
private static final String BRAND_NAME_KTOUCH = "K-Touch";
103-
private static final String[] BRAND_ID_KTOUCH = { "K-Touch", "KTOUCH" };
103+
private static final String[] BRAND_ID_LOWER_CASE_KTOUCH = { "k-touch", "ktouch" };
104104

105-
private static final String BRAND_NAME_MEITU = "Meitu";
106-
private static final String[] BRAND_ID_MEITU = { "Meitu" };
105+
private static final String BRAND_NAME_MEITU = "MeiTu";
106+
private static final String[] BRAND_ID_LOWER_CASE_MEITU = { "meitu" };
107107

108108
private static final String BRAND_NAME_NOKIA = "Nokia";
109-
private static final String[] BRAND_ID_NOKIA = { "Nokia" };
109+
private static final String[] BRAND_ID_LOWER_CASE_NOKIA = { "nokia" };
110110

111111
@NonNull
112112
private static final String CURRENT_BRAND_NAME;
@@ -115,69 +115,69 @@ public final class DeviceBrand {
115115
String brand = Build.BRAND.toLowerCase();
116116
String manufacturer = Build.MANUFACTURER.toLowerCase();
117117

118-
if (compareBrand(brand, manufacturer, BRAND_ID_HUAWEI)) {
118+
if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_HUAWEI)) {
119119
CURRENT_BRAND_NAME = BRAND_NAME_HUAWEI;
120-
} else if (compareBrand(brand, manufacturer, BRAND_ID_VIVO)) {
120+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_VIVO)) {
121121
CURRENT_BRAND_NAME = BRAND_NAME_VIVO;
122-
} else if (compareBrand(brand, manufacturer, BRAND_ID_XIAOMI)) {
122+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_XIAOMI)) {
123123
CURRENT_BRAND_NAME = BRAND_NAME_XIAOMI;
124-
} else if (compareBrand(brand, manufacturer, BRAND_ID_REDMI)) {
124+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_REDMI)) {
125125
CURRENT_BRAND_NAME = BRAND_NAME_REDMI;
126-
} else if (compareBrand(brand, manufacturer, BRAND_ID_OPPO)) {
126+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_OPPO)) {
127127
CURRENT_BRAND_NAME = BRAND_NAME_OPPO;
128-
} else if (compareBrand(brand, manufacturer, BRAND_ID_REALME)) {
128+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_REALME)) {
129129
CURRENT_BRAND_NAME = BRAND_NAME_REALME;
130-
} else if (compareBrand(brand, manufacturer, BRAND_ID_LEECO)) {
130+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_LEECO)) {
131131
CURRENT_BRAND_NAME = BRAND_NAME_LEECO;
132-
} else if (compareBrand(brand, manufacturer, BRAND_ID_360)) {
132+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_360)) {
133133
CURRENT_BRAND_NAME = BRAND_NAME_360;
134-
} else if (compareBrand(brand, manufacturer, BRAND_ID_ZTE)) {
134+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_ZTE)) {
135135
CURRENT_BRAND_NAME = BRAND_NAME_ZTE;
136-
} else if (compareBrand(brand, manufacturer, BRAND_ID_ONEPLUS)) {
136+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_ONEPLUS)) {
137137
CURRENT_BRAND_NAME = BRAND_NAME_ONEPLUS;
138-
} else if (compareBrand(brand, manufacturer, BRAND_ID_NUBIA)) {
138+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_NUBIA)) {
139139
CURRENT_BRAND_NAME = BRAND_NAME_NUBIA;
140-
} else if (compareBrand(brand, manufacturer, BRAND_ID_SAMSUNG)) {
140+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_SAMSUNG)) {
141141
CURRENT_BRAND_NAME = BRAND_NAME_SAMSUNG;
142-
} else if (compareBrand(brand, manufacturer, BRAND_ID_HONOR)) {
142+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_HONOR)) {
143143
CURRENT_BRAND_NAME = BRAND_NAME_HONOR;
144-
} else if (compareBrand(brand, manufacturer, BRAND_ID_SMARTISAN)) {
144+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_SMARTISAN)) {
145145
CURRENT_BRAND_NAME = BRAND_NAME_SMARTISAN;
146-
} else if (compareBrand(brand, manufacturer, BRAND_ID_COOLPAD)) {
146+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_COOLPAD)) {
147147
CURRENT_BRAND_NAME = BRAND_NAME_COOLPAD;
148-
} else if (compareBrand(brand, manufacturer, BRAND_ID_LG)) {
148+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_LG)) {
149149
CURRENT_BRAND_NAME = BRAND_NAME_LG;
150-
} else if (compareBrand(brand, manufacturer, BRAND_ID_GOOGLE)) {
150+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_GOOGLE)) {
151151
CURRENT_BRAND_NAME = BRAND_NAME_GOOGLE;
152-
} else if (compareBrand(brand, manufacturer, BRAND_ID_MEIZU)) {
152+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_MEIZU)) {
153153
CURRENT_BRAND_NAME = BRAND_NAME_MEIZU;
154-
} else if (compareBrand(brand, manufacturer, BRAND_ID_LENOVO)) {
154+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_LENOVO)) {
155155
CURRENT_BRAND_NAME = BRAND_NAME_LENOVO;
156-
} else if (compareBrand(brand, manufacturer, BRAND_ID_HTC)) {
156+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_HTC)) {
157157
CURRENT_BRAND_NAME = BRAND_NAME_HTC;
158-
} else if (compareBrand(brand, manufacturer, BRAND_ID_SONY)) {
158+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_SONY)) {
159159
CURRENT_BRAND_NAME = BRAND_NAME_SONY;
160-
} else if (compareBrand(brand, manufacturer, BRAND_ID_GIONEE)) {
160+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_GIONEE)) {
161161
CURRENT_BRAND_NAME = BRAND_NAME_GIONEE;
162-
} else if (compareBrand(brand, manufacturer, BRAND_ID_MOTOROLA)) {
162+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_MOTOROLA)) {
163163
CURRENT_BRAND_NAME = BRAND_NAME_MOTOROLA;
164-
} else if (compareBrand(brand, manufacturer, BRAND_ID_ASUS)) {
164+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_ASUS)) {
165165
CURRENT_BRAND_NAME = BRAND_NAME_ASUS;
166-
} else if (compareBrand(brand, manufacturer, BRAND_ID_TRANSSION)) {
166+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_TRANSSION)) {
167167
CURRENT_BRAND_NAME = BRAND_NAME_TRANSSION;
168-
} else if (compareBrand(brand, manufacturer, BRAND_ID_DOOV)) {
168+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_DOOV)) {
169169
CURRENT_BRAND_NAME = BRAND_NAME_DOOV;
170-
} else if (compareBrand(brand, manufacturer, BRAND_ID_PHILIPS)) {
170+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_PHILIPS)) {
171171
CURRENT_BRAND_NAME = BRAND_NAME_PHILIPS;
172-
} else if (compareBrand(brand, manufacturer, BRAND_ID_BLACKSHARK)) {
172+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_BLACKSHARK)) {
173173
CURRENT_BRAND_NAME = BRAND_NAME_BLACKSHARK;
174-
} else if (compareBrand(brand, manufacturer, BRAND_ID_HISENSE)) {
174+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_HISENSE)) {
175175
CURRENT_BRAND_NAME = BRAND_NAME_HISENSE;
176-
} else if (compareBrand(brand, manufacturer, BRAND_ID_KTOUCH)) {
176+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_KTOUCH)) {
177177
CURRENT_BRAND_NAME = BRAND_NAME_KTOUCH;
178-
} else if (compareBrand(brand, manufacturer, BRAND_ID_MEITU)) {
178+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_MEITU)) {
179179
CURRENT_BRAND_NAME = BRAND_NAME_MEITU;
180-
} else if (compareBrand(brand, manufacturer, BRAND_ID_NOKIA)) {
180+
} else if (compareBrand(brand, manufacturer, BRAND_ID_LOWER_CASE_NOKIA)) {
181181
CURRENT_BRAND_NAME = BRAND_NAME_NOKIA;
182182
} else {
183183
if (!TextUtils.isEmpty(brand)) {

0 commit comments

Comments
 (0)