Skip to content

Commit bdba097

Browse files
committed
refactor: 更新部分 equalsIgnoreCase 判断代码
1 parent 31541ca commit bdba097

File tree

7 files changed

+27
-15
lines changed

7 files changed

+27
-15
lines changed

interesting/DevStandard/src/main/java/dev/standard/ColorSortMain.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void startElement(
175175
)
176176
throws SAXException {
177177
super.startElement(uri, localName, qName, attributes);
178-
if (qName.equals("color")) {
178+
if ("color".equals(qName)) {
179179
this.colorKey = attributes.getValue("name");
180180
}
181181
}
@@ -188,7 +188,7 @@ public void endElement(
188188
)
189189
throws SAXException {
190190
super.endElement(uri, localName, qName);
191-
if (qName.equals("color")) {
191+
if ("color".equals(qName)) {
192192
lists.add(new ColorUtils.ColorInfo(colorKey, colorValue));
193193
}
194194
}
@@ -202,7 +202,7 @@ public void characters(
202202
throws SAXException {
203203
super.characters(ch, start, length);
204204
String value = new String(ch, start, length).trim();
205-
if (!value.equals("")) {
205+
if (!"".equals(value)) {
206206
this.colorValue = value; // 可设置全部值转大写、小写
207207
}
208208
}

interesting/DevStandard/src/main/java/dev/standard/generate/IntentDataJavaGenerateMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static void main(String[] args) {
9696
String nameUpperCase = name.toUpperCase();
9797

9898
// class 特殊处理防止 getClass
99-
if (finalName.equalsIgnoreCase("class")) {
99+
if ("class".equalsIgnoreCase(finalName)) {
100100
finalName = finalName.toUpperCase();
101101
}
102102

interesting/DevStandard/src/main/java/dev/standard/generate/IntentDataKotlinGenerateMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static void main(String[] args) {
9696
String nameUpperCase = name.toUpperCase();
9797

9898
// class 特殊处理防止 getClass
99-
if (finalName.equalsIgnoreCase("class")) {
99+
if ("class".equalsIgnoreCase(finalName)) {
100100
finalName = finalName.toUpperCase();
101101
}
102102

interesting/DevStandard/src/main/java/dev/standard/generate/StateGenerateMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static void main(String[] args) {
151151
.append(START_SET_STR);
152152
// 循环变量名
153153
for (String name : lists) {
154-
if (name.equalsIgnoreCase("base")) continue;
154+
if ("base".equalsIgnoreCase(name)) continue;
155155
if (name.contains("_BASE")) continue;
156156
if (name.contains("_base")) continue;
157157
// 获取注释

lib/DevApp/src/main/java/dev/utils/app/NetWorkUtils.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,16 +428,12 @@ public static NetworkType getNetworkType() {
428428
// 判断子类名字
429429
String subtypeName = networkInfo.getSubtypeName();
430430
// = 3G 网络 =
431-
if (subtypeName.equalsIgnoreCase("TD-SCDMA")
432-
|| subtypeName.equalsIgnoreCase("WCDMA")
433-
|| subtypeName.equalsIgnoreCase("CDMA2000")) {
431+
if ("TD-SCDMA".equalsIgnoreCase(subtypeName)
432+
|| "WCDMA".equalsIgnoreCase(subtypeName)
433+
|| "CDMA2000".equalsIgnoreCase(subtypeName)) {
434434
netType = NetworkType.NETWORK_3G;
435-
} else {
436-
netType = NetworkType.NETWORK_UNKNOWN;
437435
}
438-
} catch (Exception e) {
439-
// 保存未知
440-
netType = NetworkType.NETWORK_UNKNOWN;
436+
} catch (Exception ignored) {
441437
}
442438
break;
443439
}

lib/DevApp/src/main/java/dev/utils/app/PhoneUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static int checkSimCountry() {
180180
// 截取前面两位属于 zh 表示属于中国
181181
String country = countryCode.substring(0, 2);
182182
// 如果属于 cn 表示属于国内
183-
if (country.equalsIgnoreCase("cn")) {
183+
if ("cn".equalsIgnoreCase(country)) {
184184
return 1;
185185
} else {
186186
return 2;

lib/DevApp/src/main/java/dev/utils/common/StringUtils.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,22 @@ public static <T> boolean equals(
232232
return ObjectUtils.equals(value1, value2);
233233
}
234234

235+
/**
236+
* 判断两个值是否一样 ( 非 null 判断 )
237+
* @param value1 第一个值
238+
* @param value2 第二个值
239+
* @param <T> 泛型
240+
* @return {@code true} yes, {@code false} no
241+
*/
242+
public static <T> boolean equalsNotNull(
243+
final T value1,
244+
final T value2
245+
) {
246+
return value1 != null && ObjectUtils.equals(value1, value2);
247+
}
248+
249+
// =
250+
235251
/**
236252
* 判断多个字符串是否相等, 只有全相等才返回 true ( 对比大小写 )
237253
* @param args 待校验的字符串数组

0 commit comments

Comments
 (0)