修改了时区的设置和获取零时区的时间
authorTrillGates <williamtrillgates@gmail.com>
Thu, 3 Mar 2022 06:23:34 +0000 (14:23 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Thu, 3 Mar 2022 06:23:34 +0000 (14:23 +0800)
app/release/output.json [deleted file]
app/src/main/java/com/enqualcomm/support/NMEAListener.java
app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
app/src/main/java/com/enqualcomm/support/utils/Util.java
app/src/main/java/com/ic/protocols/protocol_anan.java
app/src/main/java/com/ic/protocols/protocol_beehome.java
app/src/main/java/com/ic/protocols/protocol_gator.java
app/src/main/java/com/ic/protocols/protocol_ic.java
app/src/main/java/com/ic/protocols/protocol_jiai.java
app/src/main/java/com/ic/protocols/protocol_s123.java
app/version_code.properties

diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644 (file)
index 1f73e6d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":951,"versionName":"2202171906","enabled":true,"outputFile":"ICSer_V951_2202171906_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V951_2202171906_release.apk","properties":{}}]
\ No newline at end of file
index 425ea72..6c0afa1 100644 (file)
@@ -390,10 +390,10 @@ public class NMEAListener implements NmeaListener, LocationListener {
                         ICLogger.logToFile("GPS", "HDOP is larger than " + ICLocation.MAX_HDOP + " , skip this location!");
                 }
                 if (locationFixedCount > MaxFixedTimes) {
-               /*
-                只有当前GPS已经定位,且location不为空才给 runtime赋值GPS坐标。
-                延迟MaxFixedTimes秒后才设置runtime的定位标志,以便稳定坐标值。
-              */
+                       /*
+                        只有当前GPS已经定位,且location不为空才给 runtime赋值GPS坐标。
+                        延迟MaxFixedTimes秒后才设置runtime的定位标志,以便稳定坐标值。
+                      */
                     runtime.getLocationInstance().setLocation(Lat, lon);
                     runtime.getLocationInstance().setLocationGPS(strLatitude, strLongitude);
                     runtime.getLocationInstance().setLocationlatlonName(latname, lonname);
index 39eee1f..ee41777 100644 (file)
@@ -2,11 +2,14 @@ package com.enqualcomm.support.utils;
 
 import android.app.AlarmManager;
 import android.content.Context;
+import android.os.Handler;
 import android.provider.Settings;
 import android.text.format.DateFormat;
+import android.util.Log;
 
 import com.ic.iclooger.ICLogger;
 
+import java.sql.Time;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -97,7 +100,9 @@ public class TimeUtil {
     public static String getUTCSystemTimeHHmmss() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HHmmss");
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
-        return simpleDateFormat.format(new Date());
+        String format = simpleDateFormat.format(new Date());
+        ICLogger.d("getUTCSystemTimeHHmmss ==>   " + format);
+        return format;
     }
 
     public static Date parsetiime(String time) {
@@ -138,19 +143,27 @@ public class TimeUtil {
 
     }
 
-    public static Date parseDatetiime(String datetimeStr) {
+
+    public static Date parseDatetiime(String datetimeStr, TimeZone timeZone) {
 
 //    SimpleDateFormat dff = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.ENGLISH);//输入的被转化的时间格式
 //    SimpleDateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//需要转化成的时间格式
 //    SimpleDateFormat df2 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         SimpleDateFormat df3 = new SimpleDateFormat("yyyyMMddHHmmss");
+        df3.setTimeZone(timeZone);
         Date date1 = null;
         try {
+            String id = timeZone.getID();
+            ICLogger.d("format id ==> " + id);
             date1 = df3.parse(datetimeStr);
+            ICLogger.d(datetimeStr + " date1 ==> " + date1.getTime());
+            long time = date1.getTime();
+            String format = df3.format(time);
+            ICLogger.d("format ==> " + format);
             return date1;
         } catch (ParseException e) {
             e.printStackTrace();
-            ICLogger.e(e.getMessage(), e);
+            Log.d("test", e.getMessage(), e);
             return null;
         }
 //    String str1 = df1.format(date1);
@@ -158,6 +171,7 @@ public class TimeUtil {
 
     }
 
+
     /**
      * 根据当前日期获得是星期几
      *
@@ -332,57 +346,72 @@ public class TimeUtil {
 
     }
 
+
     public static void setSysDateTime(Context mContext, Date datetime, int timezone, boolean addtimezoneToTime) {
+        //Log.d(TAG, "set tm="+when + ", now tm="+now);
+        ICLogger.d("timezone ==> " + timezone);
+        Calendar d = Calendar.getInstance();
+        ICLogger.d("====before " + d.getTime().toString() + " time zone " + d.getTimeZone());
+        doTimeSet(mContext, datetime, timezone, addtimezoneToTime);
+        Calendar c = Calendar.getInstance();
+        ICLogger.d("====aftert " + c.getTime().toString() + " time zone " + c.getTimeZone());
+        //当前系统时间
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long l = System.currentTimeMillis();
+        ICLogger.d("current time ==> " + l);
+        TimeZone timeZone = simpleDateFormat.getTimeZone();
+        ICLogger.d("timeZone after ==> " + timeZone.getID());
+        String format = simpleDateFormat.format(l);
+        ICLogger.d("format == " + format);
+        String utcSystemTimeHHmmss = getUTCSystemTimeHHmmss();
+        ICLogger.d("utcSystemTimeHHmmss ==> " + utcSystemTimeHHmmss);
+    }
 
+
+    private static void doTimeSet(Context mContext, Date datetime, int timezone, boolean addtimezoneToTime) {
         AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
-        Locale.getDefault().getDisplayCountry();
         String timezone_name = "";
         if (timezone > 0) {
             timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
         } else {
             timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
         }
-        TimeZone tz = TimeZone.getTimeZone(timezone_name);
-        ICLogger.i("====set timezone " + tz.getDisplayName());
+        ICLogger.d("dataTime ==> " + datetime.getTime());
+        ICLogger.d("timezone_name ==> " + timezone_name);
+        Date date = convertTimezone(datetime, TimeZone.getTimeZone(timezone_name));
+        long time = date.getTime();
+        ICLogger.d("time ==> " + time);
+        alarmManager.setTimeZone(timezone_name);
+        alarmManager.setTime(time);
+    }
 
-        Calendar c = Calendar.getInstance();
+    public static Date convertTimezone(Date sourceDate, TimeZone targetTimezone) {
 
-        ICLogger.i("====origin time " + c.getTime().toString() + " time zone " + c.getTimeZone());
-        //先设置为0时区,然后设置时间
-        TimeZone defaultTimeZone = TimeZone.getTimeZone("GMT-00:00");
-        c.setTimeZone(defaultTimeZone);
-        c.setTime(datetime);
-        long defaultTime = c.getTimeInMillis();
-        ICLogger.d("defaultTime ==> " + defaultTime);
-        if (addtimezoneToTime) {
-            if (is24Hour(mContext)) {
-                c.add(Calendar.HOUR_OF_DAY, timezone);//24小时制
-            } else {
-                c.add(Calendar.HOUR, timezone);//12小时制
-            }
-            c.setTimeZone(tz);
-        }
 
-        //alarmManager.setTimeZone();
-        long when = c.getTimeInMillis();
-        ICLogger.d("addtimezoneToTime==> " + addtimezoneToTime + "after when ==> " + when);
-        if (when / 1000 < Integer.MAX_VALUE) {
-            //SystemClock.setCurrentTimeMillis(when);
-            alarmManager.setTime(when);
-        }
+        // targetDate - sourceDate=targetTimezone-sourceTimezone
+        // --->
+        // targetDate=sourceDate + (targetTimezone-sourceTimezone)
 
-        Calendar d = Calendar.getInstance();
-        long now = d.getTimeInMillis();
-        //Log.d(TAG, "set tm="+when + ", now tm="+now);
 
-        if (now - when > 1000) {
-            ICLogger.i("====set time failed now(" + now + ")-when(" + when + ") > 1000 !");
-        }
+        Calendar calendar = Calendar.getInstance();
+        // date.getTime() 为时间戳, 为格林尼治到系统现在的时间差,世界各个地方获取的时间戳是一样的,
+        // 格式化输出时,因为设置了不同的时区,所以输出不一样
+        long sourceTime = sourceDate.getTime();
 
-        ICLogger.i("====set time to " + d.getTime().toString() + " time zone " + d.getTimeZone());
+
+        calendar.setTimeZone(targetTimezone);
+        calendar.setTimeInMillis(sourceTime);// 设置之后,calendar会计算各种filed对应的值,并保存
+
+        //获取源时区的到UTC的时区差
+        int sourceZoneOffset = calendar.get(Calendar.ZONE_OFFSET);
+        ICLogger.d("sourceZoneOffset ==> " + sourceZoneOffset);
+        long targetTime = sourceTime + sourceZoneOffset;
+        ICLogger.d("targetTime ==> " + targetTime);
+        return new Date(targetTime);
 
     }
 
+
     public static void setSysDateTime(Context mContext, Date datetime, int timezone) {
 
         setSysDateTime(mContext, datetime, timezone, true);
@@ -532,8 +561,8 @@ public class TimeUtil {
     }
 
     public static long diffBetween2DateInMinutes(String dateBefore_yyyyMMDDhhmmss, String dateAfter_yyyyMMDDhhmmss) {
-        long date1_ms = parseDatetiime(dateBefore_yyyyMMDDhhmmss).getTime();
-        long date2_ms = parseDatetiime(dateAfter_yyyyMMDDhhmmss).getTime();
+        long date1_ms = parseDatetiime(dateBefore_yyyyMMDDhhmmss, TimeZone.getDefault()).getTime();
+        long date2_ms = parseDatetiime(dateAfter_yyyyMMDDhhmmss, TimeZone.getDefault()).getTime();
         return (date2_ms - date1_ms) / 60000;
     }
 
index c509d69..df87bfc 100644 (file)
@@ -46,6 +46,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -120,7 +121,7 @@ public class Util {
                 String datetime = list[1];
                 String txtmsg = list[2];
 
-                long lasttime_inms = System.currentTimeMillis() - TimeUtil.parseDatetiime(datetime).getTime();
+                long lasttime_inms = System.currentTimeMillis() - TimeUtil.parseDatetiime(datetime, TimeZone.getDefault()).getTime();
                 ICLogger.i("有消息" + lasttime_inms / 1000 + "秒未读!");
                 if ((lasttime_inms > 8 * 60 * 1000 && lasttime_inms <= 13 * 60 * 1000)  //在10分钟,20分钟时都提醒一次。
                         || (lasttime_inms > 18 * 60 * 1000 && lasttime_inms <= 23 * 60 * 1000)) {
index bbefaea..b48c270 100644 (file)
@@ -52,6 +52,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
@@ -971,8 +972,15 @@ public class protocol_anan {
             ICLogger.d("handleBP00 Set TimeZone " + msg[2]);
 
             try {
-                Date datetime = TimeUtil.parseDatetiime(msg[1]);
                 int timezone = Integer.parseInt(msg[2]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
+
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime(msg[1], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
index d3a100a..ae76b29 100644 (file)
@@ -49,6 +49,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE;
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;
@@ -612,8 +613,6 @@ public class protocol_beehome {
                         .append(",packetCount = ").append(packetCount)
                         .append(",currentId = ").append(currentId)
                         .append(",packetLen = ").append(packetLen);
-
-
                 log(stringBuffer.toString());
                 return packetLen;
             } catch (Exception e) {
@@ -650,8 +649,15 @@ public class protocol_beehome {
             log("handleBP00", "Set TimeZone " + msg[2]);
 
             try {
-                Date datetime = TimeUtil.parseDatetiime(msg[1]);
                 int timezone = Integer.parseInt(msg[2]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
+
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime(msg[1], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     //TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
index ffea2cf..33a9879 100644 (file)
@@ -36,6 +36,7 @@ import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP;
@@ -446,9 +447,15 @@ public class protocol_gator {
             log("handleBP00", "Set TimeZone " + msg[3]);
             String index = msg[4];
             try {
-                Date datetime = TimeUtil.parseDatetiime("20" + msg[1] + msg[2]);
-                //  Date timezone = TimeUtil.parsetiime(msg[3].substring(1));
+                int timezone = Integer.parseInt(msg[3]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
 
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime("20" + msg[1] + msg[2], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, msg[3]);
index 4804cfb..60baec9 100644 (file)
@@ -39,6 +39,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;
 import static com.enqualcomm.support.Constants.FROM_SERVER;
@@ -479,8 +480,15 @@ public class protocol_ic {
             log("handleBP00", "Set Datetime " + msg[1]);
             log("handleBP00", "Set TimeZone " + msg[2]);
             try {
-                Date datetime = TimeUtil.parseDatetiime(msg[1]);
                 int timezone = Integer.parseInt(msg[2]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
+
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime(msg[1], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
index a628705..5d76bb4 100644 (file)
@@ -26,6 +26,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.LocationClient.LOCATION_MODE;
@@ -368,8 +369,15 @@ public class protocol_jiai {
             log("handleBP00", "Set TimeZone " + msg[2]);
 
             try {
-                Date datetime = TimeUtil.parseDatetiime(msg[1]);
                 int timezone = Integer.parseInt(msg[2]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
+
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime(msg[1], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
@@ -1168,9 +1176,9 @@ public class protocol_jiai {
         //示例数据:IWAP50,36.7,90#
         return genStringMessage(cmdMap.get(CMD_TYPE.AP50),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP50))
-                .append(CMDSPLIT).append(ds.tempInfo.currentBodyTemp)
-                .append(CMDSPLIT).append("100")
-                .append(CMDEND).toString());
+                        .append(CMDSPLIT).append(ds.tempInfo.currentBodyTemp)
+                        .append(CMDSPLIT).append("100")
+                        .append(CMDEND).toString());
 
     }
 
index 87be46d..fe2963b 100644 (file)
@@ -46,6 +46,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE;
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;
@@ -497,8 +498,15 @@ public class protocol_s123 {
             log("handleBP00", "Set Datetime " + msg[1]);
             log("handleBP00", "Set TimeZone " + msg[2]);
             try {
-                Date datetime = TimeUtil.parseDatetiime(msg[1]);
                 int timezone = Integer.parseInt(msg[2]);
+                String timezone_name = "";
+                if (timezone > 0) {
+                    timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone));
+
+                } else {
+                    timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone));
+                }
+                Date datetime = TimeUtil.parseDatetiime(msg[1], TimeZone.getTimeZone(timezone_name));
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
                     TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
index c9b1058..53433a3 100644 (file)
@@ -1,2 +1,2 @@
-#Thu Feb 17 19:06:03 CST 2022\r
-VERSION_CODE=951\r
+#Mon Feb 28 14:28:20 CST 2022\r
+VERSION_CODE=953\r