From: snickersun <scy@incartech.cn>
Date: Fri, 15 May 2020 11:34:17 +0000 (+0800)
Subject: 增加#setprotocol#=xxx# 命令，可以切换两种协议。
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=123a61043eddb4abea5b3a3db1b562a1a3ab137a;p=protocol_srv.git

增加#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
index 4d1b88a2..00000000
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
index 00000000..b13bed52
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 313bcb41..7ee12759 100644
--- 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 {
 
   public static String work_mode = "2@1";
 
-  public static final String DefaultHost="watch.jiai.pro";
-  public static final int DefaultPort=8090;
+  public static final String JiAiHost="watch.jiai.pro";
+  public static final int JiAiPort=8090;
+  public static final String BeehomeHost="device.beehome360.com";
+  public static final int BeehomePort=5111;
 
   public static final String DefaultLogFtpServer="icfota.snicker.com.cn";
   public static final String DefaultLogFtpUser="ftpuser";
@@ -102,6 +104,23 @@ public class Config {
   final static String DefaultSMSPassword="non";
 
 
+  public static String DefaultHost(){
+        if (protocol_no==PROTOCOL_BEEHOME)
+            return BeehomeHost;
+        else if (protocol_no==PROTOCOL_JIAI)
+            return JiAiHost;
+        else
+            return JiAiHost;
+  }
+  public static int DefaultPort(){
+      if (protocol_no==PROTOCOL_BEEHOME)
+          return BeehomePort;
+      else if (protocol_no==PROTOCOL_JIAI)
+          return JiAiPort;
+      else
+          return JiAiPort;
+  }
+
   public static String getSMSPwd(Context context){
     return SharPreferenceUtil.getPrefString(context,KeySMSPassword,DefaultSMSPassword);
   }
@@ -208,15 +227,15 @@ public class Config {
 
   public static String getProtocolServerHost(Context context){
 
-    String host="watch.jiai.pro";
+    String host=JiAiHost;
     switch (protocol_no){
 
       case PROTOCOL_BEEHOME:
-        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,"device.beehome360.com");
+        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,BeehomeHost);
         break;
       case PROTOCOL_JIAI:
       default:
-        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,"watch.jiai.pro");
+        host= SharPreferenceUtil.getPrefString(context,KeyProtocolServerHOST,JiAiHost);
       break;
     }
     return host;
@@ -227,15 +246,15 @@ public class Config {
   }
   public static int getProtocolServerPort(Context context){
 
-      int port=8090;
+      int port=JiAiPort;
       switch (protocol_no){
 
           case PROTOCOL_BEEHOME:
-              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,5111);
+              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,BeehomePort);
               break;
           case PROTOCOL_JIAI:
           default:
-              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,8090);
+              port= SharPreferenceUtil.getPrefInt(context,KeyProtocolServerPort,JiAiPort);
               break;
       }
       return port;
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 0c715da5..b3135ae8 100644
--- 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);
                 if (tmp.length == 2) {
                     if (tmp[1].equals("reset#")) {
-                        Config.setProtocolServerHost(mContext, Config.DefaultHost);
-                        Config.setProtocolServerAddr(mContext, "", Config.DefaultPort);
-                        reply = "reset ServerIP to " + Config.DefaultHost + ":" + Config.DefaultPort + " success! ";
+                        Config.setProtocolServerHost(mContext, Config.DefaultHost());
+                        Config.setProtocolServerAddr(mContext, "", Config.DefaultPort());
+                        reply = "reset ServerIP to " + Config.DefaultHost() + ":" + Config.DefaultPort() + " success! ";
                         Config.loadServerSettings(runtime);
                         CoreService.getInstance().disconnect_server();
                         CoreService.getInstance().ReConnectToServer();
@@ -792,6 +792,42 @@ public class ICSmsManager {
                 } else {
                     sendSMS(phonenumber, " nolocationcycle cmd Format error!");
                 }
+            }else if (sms.startsWith(ENCRYPED_HEADER+"#setprotocol#=")&& sms.endsWith("#")) {
+                String tmp[] = sms.split("=");
+                if (tmp.length == 2) {
+                    String strtmp=tmp[1].replace("#","");
+                    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();
+                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol!");
+                            CoreService.getInstance().disconnect_server();
+                            CoreService.getInstance().ReConnectToServer();
+                        }else{
+                            sendSMS(phonenumber, "current is Beehome Protocol!");
+                        }
+
+                    }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();
+                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol!");
+                            CoreService.getInstance().disconnect_server();
+                            CoreService.getInstance().ReConnectToServer();
+                        }else
+                        {
+                            sendSMS(phonenumber, "current is JiAi Protocol!");
+                        }
+                    }else{
+                        sendSMS(phonenumber, " only support protocol JiAi and Beehome!");
+                    }
+                } else {
+                    sendSMS(phonenumber, " setprotocol cmd Format error!");
+                }
             }else {
                 return false;
             }
diff --git a/app/version_code.properties b/app/version_code.properties
index 0c52c2a3..7ff68814 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue May 12 11:12:47 CST 2020
-VERSION_CODE=415
+#Fri May 15 19:32:38 CST 2020
+VERSION_CODE=416