From 32efe289b5f98f0a6b8a7f24406e42e54de4032a Mon Sep 17 00:00:00 2001
From: Naccl <i@naccl.top>
Date: Wed, 2 Mar 2022 14:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E9=87=8D=E5=8F=91=E6=B6=88=E6=81=AF=E4=B8=ADUTC=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=9C=AA=E8=BD=AC=E6=8D=A2=E6=9C=AC=E5=9C=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20(#122)=20(#127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idormy/sms/forwarder/sender/SendUtil.java   |  7 ++-----
 .../idormy/sms/forwarder/utils/TimeUtil.java    | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java
index d39310b2..2e5c3df1 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java
@@ -14,7 +14,6 @@ import static com.idormy.sms.forwarder.model.SenderModel.TYPE_SMS;
 import static com.idormy.sms.forwarder.model.SenderModel.TYPE_TELEGRAM;
 import static com.idormy.sms.forwarder.model.SenderModel.TYPE_WEB_NOTIFY;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
@@ -41,12 +40,11 @@ import com.idormy.sms.forwarder.utils.LogUtil;
 import com.idormy.sms.forwarder.utils.NetUtil;
 import com.idormy.sms.forwarder.utils.RuleUtil;
 import com.idormy.sms.forwarder.utils.SettingUtil;
+import com.idormy.sms.forwarder.utils.TimeUtil;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 public class SendUtil {
     private static final String TAG = "SendUtil";
@@ -98,10 +96,9 @@ public class SendUtil {
      */
     public static void resendMsgByLog(Context context, Handler handler, LogVo logVo) {
         Log.d(TAG, logVo.toString());
-        @SuppressLint("SimpleDateFormat") SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
         Date date = new Date();
         try {
-            date = sdf.parse(logVo.getTime());
+            date = TimeUtil.utc2LocalDate(logVo.getTime());
         } catch (ParseException e) {
             Log.e(TAG, "SimpleDateFormat parse error", e);
         }
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 b91ce92f..f531bde2 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
@@ -57,15 +57,26 @@ public class TimeUtil {
      * @param utcTime UTC时间
      * @return 本地时间格式的时间
      */
-    public static String utc2Local(String utcTime) {
+    public static Date utc2LocalDate(String utcTime) throws ParseException {
         String utcTimePatten = "yyyy-MM-dd HH:mm:ss";
-        String localTimePatten = "yyyy-MM-dd HH:mm:ss";
         @SuppressLint("SimpleDateFormat") SimpleDateFormat utcFormatter = new SimpleDateFormat(utcTimePatten);
         utcFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));//时区定义并进行时间获取
 
+        return utcFormatter.parse(utcTime);
+    }
+
+    /**
+     * 函数功能描述:UTC时间转本地时间格式
+     *
+     * @param utcTime UTC时间
+     * @return 本地时间格式的时间
+     */
+    public static String utc2Local(String utcTime) {
+        String localTimePatten = "yyyy-MM-dd HH:mm:ss";
+
         Date utcDate;
         try {
-            utcDate = utcFormatter.parse(utcTime);
+            utcDate = utc2LocalDate(utcTime);
         } catch (ParseException e) {
             e.printStackTrace();
             return utcTime;