From: snickersun <scy@incartech.cn>
Date: Tue, 1 Sep 2020 01:46:39 +0000 (+0800)
Subject: 修改协议切换，增加 fzd,mqtt 支持
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f4d48d17e22096960feb7712210afc75f8c926b9;p=protocol_srv.git

修改协议切换，增加 fzd,mqtt 支持
---

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 6918ae63..af186c88 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -960,11 +960,12 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if(Config.protocol_no!=Config.PROTOCOL_BEEHOME) {
                             Util.setSystemProperties("persist.sys.protocol_no", "1");
                             Config.getProtocolNumber();
-                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());
                             Config.loadServerSettings(runtime);
-                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol!");
-                            CoreService.getInstance().disconnect_server();
-                            CoreService.getInstance().ReConnectToServer();
+                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol! device will reboot later !");
+                            CoreService.DevliverStringMessage("Reboot");
+//                            CoreService.getInstance().disconnect_server();
+//                            CoreService.getInstance().ReConnectToServer();
                         }else{
                             sendSMS(phonenumber, "current is Beehome Protocol!");
                         }
@@ -973,11 +974,12 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if(Config.protocol_no!=Config.PROTOCOL_JIAI) {
                             Util.setSystemProperties("persist.sys.protocol_no", "0");
                             Config.getProtocolNumber();
-                            Config.setCustomServer(mContext,false,Config.JiAiHost,Config.JiAiPort);
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());
                             Config.loadServerSettings(runtime);
-                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol!");
-                            CoreService.getInstance().disconnect_server();
-                            CoreService.getInstance().ReConnectToServer();
+                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol! device will reboot later !");
+                            CoreService.DevliverStringMessage("Reboot");
+//                            CoreService.getInstance().disconnect_server();
+//                            CoreService.getInstance().ReConnectToServer();
                         }else
                         {
                             sendSMS(phonenumber, "current is JiAi Protocol!");
@@ -986,15 +988,44 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if(Config.protocol_no!=Config.PROTOCOL_IC) {
                             Util.setSystemProperties("persist.sys.protocol_no", "2");
                             Config.getProtocolNumber();
-                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());
                             Config.loadServerSettings(runtime);
-                            sendSMS(phonenumber, "set setprotocol to IC Protocol!");
-                            CoreService.getInstance().disconnect_server();
-                            CoreService.getInstance().ReConnectToServer();
+                            sendSMS(phonenumber, "set setprotocol to IC Protocol! device will reboot later !");
+                            CoreService.DevliverStringMessage("Reboot");
+//                            CoreService.getInstance().disconnect_server();
+//                            CoreService.getInstance().ReConnectToServer();
                         }else
                         {
                             sendSMS(phonenumber, "current is IC Protocol!");
                         }
+                    }else if(strtmp.equalsIgnoreCase("fzd")){
+                        if(Config.protocol_no!=Config.PROTOCOL_FZD) {
+                            Util.setSystemProperties("persist.sys.protocol_no", "3");
+                            Config.getProtocolNumber();
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());
+                            Config.loadServerSettings(runtime);
+                            sendSMS(phonenumber, "set setprotocol to fzd Protocol! device will reboot later !");
+                            CoreService.DevliverStringMessage("Reboot");
+//                            CoreService.getInstance().disconnect_server();
+//                            CoreService.getInstance().ReConnectToServer();
+                        }else
+                        {
+                            sendSMS(phonenumber, "current is fzd Protocol!");
+                        }
+                    }else if(strtmp.equalsIgnoreCase("mqtt")){
+                        if(Config.protocol_no!=Config.PROTOCOL_MQTT) {
+                            Util.setSystemProperties("persist.sys.protocol_no", "4");
+                            Config.getProtocolNumber();
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());
+                            Config.loadServerSettings(runtime);
+                            sendSMS(phonenumber, "set setprotocol to mqtt Protocol! device will reboot later !");
+                            CoreService.DevliverStringMessage("Reboot");
+//                            CoreService.getInstance().disconnect_server();
+//                            CoreService.getInstance().ReConnectToServer();
+                        }else
+                        {
+                            sendSMS(phonenumber, "current is fzd Protocol!");
+                        }
                     }else if(TextUtils.isDigitsOnly(strtmp)) {
                         int protocolno=Integer.parseInt(strtmp);
                         switch (protocolno) {
@@ -1006,7 +1037,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                                 Util.setSystemProperties("persist.sys.protocol_no", strtmp);
                                 Config.getProtocolNumber();
                                 Config.loadServerSettings(runtime);
-                                sendSMS(phonenumber, "set setprotocol to Protocol"+protocolno+"! \r\nYou may also need to set server ip for this protocol !");
+                                sendSMS(phonenumber, "set setprotocol to Protocol"+protocolno+"! \r\nYou may also need to set server ip for this protocol !\r\n May need reboot device too.");
                                 CoreService.getInstance().disconnect_server();
                                 CoreService.getInstance().ReConnectToServer();
                             break;
@@ -1016,7 +1047,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                         }
 
                     }else{
-                        sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!");
+                        sendSMS(phonenumber, " only support protocol jiAi , ic , beehome , fzd , mqtt !");
                     }
                 } else {
                     sendSMS(phonenumber, " setprotocol cmd Format error!");
diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
index 9e1eb977..fb85dbc3 100644
--- a/dNSCache/dNSCache.iml
+++ b/dNSCache/dNSCache.iml
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
         <option name="PROJECT_TYPE" value="1" />
       </configuration>