增加#setprotocol#=xxx# 命令，可以切换两种协议。

#setprotocol#=beehome#
#setprotocol#=jiai#

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

diff --git a/app/release/ICSer_V416_2005151932_release.apk b/app/release/ICSer_V416_2005151932_release.apk
new file mode 100644 (file)
index 0000000..b13bed5
Binary files /dev/null and b/app/release/ICSer_V416_2005151932_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 313bcb4..7ee1275 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -28,8 +28,10 @@ public class Config {
 \r
   public static String work_mode = "2@1";\r
 \r
-  public static final String DefaultHost="watch.jiai.pro";\r
-  public static final int DefaultPort=8090;\r
+  public static final String JiAiHost="watch.jiai.pro";\r
+  public static final int JiAiPort=8090;\r
+  public static final String BeehomeHost="device.beehome360.com";\r
+  public static final int BeehomePort=5111;\r
 \r
   public static final String DefaultLogFtpServer="icfota.snicker.com.cn";\r
   public static final String DefaultLogFtpUser="ftpuser";\r
@@ -102,6 +104,23 @@ public class Config {
   final static String DefaultSMSPassword="non";\r
 \r
 \r
+  public static String DefaultHost(){\r
+        if (protocol_no==PROTOCOL_BEEHOME)\r
+            return BeehomeHost;\r
+        else if (protocol_no==PROTOCOL_JIAI)\r
+            return JiAiHost;\r
+        else\r
+            return JiAiHost;\r
+  }\r
+  public static int DefaultPort(){\r
+      if (protocol_no==PROTOCOL_BEEHOME)\r
+          return BeehomePort;\r
+      else if (protocol_no==PROTOCOL_JIAI)\r
+          return JiAiPort;\r
+      else\r
+          return JiAiPort;\r
+  }\r
+\r
   public static String getSMSPwd(Context context){\r
     return SharPreferenceUtil.getPrefString(context,KeySMSPassword,DefaultSMSPassword);\r
   }\r
@@ -208,15 +227,15 @@ public class Config {
 \r
   public static String getProtocolServerHost(Context context){\r
 \r
-    String host="watch.jiai.pro";\r
+    String host=JiAiHost;\r
     switch (protocol_no){\r
 \r
       case PROTOCOL_BEEHOME:\r
-        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,"device.beehome360.com");\r
+        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,BeehomeHost);\r
         break;\r
       case PROTOCOL_JIAI:\r
       default:\r
-        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,"watch.jiai.pro");\r
+        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,JiAiHost);\r
       break;\r
     }\r
     return host;\r
@@ -227,15 +246,15 @@ public class Config {
   }\r
   public static int getProtocolServerPort(Context context){\r
 \r
-      int port=8090;\r
+      int port=JiAiPort;\r
       switch (protocol_no){\r
 \r
           case PROTOCOL_BEEHOME:\r
-              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,5111);\r
+              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,BeehomePort);\r
               break;\r
           case PROTOCOL_JIAI:\r
           default:\r
-              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,8090);\r
+              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,JiAiPort);\r
               break;\r
       }\r
       return port;\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 0c715da..b3135ae 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -284,9 +284,9 @@ 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
-                        reply = "reset ServerIP to " + Config.DefaultHost + ":" + Config.DefaultPort + " success! ";\r
+                        Config.setProtocolServerHost(mContext, Config.DefaultHost());\r
+                        Config.setProtocolServerAddr(mContext, "", Config.DefaultPort());\r
+                        reply = "reset ServerIP to " + Config.DefaultHost() + ":" + Config.DefaultPort() + " success! ";\r
                         Config.loadServerSettings(runtime);\r
                         CoreService.getInstance().disconnect_server();\r
                         CoreService.getInstance().ReConnectToServer();\r
@@ -792,6 +792,42 @@ public class ICSmsManager {
                 } else {\r
                     sendSMS(phonenumber, " nolocationcycle cmd Format error!");\r
                 }\r
+            }else if (sms.startsWith(ENCRYPED_HEADER+"#setprotocol#=")&& sms.endsWith("#")) {\r
+                String tmp[] = sms.split("=");\r
+                if (tmp.length == 2) {\r
+                    String strtmp=tmp[1].replace("#","");\r
+                    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
+                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol!");\r
+                            CoreService.getInstance().disconnect_server();\r
+                            CoreService.getInstance().ReConnectToServer();\r
+                        }else{\r
+                            sendSMS(phonenumber, "current is Beehome Protocol!");\r
+                        }\r
+\r
+                    }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
+                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol!");\r
+                            CoreService.getInstance().disconnect_server();\r
+                            CoreService.getInstance().ReConnectToServer();\r
+                        }else\r
+                        {\r
+                            sendSMS(phonenumber, "current is JiAi Protocol!");\r
+                        }\r
+                    }else{\r
+                        sendSMS(phonenumber, " only support protocol JiAi and Beehome!");\r
+                    }\r
+                } else {\r
+                    sendSMS(phonenumber, " setprotocol cmd Format error!");\r
+                }\r
             }else {\r
                 return false;\r
             }\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 0c52c2a..7ff6881 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue May 12 11:12:47 CST 2020\r
-VERSION_CODE=415\r
+#Fri May 15 19:32:38 CST 2020\r
+VERSION_CODE=416\r