From 83bbb7b7b4bc65b8a4c0e85717273eb290c615b1 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Tue, 23 Nov 2021 21:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9A=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/SenderActivity.java | 2 ++ .../idormy/sms/forwarder/model/RuleModel.java | 2 +- .../idormy/sms/forwarder/model/RuleTable.java | 1 + .../forwarder/sender/SenderDingdingMsg.java | 2 +- .../sms/forwarder/sender/SenderFeishuMsg.java | 4 ++-- .../idormy/sms/forwarder/utils/PhoneUtils.java | 3 ++- .../idormy/sms/forwarder/utils/RuleLine.java | 2 +- .../sms/forwarder/utils/RuleLineUtils.java | 2 +- .../sms/forwarder/utils/SettingUtil.java | 2 +- .../idormy/sms/forwarder/utils/TimeUtil.java | 18 +++++++++--------- .../res/layout/alert_dialog_setview_email.xml | 4 ++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index 7d7c4dc7..2bdca0f1 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -748,6 +748,7 @@ public class SenderActivity extends AppCompatActivity { } //企业微信群机器人 + @SuppressWarnings("SpellCheckingInspection") @SuppressLint("SimpleDateFormat") private void setQYWXGroupRobot(final SenderModel senderModel) { QYWXGroupRobotSettingVo qywxGroupRobotSettingVo = null; @@ -832,6 +833,7 @@ public class SenderActivity extends AppCompatActivity { } //企业微信应用 + @SuppressWarnings("SpellCheckingInspection") @SuppressLint({"SimpleDateFormat", "SetTextI18n"}) private void setQYWXApp(final SenderModel senderModel) { QYWXAppSettingVo QYWXAppSettingVo = null; diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/RuleModel.java b/app/src/main/java/com/idormy/sms/forwarder/model/RuleModel.java index 0fba6cfa..c81db250 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/model/RuleModel.java +++ b/app/src/main/java/com/idormy/sms/forwarder/model/RuleModel.java @@ -17,7 +17,7 @@ import java.util.regex.PatternSyntaxException; import lombok.Data; -@SuppressWarnings({"unused", "LoopStatementThatDoesntLoop"}) +@SuppressWarnings({"unused", "SpellCheckingInspection"}) @Data public class RuleModel { public static final String FILED_TRANSPOND_ALL = "transpond_all"; diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/RuleTable.java b/app/src/main/java/com/idormy/sms/forwarder/model/RuleTable.java index 5e9b8080..dd4aec7c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/model/RuleTable.java +++ b/app/src/main/java/com/idormy/sms/forwarder/model/RuleTable.java @@ -9,6 +9,7 @@ public final class RuleTable { } /* Inner class that defines the table contents */ + @SuppressWarnings("SpellCheckingInspection") public static class RuleEntry implements BaseColumns { public static final String TABLE_NAME = "rule"; public static final String COLUMN_NAME_TYPE = "type"; diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java index cb66e92a..e215d374 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java @@ -34,7 +34,7 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -@SuppressWarnings({"ResultOfMethodCallIgnored", "rawtypes", "unchecked", "deprecation"}) +@SuppressWarnings({"ResultOfMethodCallIgnored", "rawtypes", "unchecked", "deprecation", "SpellCheckingInspection"}) public class SenderDingdingMsg extends SenderBaseMsg { static final String TAG = "SenderDingdingMsg"; diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderFeishuMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderFeishuMsg.java index e0473f37..a393000a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderFeishuMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderFeishuMsg.java @@ -30,7 +30,7 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -@SuppressWarnings({"ResultOfMethodCallIgnored", "rawtypes", "unchecked", "deprecation"}) +@SuppressWarnings("ALL") public class SenderFeishuMsg extends SenderBaseMsg { static final String TAG = "SenderFeishuMsg"; @@ -56,7 +56,7 @@ public class SenderFeishuMsg extends SenderBaseMsg { mac.init(new SecretKeySpec(stringToSign.getBytes(StandardCharsets.UTF_8), "HmacSHA256")); byte[] signData = mac.doFinal(new byte[]{}); String sign = new String(Base64.encode(signData, Base64.NO_WRAP)); - + textMsgMap.put("timestamp", timestamp); textMsgMap.put("sign", sign); } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java index e9dd0a11..6c856d28 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java @@ -28,7 +28,7 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -@SuppressWarnings({"deprecation", "rawtypes", "unchecked", "CommentedOutCode", "SynchronizeOnNonFinalField", "unused", "SameReturnValue"}) +@SuppressWarnings({"deprecation", "rawtypes", "unchecked", "CommentedOutCode", "SynchronizeOnNonFinalField", "unused", "SameReturnValue", "SpellCheckingInspection"}) public class PhoneUtils { static Boolean hasInit = false; @SuppressLint("StaticFieldLeak") @@ -530,6 +530,7 @@ public class PhoneUtils { /** * SIM 卡信息 */ + @SuppressWarnings("SpellCheckingInspection") public static class SimInfo { /** * 运营商信息：中国移动 中国联通 中国电信 diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLine.java b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLine.java index d7a3d286..f06a0064 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLine.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLine.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "SpellCheckingInspection"}) class RuleLine { public static final String CONJUNCTION_AND = "并且"; public static final String CONJUNCTION_OR = "或者"; diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLineUtils.java b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLineUtils.java index 9f296818..2f4892d6 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLineUtils.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleLineUtils.java @@ -10,7 +10,7 @@ import com.idormy.sms.forwarder.model.vo.SmsVo; import java.util.Date; import java.util.Scanner; -@SuppressWarnings("unused") +@SuppressWarnings("ALL") public class RuleLineUtils { static final String TAG = "RuleLineUtils"; static Boolean STARTLOG = false; diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java index 362f0db1..59955c63 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java @@ -211,7 +211,7 @@ public class SettingUtil { // 获取PackageManager的实例 PackageManager packageManager = context.getPackageManager(); // getPackageName()是你当前类的包名，0代表是获取版本信息 - PackageInfo packInfo = null; + PackageInfo packInfo; try { packInfo = packageManager.getPackageInfo(context.getPackageName(), 0); return packInfo.versionName; diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/TimeUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/TimeUtil.java index 730f8267..8e31e427 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/TimeUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/TimeUtil.java @@ -11,11 +11,11 @@ public class TimeUtil { //友好时间显示 public static String friendlyTime(String utcTime) { - @SuppressLint("SimpleDateFormat") SimpleDateFormat utcFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - utcFormater.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 + @SuppressLint("SimpleDateFormat") SimpleDateFormat utcFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + utcFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 Date utcDate; try { - utcDate = utcFormater.parse(utcTime); + utcDate = utcFormatter.parse(utcTime); } catch (ParseException e) { e.printStackTrace(); return utcTime; @@ -59,21 +59,21 @@ public class TimeUtil { public static String utc2Local(String utcTime) { String utcTimePatten = "yyyy-MM-dd HH:mm:ss"; String localTimePatten = "yyyy-MM-dd HH:mm:ss"; - @SuppressLint("SimpleDateFormat") SimpleDateFormat utcFormater = new SimpleDateFormat(utcTimePatten); - utcFormater.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 + @SuppressLint("SimpleDateFormat") SimpleDateFormat utcFormatter = new SimpleDateFormat(utcTimePatten); + utcFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取 Date utcDate; try { - utcDate = utcFormater.parse(utcTime); + utcDate = utcFormatter.parse(utcTime); } catch (ParseException e) { e.printStackTrace(); return utcTime; } - @SuppressLint("SimpleDateFormat") SimpleDateFormat localFormater = new SimpleDateFormat(localTimePatten); - localFormater.setTimeZone(TimeZone.getDefault()); + @SuppressLint("SimpleDateFormat") SimpleDateFormat localFormatter = new SimpleDateFormat(localTimePatten); + localFormatter.setTimeZone(TimeZone.getDefault()); assert utcDate != null; - return localFormater.format(utcDate.getTime()); + return localFormatter.format(utcDate.getTime()); } } diff --git a/app/src/main/res/layout/alert_dialog_setview_email.xml b/app/src/main/res/layout/alert_dialog_setview_email.xml index 1ecf20ad..bd1ed081 100644 --- a/app/src/main/res/layout/alert_dialog_setview_email.xml +++ b/app/src/main/res/layout/alert_dialog_setview_email.xml @@ -223,11 +223,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:autofillHints="" - android:inputType="textMultiLine" + android:inputType="text" android:gravity="start|top" android:minLines="1" android:text="" - tools:ignore="LabelFor" /> + tools:ignore="LabelFor,TextFields" />