release 418

添加 persist.sys.customserverip   persist.sys.customserverport  persist.sys.UsingCustomServer 三个环境变量的支持。

diff --git a/app/release/ICSer_V417_2005152102_release.apk b/app/release/ICSer_V417_2005152102_release.apk
deleted file mode 100644 (file)
index 3656bd4..0000000
Binary files a/app/release/ICSer_V417_2005152102_release.apk and /dev/null differ

diff --git a/app/release/ICSer_V418_2005201521_release.apk b/app/release/ICSer_V418_2005201521_release.apk
new file mode 100644 (file)
index 0000000..57c9fab
Binary files /dev/null and b/app/release/ICSer_V418_2005201521_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 7ee1275..f47ece5 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -193,14 +193,17 @@ public class Config {
     return SharPreferenceUtil.getPrefInt(context,KeyAlarmCycle,3);\r
   }\r
 \r
-  public static void setProtocolServerAddr(Context context, String serverIP,int serverPort){\r
-    SharPreferenceUtil.setPrefString(context,KeyProtocolServerIP,serverIP);\r
+  public static void setProtocolServerPort(Context context, int serverPort){\r
+//    SharPreferenceUtil.setPrefString(context,KeyProtocolServerIP,serverIP);\r
     SharPreferenceUtil.setPrefInt(context,KeyProtocolServerPort,serverPort);\r
   }\r
 \r
-  public static String getProtocolServerIP(Context context){\r
-    return SharPreferenceUtil.getPrefString(context,KeyProtocolServerIP,"118.178.155.223");\r
+  public static void setProtocolServerHost(Context context,String host){\r
+    SharPreferenceUtil.setPrefString(context,KeyProtocolServerHOST,host);\r
   }\r
+  //public static String getProtocolServerIP(Context context){\r
+ //   return SharPreferenceUtil.getPrefString(context,KeyProtocolServerIP,"118.178.155.223");\r
+ // }\r
 \r
   public static void loadModCycleSettings(Runtime runtime){\r
     runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context));\r
@@ -241,9 +244,7 @@ public class Config {
     return host;\r
    }\r
 \r
-  public static void setProtocolServerHost(Context context,String host){\r
-    SharPreferenceUtil.setPrefString(context,KeyProtocolServerHOST,host);\r
-  }\r
+\r
   public static int getProtocolServerPort(Context context){\r
 \r
       int port=JiAiPort;\r
@@ -339,6 +340,47 @@ public class Config {
     return ret;\r
   }\r
 \r
+  public static boolean isUsingCustomServer=false;\r
+\r
+  public static void setCustomServer(Context context,boolean isusingCutomerServer,String serverip,int serverport) {\r
+\r
+      if (isusingCutomerServer)\r
+          Util.setSystemProperties("persist.sys.UsingCustomServer","true");\r
+      else\r
+          Util.setSystemProperties("persist.sys.UsingCustomServer","false");\r
+\r
+\r
+    Util.setSystemProperties("persist.sys.customserverip",serverip);\r
+    Util.setSystemProperties("persist.sys.customserverport",String.valueOf(serverport));\r
+    setProtocolServerHost(context,serverip);\r
+    setProtocolServerPort(context,serverport);\r
+\r
+    loadCustomServerAddr(context);\r
+\r
+  }\r
+  public static void loadCustomServerAddr(Context context){\r
+    String tmp=Util.getSystemProperties("persist.sys.UsingCustomServer");\r
+    boolean ret=false;\r
+    if (tmp.equals("true"))\r
+      ret=true;\r
+\r
+    isUsingCustomServer=ret;\r
+\r
+    String serverip="";\r
+    int serverport=0;\r
+    if(isUsingCustomServer){\r
+      serverip= Util.getSystemProperties("persist.sys.customserverip");\r
+      serverport= Integer.valueOf(Util.getSystemProperties("persist.sys.customserverport"));\r
+      setProtocolServerHost(context,serverip);\r
+      setProtocolServerPort(context,serverport);\r
+\r
+    }else{\r
+      setProtocolServerHost(context,DefaultHost());\r
+      setProtocolServerPort(context,DefaultPort());\r
+    }\r
+    ICLogger.i("current protocol_no="+protocol_no+" , isUsingCustomServier="+isUsingCustomServer+", server host="+\r
+            getProtocolServerHost(context)+", server port="+getProtocolServerPort(context));\r
+  }\r
 \r
   public static boolean noLocationCycle=getNoLocationCycleFlag();\r
   public static boolean getNoLocationCycleFlag(){\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 26b48a6..59c4cf7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -513,6 +513,7 @@ public class CoreService extends Service {
         //初始化PPG，LocationMod，LocationCycle\r
         Config.loadModCycleSettings(runtime);\r
         //初始化IP\r
+        Config.loadCustomServerAddr(this);\r
         Config.loadServerSettings(runtime);\r
 \r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 7a9385b..13461b9 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -284,8 +284,7 @@ public class ICSmsManager {
                 ICLogger.i(sms + " len " + tmp.length);\r
                 if (tmp.length == 2) {\r
                     if (tmp[1].equals("reset#")) {\r
-                        Config.setProtocolServerHost(mContext, Config.DefaultHost());\r
-                        Config.setProtocolServerAddr(mContext, "", Config.DefaultPort());\r
+                        Config.setCustomServer(mContext,false,Config.DefaultHost(),Config.DefaultPort());\r
                         reply = "reset ServerIP to " + Config.DefaultHost() + ":" + Config.DefaultPort() + " success! ";\r
                         Config.loadServerSettings(runtime);\r
                         CoreService.getInstance().disconnect_server();\r
@@ -298,8 +297,7 @@ public class ICSmsManager {
                         if (ipstr.length == 2) {\r
                             String ip = ipstr[0];\r
                             int port = Integer.valueOf(ipstr[1].replace("#", ""));\r
-                            Config.setProtocolServerHost(mContext, ip);\r
-                            Config.setProtocolServerAddr(mContext, "", port);\r
+                            Config.setCustomServer(mContext,true,ip,port);\r
                             reply = sms + " success! ";\r
                             Config.loadServerSettings(runtime);\r
                             CoreService.getInstance().disconnect_server();\r
@@ -310,8 +308,7 @@ public class ICSmsManager {
                             if (ipstr.length == 2) {\r
                                 String ip = ipstr[0];\r
                                 int port = Integer.valueOf(ipstr[1].replace("#", ""));\r
-                                Config.setProtocolServerHost(mContext, ip);\r
-                                Config.setProtocolServerAddr(mContext, "", port);\r
+                                Config.setCustomServer(mContext,true,ip,port);\r
                                 reply = sms + " success! ";\r
                                 Config.loadServerSettings(runtime);\r
                                 CoreService.getInstance().disconnect_server();\r
@@ -799,9 +796,8 @@ public class ICSmsManager {
                     if (strtmp.equalsIgnoreCase("beehome")){\r
                         if(Config.protocol_no!=Config.PROTOCOL_BEEHOME) {\r
                             Util.setSystemProperties("persist.sys.protocol_no", "1");\r
-                            Config.setProtocolServerAddr(mContext,"",Config.BeehomePort);\r
-                            Config.setProtocolServerHost(mContext,Config.BeehomeHost);\r
                             Config.getProtocolNumber();\r
+                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);\r
                             Config.loadServerSettings(runtime);\r
                             sendSMS(phonenumber, "set setprotocol to Beehome Protocol!");\r
                             CoreService.getInstance().disconnect_server();\r
@@ -813,9 +809,8 @@ public class ICSmsManager {
                     }else if(strtmp.equalsIgnoreCase("jiai")){\r
                         if(Config.protocol_no!=Config.PROTOCOL_JIAI) {\r
                             Util.setSystemProperties("persist.sys.protocol_no", "0");\r
-                            Config.setProtocolServerAddr(mContext, "", Config.JiAiPort);\r
-                            Config.setProtocolServerHost(mContext, Config.JiAiHost);\r
                             Config.getProtocolNumber();\r
+                            Config.setCustomServer(mContext,false,Config.JiAiHost,Config.JiAiPort);\r
                             Config.loadServerSettings(runtime);\r
                             sendSMS(phonenumber, "set setprotocol to JiAi Protocol!");\r
                             CoreService.getInstance().disconnect_server();\r

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 045f1a5..4e2f0d1 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
@@ -137,7 +137,8 @@ public class TimeUtil {
 \r
   public static void setSysDateTime(Context mContext,Date datetime,int timezone){\r
 \r
-\r
+    AlarmManager alarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);\r
+    Locale.getDefault().getDisplayCountry();\r
     String timezone_name="";\r
     if(timezone>0) {\r
       timezone_name=String.format("GMT+%1$02d:00", Math.abs(timezone));\r
@@ -158,6 +159,8 @@ public class TimeUtil {
       c.add(Calendar.HOUR, timezone);//12小时制\r
     }\r
     c.setTimeZone(tz);\r
+\r
+//    alarmManager.setTimeZone();\r
     long when = c.getTimeInMillis();\r
     if (when / 1000 < Integer.MAX_VALUE) {\r
       SystemClock.setCurrentTimeMillis(when);\r
@@ -213,6 +216,7 @@ public class TimeUtil {
     TimeZone tz = TimeZone.getTimeZone(timezone_name);\r
     now.setTimeZone(tz);\r
     TimeZone.setDefault(tz);\r
+\r
   }\r
   public static String getDefaultTimeZone(){\r
     return TimeZone.getDefault().getDisplayName();\r

diff --git a/app/version_code.properties b/app/version_code.properties
index df7eb81..4255e65 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri May 15 21:02:38 CST 2020\r
-VERSION_CODE=417\r
+#Wed May 20 15:21:46 CST 2020\r
+VERSION_CODE=418\r