修改协议切换，增加 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 6918ae6..af186c8 100644 (file)
--- 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) {\r
                             Util.setSystemProperties("persist.sys.protocol_no", "1");\r
                             Config.getProtocolNumber();\r
-                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);\r
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());\r
                             Config.loadServerSettings(runtime);\r
-                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol!");\r
-                            CoreService.getInstance().disconnect_server();\r
-                            CoreService.getInstance().ReConnectToServer();\r
+                            sendSMS(phonenumber, "set setprotocol to Beehome Protocol! device will reboot later !");\r
+                            CoreService.DevliverStringMessage("Reboot");\r
+//                            CoreService.getInstance().disconnect_server();\r
+//                            CoreService.getInstance().ReConnectToServer();\r
                         }else{\r
                             sendSMS(phonenumber, "current is Beehome Protocol!");\r
                         }\r
@@ -973,11 +974,12 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if(Config.protocol_no!=Config.PROTOCOL_JIAI) {\r
                             Util.setSystemProperties("persist.sys.protocol_no", "0");\r
                             Config.getProtocolNumber();\r
-                            Config.setCustomServer(mContext,false,Config.JiAiHost,Config.JiAiPort);\r
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());\r
                             Config.loadServerSettings(runtime);\r
-                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol!");\r
-                            CoreService.getInstance().disconnect_server();\r
-                            CoreService.getInstance().ReConnectToServer();\r
+                            sendSMS(phonenumber, "set setprotocol to JiAi Protocol! device will reboot later !");\r
+                            CoreService.DevliverStringMessage("Reboot");\r
+//                            CoreService.getInstance().disconnect_server();\r
+//                            CoreService.getInstance().ReConnectToServer();\r
                         }else\r
                         {\r
                             sendSMS(phonenumber, "current is JiAi Protocol!");\r
@@ -986,15 +988,44 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if(Config.protocol_no!=Config.PROTOCOL_IC) {\r
                             Util.setSystemProperties("persist.sys.protocol_no", "2");\r
                             Config.getProtocolNumber();\r
-                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);\r
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());\r
                             Config.loadServerSettings(runtime);\r
-                            sendSMS(phonenumber, "set setprotocol to IC Protocol!");\r
-                            CoreService.getInstance().disconnect_server();\r
-                            CoreService.getInstance().ReConnectToServer();\r
+                            sendSMS(phonenumber, "set setprotocol to IC Protocol! device will reboot later !");\r
+                            CoreService.DevliverStringMessage("Reboot");\r
+//                            CoreService.getInstance().disconnect_server();\r
+//                            CoreService.getInstance().ReConnectToServer();\r
                         }else\r
                         {\r
                             sendSMS(phonenumber, "current is IC Protocol!");\r
                         }\r
+                    }else if(strtmp.equalsIgnoreCase("fzd")){\r
+                        if(Config.protocol_no!=Config.PROTOCOL_FZD) {\r
+                            Util.setSystemProperties("persist.sys.protocol_no", "3");\r
+                            Config.getProtocolNumber();\r
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());\r
+                            Config.loadServerSettings(runtime);\r
+                            sendSMS(phonenumber, "set setprotocol to fzd Protocol! device will reboot later !");\r
+                            CoreService.DevliverStringMessage("Reboot");\r
+//                            CoreService.getInstance().disconnect_server();\r
+//                            CoreService.getInstance().ReConnectToServer();\r
+                        }else\r
+                        {\r
+                            sendSMS(phonenumber, "current is fzd Protocol!");\r
+                        }\r
+                    }else if(strtmp.equalsIgnoreCase("mqtt")){\r
+                        if(Config.protocol_no!=Config.PROTOCOL_MQTT) {\r
+                            Util.setSystemProperties("persist.sys.protocol_no", "4");\r
+                            Config.getProtocolNumber();\r
+                            Config.setCustomServer(mContext,false,protocolAPIHelper.getDefaultServerIP(),protocolAPIHelper.getDefaultServerPort());\r
+                            Config.loadServerSettings(runtime);\r
+                            sendSMS(phonenumber, "set setprotocol to mqtt Protocol! device will reboot later !");\r
+                            CoreService.DevliverStringMessage("Reboot");\r
+//                            CoreService.getInstance().disconnect_server();\r
+//                            CoreService.getInstance().ReConnectToServer();\r
+                        }else\r
+                        {\r
+                            sendSMS(phonenumber, "current is fzd Protocol!");\r
+                        }\r
                     }else if(TextUtils.isDigitsOnly(strtmp)) {\r
                         int protocolno=Integer.parseInt(strtmp);\r
                         switch (protocolno) {\r
@@ -1006,7 +1037,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                                 Util.setSystemProperties("persist.sys.protocol_no", strtmp);\r
                                 Config.getProtocolNumber();\r
                                 Config.loadServerSettings(runtime);\r
-                                sendSMS(phonenumber, "set setprotocol to Protocol"+protocolno+"! \r\nYou may also need to set server ip for this protocol !");\r
+                                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.");\r
                                 CoreService.getInstance().disconnect_server();\r
                                 CoreService.getInstance().ReConnectToServer();\r
                             break;\r
@@ -1016,7 +1047,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                         }\r
 \r
                     }else{\r
-                        sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!");\r
+                        sendSMS(phonenumber, " only support protocol jiAi , ic , beehome , fzd , mqtt !");\r
                     }\r
                 } else {\r
                     sendSMS(phonenumber, " setprotocol cmd Format error!");\r

diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
index 9e1eb97..fb85dbc 100644 (file)
--- a/dNSCache/dNSCache.iml
+++ b/dNSCache/dNSCache.iml
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />\r
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />\r
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />\r
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />\r
+        <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" />\r
+        <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" />\r
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />\r
         <option name="PROJECT_TYPE" value="1" />\r
       </configuration>\r