From f4d48d17e22096960feb7712210afc75f8c926b9 Mon Sep 17 00:00:00 2001 From: snickersun Date: Tue, 1 Sep 2020 09:46:39 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE=E5=88=87?= =?utf8?q?=E6=8D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=20fzd,mqtt=20=E6=94=AF?= =?utf8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../com/enqualcomm/support/ICSmsManager.java | 59 ++++++++++++++----- dNSCache/dNSCache.iml | 4 +- 2 files changed, 47 insertions(+), 16 deletions(-) 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 @@