From: k.liang <liangkang648253071@126.com>
Date: Tue, 8 Mar 2022 02:59:18 +0000 (+0800)
Subject: gator-解决app设置时区时，只需要设置时区，不需要设置时间了
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e1ba673efcd395cfc5582c43c08dc3ce613f242a;p=icsupport.git

gator-解决app设置时区时，只需要设置时区，不需要设置时间了
---

diff --git a/app/release/output.json b/app/release/output.json
index 1bd6b95f..e5a35bc8 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1044,"versionName":"2201221723","enabled":true,"outputFile":"ICSer_V1044_2201221723_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1044_2201221723_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1055,"versionName":"2203081057","enabled":true,"outputFile":"ICSer_V1055_2203081057_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1055_2203081057_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
index ae95e04c..22135b89 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
@@ -291,6 +291,7 @@ public class TimeUtil {
 
         ICLogger.i("====origin time " + c.getTime().toString() + " time zone " + c.getTimeZone());
         c.setTime(datetime);
+        ICLogger.i("Calendar setTime = "+datetime.toString());
         int timezonehours = 0;
         int timezoneminutes = 0;
         try {
@@ -419,7 +420,14 @@ public class TimeUtil {
         }
         ICLogger.i("====set timezone " + timezone_name);
         //TimeZone tz = TimeZone.getTimeZone(timezone_name);
-        updateTimeZone(context, timezone_name);
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
+        ICLogger.d("updateTimeZone:" + timezone_name);
+        if (timezone_name == null) {
+            ICLogger.d("updateTimeZone name is null");
+            return;
+        }
+        alarmManager.setTimeZone(timezone_name);
+        //updateTimeZone(context, timezone_name);
     }
 
     //当前设置timezone的方式，与语言选择方法一致。
diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java
index 30aa43dc..02aa80d4 100644
--- a/app/src/main/java/com/ic/protocols/protocol_gator.java
+++ b/app/src/main/java/com/ic/protocols/protocol_gator.java
@@ -43,6 +43,7 @@ import com.enqualcomm.support.utils.regexUtil;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -524,12 +525,18 @@ public class protocol_gator {
                 //  Date timezone = TimeUtil.parsetiime(msg[3].substring(1));
 
                 if (datetime != null) {
-                    ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
+                    ICLogger.i("===1" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, msg[3]);
+                    Thread.sleep(500);
+                    ICLogger.i("===2" + TimeUtil.getDefaultTimeZone());
 
-                    ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
-                    TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, msg[3], true);
-                    ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+                    Date date = new Date(System.currentTimeMillis());
+                    ICLogger.i("当前日期时间"+simpleDateFormat.format(date));
+
+
+//                    TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, msg[3], true);
+//                    ICLogger.i("===3" + TimeUtil.getDefaultTimeZone());
                     updateIcSettingsValue("TIMEZONE_CHANGED","00");
                     connection.send(BPXX_REPLY(runtime, CMD_TYPE.BP03, index, true));
                 } else {
@@ -537,7 +544,6 @@ public class protocol_gator {
                 }
             } catch (Exception e) {
                 ICLogger.e(e.getMessage(), e);
-
                 connection.send(BPXX_REPLY(runtime, CMD_TYPE.BP03, index, false));
             }
 //            Set Datetime 20200505112734
@@ -1760,10 +1766,15 @@ SOS报警上行WIFI、LBS混合定位数据,步数为255步,电量等级5，数
             while (i > 0) {
                 i--;
                 //1是视频通话，0是语音通话
+                ICLogger.i("isComeIn = "+isComeIn);
+                ICLogger.i("fzdCallback.getBroadcastItem(i) = "+fzdCallback.getBroadcastItem(i));
+                ICLogger.i("isComeIn = "+isComeIn);
                 if(isComeIn){
                     fzdCallback.getBroadcastItem(i).onCallingByUserName(userName, channel, "1", token);
+                    ICLogger.i("onCallingByUserName send end");
                 }else {
                     fzdCallback.getBroadcastItem(i).onResultServerMsg(userName, channel, token);
+                    ICLogger.i("onResultServerMsg send end");
                 }
             }
         } catch (Exception e) {
@@ -1771,6 +1782,7 @@ SOS报警上行WIFI、LBS混合定位数据,步数为255步,电量等级5，数
         } finally {
             fzdCallback.finishBroadcast();
         }
+        ICLogger.i("dispatchAP50 send end");
     }
 
     public static void takeCallEnd(Runtime runtime){
diff --git a/app/version_code.properties b/app/version_code.properties
index 61acde9a..dff37522 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jan 22 17:23:01 CST 2022
-VERSION_CODE=1044
+#Tue Mar 08 10:57:13 CST 2022
+VERSION_CODE=1055