支持通过tcp批量修改设备服务器IP地址

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -12,6 +12,7 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.animation.AnimationUtils
+import com.alibaba.fastjson.JSONObject
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
@@ -1249,6 +1250,19 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
                             }
                         } else if (tcpModel.action == TcpAction.DeviceAction.SYSTEM_SETTING) {
                             presenter.loadPartSettings(Constant.PART_ID)
+                        } else if (tcpModel.action == TcpAction.DeviceAction.SERVER_CHANGE) {
+                            //服务器地址变更
+                            if (tcpModel.data != null) {
+                                val json = JSONObject.parseObject(tcpModel.data.toString())
+                                val serverIp = json.getString("server_ip")
+                                val serverPort = json.getString("server_port")
+                                Log.e(TAG, "server ip:$serverIp, server port:$serverPort")
+                                CommonUtils.setUrl(activity, serverIp)
+                                CommonUtils.setUrlPort(activity, serverPort)
+                                AppTool.Time.delay(2000) {
+                                    AppUpdateHelper.restartApp(activity)
+                                }
+                            }
                         }
                     } else if (tcpModel.action == TcpAction.DataAction.REFRESH) {
                         //重新加载数据，比如出院，入院等

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/enums/TcpAction.java

@@ -16,7 +16,7 @@ public interface TcpAction {
     enum CallbackAction implements TcpAction {
         SUCCESS("同步"),
         FAILED("失败");
-        private String description;
+        private final String description;
         CallbackAction(String description){
             this.description = description;
         }
@@ -50,7 +50,7 @@ public interface TcpAction {
         CANCEL("取消");
 
 
-        private String description;
+        private final String description;
         PhoneAction(String description){
             this.description = description;
         }
@@ -77,6 +77,7 @@ public interface TcpAction {
 
     enum VoiceAction implements TcpAction {
         CALL("呼叫"),
+        VCALL("视频呼叫"),
         ACCEPT("接受呼叫"),
         ACCEPTED("已接听"),
         REJECT("拒绝"),
@@ -86,13 +87,13 @@ public interface TcpAction {
         CANCEL("取消"),
         PCALLING("已经通话中"),
         VOICE_OFF("通话被接听"),
-        CANCEL_BY_DOOR("门口机取消分机呼叫"),
         RS485CALL("485界面发起呼叫"),
         RS485CANCEL("485界面呼叫取消"),
         RS485CANCEL_BY_DOOR("485门口机取消房间内的呼叫"),
         RS485HANDOFF("485界面挂断"),
         RS485ACCEPT("485界面接听"),
         RS485REJECT("485界面拒绝"),
+        CANCEL_BY_DOOR("门口机取消分机呼叫"),
         SUCCESS("呼叫成功"),
         FAILED("呼叫失败"),
         GAIN_CALL("应答"),
@@ -101,7 +102,7 @@ public interface TcpAction {
         GAINED("呼叫被应答");
 
 
-        private String description;
+        private final String description;
         VoiceAction(String description){
             this.description = description;
         }
@@ -140,7 +141,7 @@ public interface TcpAction {
         SUCCESS("呼叫成功"),
         FAILED("呼叫失败");
 
-        private String description;
+        private final String description;
         VideoAction(String description){
             this.description = description;
         }
@@ -172,17 +173,24 @@ public interface TcpAction {
         TRANSFER("转接"),
         ALARM_TEST("测试报警"),
         ALARM_INTRUSION("侵入报警"),
+        ALARM_INFRARED_NO_TRIGGER("红外报警"),
         ALARM_ON_EIGHT_HOURS("八小时无人报警"),
         ALARM_ON_TWELVE_HOURS("十二小时无人报警"),
         ALARM_ON_TWENTY_FOUR_HOURS("二十四小时无人报警"),
         ALARM_DISASSEMBLE("防拆报警"),
         ALARM_FAULT("故障报警"),
         ALARM_DOOR_LOCK("门磁报警"),
+        ALARM_RESTRAINT_BAND("约束带报警"),
         ALARM_SMOKE("烟感报警"),
         ALARM_GAS("燃气报警"),
-        ALARM_WATER_OVERFLOW("浸水报警");
-
-        private String description;
+        ALARM_WATER_OVERFLOW("浸水报警"),
+        ALARM_LOW_VOLTAGE("低电压报警"),
+        ALARM_TEMPERATURE("温度报警"),
+        ALARM_FALL("跌到报警"),
+        ALARM_VITAL("体征报警"),
+        AlARM_BUTTON("紧急按钮");
+
+        private final String description;
         SOSAction(String description){
             this.description = description;
         }
@@ -211,7 +219,7 @@ public interface TcpAction {
         CALL("增援"),
         RESPONSED("已响应");
 
-        private String description;
+        private final String description;
         ReinforceAction(String description){
             this.description = description;
         }
@@ -242,7 +250,7 @@ public interface TcpAction {
         MSG_READ("语音留言已读"),
         RECEIVED("客户端收到确认");
 
-        private String description;
+        private final String description;
         IMAction(String description){
             this.description = description;
         }
@@ -273,7 +281,7 @@ public interface TcpAction {
         MSG_READ("语音留言已读"),
         RECEIVED("接收端收到确认");
 
-        private String description;
+        private final String description;
         CHANNELIMAction(String description){
             this.description = description;
         }
@@ -306,9 +314,10 @@ public interface TcpAction {
         DEVICE_REFRESH("设备刷新"),
         SYSTEM_SETTING("系统设置"),
         DEVICE_CHANGE("设备更换"),
-        USER_CHANGE("用户绑定");
+        USER_CHANGE("用户绑定"),
+        SERVER_CHANGE("设备ip地址更换");
 
-        private String description;
+        private final String description;
         DeviceAction(String description){
             this.description = description;
         }
@@ -339,7 +348,7 @@ public interface TcpAction {
         CANCEL("取消"),
         CANCEL_CONFIRM("接收端确认收到取消"),
         COMPLETED("完成");
-        private String description;
+        private final String description;
         EventAction(String description){
             this.description = description;
         }
@@ -371,7 +380,7 @@ public interface TcpAction {
         SOS_CANCEL("取消"),
         NURSING("护理"),
         NURSING_END("护理结束");
-        private String description;
+        private final String description;
         SideAction(String description){
             this.description = description;
         }
@@ -400,7 +409,7 @@ public interface TcpAction {
     enum DataAction implements TcpAction {
         REFRESH("刷新数据"),
         INTERACTION("刷新交互列表");
-        private String description;
+        private final String description;
         DataAction(String description){
             this.description = description;
         }
@@ -427,7 +436,7 @@ public interface TcpAction {
     enum BroadcastAction implements TcpAction {
         START("开始"),
         STOP("停止");
-        private String description;
+        private final String description;
         BroadcastAction(String description){
             this.description = description;
         }
@@ -453,7 +462,7 @@ public interface TcpAction {
 
     enum TimeAction implements TcpAction {
         SYNC("同步");
-        private String description;
+        private final String description;
         TimeAction(String description){
             this.description = description;
         }
@@ -491,7 +500,7 @@ public interface TcpAction {
         FAILED("连接失败");
 
 
-        private String description;
+        private final String description;
 
         EntraceGuardAction(String description) {
             this.description = description;
@@ -516,4 +525,30 @@ public interface TcpAction {
         }
     }
 
+    enum LocationAction implements TcpAction {
+        ASK("主动询问"),
+        UPDATE("上传数据");
+        private final String description;
+        LocationAction(String description){
+            this.description = description;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName(){
+            return this.name();
+        }
+
+        private final static Map<String , LocationAction> ENUM_MAP = new HashMap<String, LocationAction>();
+        static {
+            for(LocationAction v : values()) {
+                ENUM_MAP.put(v.toString() , v);
+            }
+        }
+        public static LocationAction fromString(String v) {
+            LocationAction userOptionEnum = ENUM_MAP.get(v);
+            return userOptionEnum == null ? ASK :userOptionEnum;
+        }
+    }
 }