增加房间紧急呼叫类型

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

@@ -14,9 +14,11 @@ public interface TcpAction {
     String getDescription();
 
     enum CallbackAction implements TcpAction {
-        SUCCESS("同步"),
-        FAILED("失败");
-        private String description;
+        ACK("反馈"),
+        SUCCESS("成功"),
+        FAILED("失败"),
+        NO_MATCH("没有匹配");
+        private final String description;
         CallbackAction(String description){
             this.description = description;
         }
@@ -36,7 +38,7 @@ public interface TcpAction {
         }
         public static CallbackAction fromString(String v) {
             CallbackAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? SUCCESS :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -47,10 +49,11 @@ public interface TcpAction {
         CALLING("通话中"),
         HANDOFF("挂断"),
         DATA("数据传输"),
-        CANCEL("取消");
+        CANCEL("取消"),
+        NO_MATCH("没有匹配");
 
 
-        private String description;
+        private final String description;
         PhoneAction(String description){
             this.description = description;
         }
@@ -71,7 +74,7 @@ public interface TcpAction {
         }
         public static PhoneAction fromString(String v) {
             PhoneAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -99,10 +102,14 @@ public interface TcpAction {
         GAIN_CALL("应答"),
         GAIN_OK("应答成功"),
         GAIN_FAIL("应答失败"),
-        GAINED("呼叫被应答");
+        GAINED("呼叫被应答"),
+        HCALL("手柄呼叫"),
+        HRESPONSE("响应手柄"),
+        HRESPONSED("响应过手柄了"),
+        NO_MATCH("没有匹配");
 
 
-        private String description;
+        private final String description;
         VoiceAction(String description){
             this.description = description;
         }
@@ -123,7 +130,7 @@ public interface TcpAction {
         }
         public static VoiceAction fromString(String v) {
             VoiceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -139,9 +146,10 @@ public interface TcpAction {
         HANDOFF("挂断"),
         CANCEL("取消"),
         SUCCESS("呼叫成功"),
-        FAILED("呼叫失败");
+        FAILED("呼叫失败"),
+        NO_MATCH("没有匹配");
 
-        private String description;
+        private final String description;
         VideoAction(String description){
             this.description = description;
         }
@@ -162,7 +170,7 @@ public interface TcpAction {
         }
         public static VideoAction fromString(String v) {
             VideoAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -170,6 +178,7 @@ public interface TcpAction {
     enum SOSAction implements TcpAction {
         CALL("紧急呼叫"),
         CANCEL("取消"),
+        CANCELED("已取消"),
         TRANSFER("转接"),
         ALARM_TEST("测试报警"),
         ALARM_INTRUSION("侵入报警"),
@@ -180,13 +189,21 @@ public interface TcpAction {
         ALARM_DISASSEMBLE("防拆报警"),
         ALARM_FAULT("故障报警"),
         ALARM_DOOR_LOCK("门磁报警"),
+        ALARM_RESTRAINT_BAND("约束带报警"),
         ALARM_SMOKE("烟感报警"),
         ALARM_GAS("燃气报警"),
         ALARM_WATER_OVERFLOW("浸水报警"),
         ALARM_LOW_VOLTAGE("低电压报警"),
-        ALARM_TEMPERATURE("温度报警");
-
-        private String description;
+        ALARM_TEMPERATURE("温度报警"),
+        ALARM_FALL("跌到报警"),
+        ALARM_VITAL("体征报警"),
+        AlARM_BUTTON("紧急按钮"),
+        ALARM_FALL_RADAR("跌到报警"),
+        ALARM_INFUSION_RADAR("输液报警"),
+        ROOM_CALL("房间紧急呼叫"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         SOSAction(String description){
             this.description = description;
         }
@@ -207,15 +224,16 @@ public interface TcpAction {
         }
         public static SOSAction fromString(String v) {
             SOSAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum ReinforceAction implements TcpAction {
         CALL("增援"),
-        RESPONSED("已响应");
+        RESPONSED("已响应"),
+        NO_MATCH("没有匹配");
 
-        private String description;
+        private final String description;
         ReinforceAction(String description){
             this.description = description;
         }
@@ -236,7 +254,7 @@ public interface TcpAction {
         }
         public static ReinforceAction fromString(String v) {
             ReinforceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -244,9 +262,10 @@ public interface TcpAction {
     enum IMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("客户端收到确认");
+        RECEIVED("客户端收到确认"),
+        NO_MATCH("没有匹配");
 
-        private String description;
+        private final String description;
         IMAction(String description){
             this.description = description;
         }
@@ -267,7 +286,7 @@ public interface TcpAction {
         }
         public static IMAction fromString(String v) {
             IMAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? MSG_READ :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
 
     }
@@ -275,9 +294,10 @@ public interface TcpAction {
     enum CHANNELIMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("接收端收到确认");
+        RECEIVED("接收端收到确认"),
+        NO_MATCH("没有匹配");
 
-        private String description;
+        private final String description;
         CHANNELIMAction(String description){
             this.description = description;
         }
@@ -298,7 +318,7 @@ public interface TcpAction {
         }
         public static CHANNELIMAction fromString(String v) {
             CHANNELIMAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? MSG_READ :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
 
     }
@@ -311,9 +331,10 @@ public interface TcpAction {
         SYSTEM_SETTING("系统设置"),
         DEVICE_CHANGE("设备更换"),
         USER_CHANGE("用户绑定"),
-        SERVER_CHANGE("设备ip地址更换");
+        SERVER_CHANGE("设备ip地址更换"),
+        NO_MATCH("没有匹配");
 
-        private String description;
+        private final String description;
         DeviceAction(String description){
             this.description = description;
         }
@@ -333,18 +354,20 @@ public interface TcpAction {
         }
         public static DeviceAction fromString(String v) {
             DeviceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? RESTART :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum EventAction implements TcpAction {
         KEY_CLICK("按键事件"),
-        RESPONSE("已响应"),
+        RESPONSE("响应"),
+        RESPONSED("已响应"),
         RECEIVED("接收端收到确认"),
         CANCEL("取消"),
         CANCEL_CONFIRM("接收端确认收到取消"),
-        COMPLETED("完成");
-        private String description;
+        COMPLETED("完成"),
+        NO_MATCH("没有匹配");
+        private final String description;
         EventAction(String description){
             this.description = description;
         }
@@ -364,7 +387,7 @@ public interface TcpAction {
         }
         public static EventAction fromString(String v) {
             EventAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? KEY_CLICK :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -375,8 +398,10 @@ public interface TcpAction {
         SOS_CALL("紧急呼叫"),
         SOS_CANCEL("取消"),
         NURSING("护理"),
-        NURSING_END("护理结束");
-        private String description;
+        NURSING_END("护理结束"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         SideAction(String description){
             this.description = description;
         }
@@ -396,7 +421,7 @@ public interface TcpAction {
         }
         public static SideAction fromString(String v) {
             SideAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -404,8 +429,10 @@ public interface TcpAction {
 
     enum DataAction implements TcpAction {
         REFRESH("刷新数据"),
-        INTERACTION("刷新交互列表");
-        private String description;
+        INTERACTION("刷新交互列表"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         DataAction(String description){
             this.description = description;
         }
@@ -425,14 +452,16 @@ public interface TcpAction {
         }
         public static DataAction fromString(String v) {
             DataAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? REFRESH :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum BroadcastAction implements TcpAction {
         START("开始"),
-        STOP("停止");
-        private String description;
+        STOP("停止"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         BroadcastAction(String description){
             this.description = description;
         }
@@ -452,13 +481,15 @@ public interface TcpAction {
         }
         public static BroadcastAction fromString(String v) {
             BroadcastAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? START :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum TimeAction implements TcpAction {
-        SYNC("同步");
-        private String description;
+        SYNC("同步"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         TimeAction(String description){
             this.description = description;
         }
@@ -478,7 +509,7 @@ public interface TcpAction {
         }
         public static TimeAction fromString(String v) {
             TimeAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? SYNC :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -493,10 +524,11 @@ public interface TcpAction {
         SUCCESS("连接主机成功"),
         HANGUP("挂断"),
         TIMEOUT("响应超时"),
-        FAILED("连接失败");
+        FAILED("连接失败"),
+        NO_MATCH("没有匹配");
 
 
-        private String description;
+        private final String description;
 
         EntraceGuardAction(String description) {
             this.description = description;
@@ -517,14 +549,16 @@ public interface TcpAction {
         }
         public static EntraceGuardAction fromString(String v) {
             EntraceGuardAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum LocationAction implements TcpAction {
         ASK("主动询问"),
-        UPDATE("上传数据");
-        private String description;
+        UPDATE("上传数据"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
         LocationAction(String description){
             this.description = description;
         }
@@ -544,7 +578,7 @@ public interface TcpAction {
         }
         public static LocationAction fromString(String v) {
             LocationAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? ASK :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -1480,7 +1480,7 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurse
                     }
                 } else if (tcpModel.type == TcpType.SOS) {
                     var interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
-                    if (tcpModel.action == TcpAction.SOSAction.CALL) {
+                    if (tcpModel.action == TcpAction.SOSAction.CALL || tcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
                         //紧急呼叫优先级最高，如果当前有通话或正在呼叫的需要将其打断
                         RingPlayHelper.stopRingTone()
                         SpeechUtil.getInstance().stopSpeak()