From: snickersun Date: Wed, 3 Jun 2020 01:31:21 +0000 (+0800) Subject: release 418 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=029274b9a47d320dcaa0208ccbdc6774b4a28f2e;p=protocol_srv.git 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 index 3656bd40..00000000 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 index 00000000..57c9fab2 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 7ee12759..f47ece5b 100644 --- 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); } - public static void setProtocolServerAddr(Context context, String serverIP,int serverPort){ - SharPreferenceUtil.setPrefString(context,KeyProtocolServerIP,serverIP); + public static void setProtocolServerPort(Context context, int serverPort){ +// SharPreferenceUtil.setPrefString(context,KeyProtocolServerIP,serverIP); SharPreferenceUtil.setPrefInt(context,KeyProtocolServerPort,serverPort); } - public static String getProtocolServerIP(Context context){ - return SharPreferenceUtil.getPrefString(context,KeyProtocolServerIP,"118.178.155.223"); + public static void setProtocolServerHost(Context context,String host){ + SharPreferenceUtil.setPrefString(context,KeyProtocolServerHOST,host); } + //public static String getProtocolServerIP(Context context){ + // return SharPreferenceUtil.getPrefString(context,KeyProtocolServerIP,"118.178.155.223"); + // } public static void loadModCycleSettings(Runtime runtime){ runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context)); @@ -241,9 +244,7 @@ public class Config { return host; } - public static void setProtocolServerHost(Context context,String host){ - SharPreferenceUtil.setPrefString(context,KeyProtocolServerHOST,host); - } + public static int getProtocolServerPort(Context context){ int port=JiAiPort; @@ -339,6 +340,47 @@ public class Config { return ret; } + public static boolean isUsingCustomServer=false; + + public static void setCustomServer(Context context,boolean isusingCutomerServer,String serverip,int serverport) { + + if (isusingCutomerServer) + Util.setSystemProperties("persist.sys.UsingCustomServer","true"); + else + Util.setSystemProperties("persist.sys.UsingCustomServer","false"); + + + Util.setSystemProperties("persist.sys.customserverip",serverip); + Util.setSystemProperties("persist.sys.customserverport",String.valueOf(serverport)); + setProtocolServerHost(context,serverip); + setProtocolServerPort(context,serverport); + + loadCustomServerAddr(context); + + } + public static void loadCustomServerAddr(Context context){ + String tmp=Util.getSystemProperties("persist.sys.UsingCustomServer"); + boolean ret=false; + if (tmp.equals("true")) + ret=true; + + isUsingCustomServer=ret; + + String serverip=""; + int serverport=0; + if(isUsingCustomServer){ + serverip= Util.getSystemProperties("persist.sys.customserverip"); + serverport= Integer.valueOf(Util.getSystemProperties("persist.sys.customserverport")); + setProtocolServerHost(context,serverip); + setProtocolServerPort(context,serverport); + + }else{ + setProtocolServerHost(context,DefaultHost()); + setProtocolServerPort(context,DefaultPort()); + } + ICLogger.i("current protocol_no="+protocol_no+" , isUsingCustomServier="+isUsingCustomServer+", server host="+ + getProtocolServerHost(context)+", server port="+getProtocolServerPort(context)); + } public static boolean noLocationCycle=getNoLocationCycleFlag(); public static boolean getNoLocationCycleFlag(){ diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 26b48a62..59c4cf70 100644 --- 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 Config.loadModCycleSettings(runtime); //初始化IP + Config.loadCustomServerAddr(this); Config.loadServerSettings(runtime); diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 7a9385b6..13461b98 100644 --- 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); if (tmp.length == 2) { if (tmp[1].equals("reset#")) { - Config.setProtocolServerHost(mContext, Config.DefaultHost()); - Config.setProtocolServerAddr(mContext, "", Config.DefaultPort()); + Config.setCustomServer(mContext,false,Config.DefaultHost(),Config.DefaultPort()); reply = "reset ServerIP to " + Config.DefaultHost() + ":" + Config.DefaultPort() + " success! "; Config.loadServerSettings(runtime); CoreService.getInstance().disconnect_server(); @@ -298,8 +297,7 @@ public class ICSmsManager { if (ipstr.length == 2) { String ip = ipstr[0]; int port = Integer.valueOf(ipstr[1].replace("#", "")); - Config.setProtocolServerHost(mContext, ip); - Config.setProtocolServerAddr(mContext, "", port); + Config.setCustomServer(mContext,true,ip,port); reply = sms + " success! "; Config.loadServerSettings(runtime); CoreService.getInstance().disconnect_server(); @@ -310,8 +308,7 @@ public class ICSmsManager { if (ipstr.length == 2) { String ip = ipstr[0]; int port = Integer.valueOf(ipstr[1].replace("#", "")); - Config.setProtocolServerHost(mContext, ip); - Config.setProtocolServerAddr(mContext, "", port); + Config.setCustomServer(mContext,true,ip,port); reply = sms + " success! "; Config.loadServerSettings(runtime); CoreService.getInstance().disconnect_server(); @@ -799,9 +796,8 @@ public class ICSmsManager { if (strtmp.equalsIgnoreCase("beehome")){ if(Config.protocol_no!=Config.PROTOCOL_BEEHOME) { Util.setSystemProperties("persist.sys.protocol_no", "1"); - Config.setProtocolServerAddr(mContext,"",Config.BeehomePort); - Config.setProtocolServerHost(mContext,Config.BeehomeHost); Config.getProtocolNumber(); + Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort); Config.loadServerSettings(runtime); sendSMS(phonenumber, "set setprotocol to Beehome Protocol!"); CoreService.getInstance().disconnect_server(); @@ -813,9 +809,8 @@ public class ICSmsManager { }else if(strtmp.equalsIgnoreCase("jiai")){ if(Config.protocol_no!=Config.PROTOCOL_JIAI) { Util.setSystemProperties("persist.sys.protocol_no", "0"); - Config.setProtocolServerAddr(mContext, "", Config.JiAiPort); - Config.setProtocolServerHost(mContext, Config.JiAiHost); Config.getProtocolNumber(); + Config.setCustomServer(mContext,false,Config.JiAiHost,Config.JiAiPort); Config.loadServerSettings(runtime); sendSMS(phonenumber, "set setprotocol to JiAi Protocol!"); CoreService.getInstance().disconnect_server(); 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 045f1a52..4e2f0d1a 100644 --- 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 { public static void setSysDateTime(Context mContext,Date datetime,int timezone){ - + 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)); @@ -158,6 +159,8 @@ public class TimeUtil { c.add(Calendar.HOUR, timezone);//12小时制 } c.setTimeZone(tz); + +// alarmManager.setTimeZone(); long when = c.getTimeInMillis(); if (when / 1000 < Integer.MAX_VALUE) { SystemClock.setCurrentTimeMillis(when); @@ -213,6 +216,7 @@ public class TimeUtil { TimeZone tz = TimeZone.getTimeZone(timezone_name); now.setTimeZone(tz); TimeZone.setDefault(tz); + } public static String getDefaultTimeZone(){ return TimeZone.getDefault().getDisplayName(); diff --git a/app/version_code.properties b/app/version_code.properties index df7eb81d..4255e650 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri May 15 21:02:38 CST 2020 -VERSION_CODE=417 +#Wed May 20 15:21:46 CST 2020 +VERSION_CODE=418