修改分机接紧急按钮发送sos room call

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/SOSHelper.java

@@ -26,7 +26,7 @@ public class SOSHelper {
         if (Constant.EMERGENCY_ID != -1) {
             OtherUtil.sendSosCall(Constant.EMERGENCY_ID);
         } else {
-            OtherUtil.sendSosCall(Constant.DEVICE_ID);
+            OtherUtil.sendRoomSosCall(Constant.DEVICE_ID);
         }
 
         //60s之后紧急按钮灯自动复位

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/OtherUtil.java

@@ -15,6 +15,14 @@ public class OtherUtil {
         return tcpModel;
     }
 
+    public static TcpModel RoomSOSCall(Integer fromId){
+        TcpModel tcpModel = new TcpModel();
+        tcpModel.setType(TcpType.SOS);
+        tcpModel.setAction(TcpAction.SOSAction.ROOM_CALL);
+        tcpModel.setFromId(fromId);
+        return tcpModel;
+    }
+
     public static TcpModel SOSCancel(Integer fromId, Integer toId){
         TcpModel tcpModel = new TcpModel();
         tcpModel.setType(TcpType.SOS);
@@ -38,6 +46,11 @@ public class OtherUtil {
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
     }
 
+    public static void sendRoomSosCall(Integer fromId) {
+        TcpModel tcpModel = OtherUtil.RoomSOSCall(fromId);
+        TcpClient.getInstance().sendMsg(tcpModel.toJson());
+    }
+
     public static void cancelSosCall(Integer fromId, Integer toId) {
         TcpModel tcpModel = OtherUtil.SOSCancel(fromId, toId);
         TcpClient.getInstance().sendMsg(tcpModel.toJson());

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

@@ -14,8 +14,10 @@ public interface TcpAction {
     String getDescription();
 
     enum CallbackAction implements TcpAction {
+        ACK("反馈"),
         SUCCESS("同步"),
-        FAILED("失败");
+        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,7 +49,8 @@ public interface TcpAction {
         CALLING("通话中"),
         HANDOFF("挂断"),
         DATA("数据传输"),
-        CANCEL("取消");
+        CANCEL("取消"),
+        NO_MATCH("没有匹配");
 
 
         private final String 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;
         }
     }
 
@@ -86,7 +89,7 @@ public interface TcpAction {
         HANDOFF("挂断"),
         CANCEL("取消"),
         PCALLING("已经通话中"),
-        VOICE_OFF("通话被接听"),
+        VOICE_OFF("通话被其他设备处理"),
         RS485CALL("485界面发起呼叫"),
         RS485CANCEL("485界面呼叫取消"),
         RS485CANCEL_BY_DOOR("485门口机取消房间内的呼叫"),
@@ -99,7 +102,11 @@ public interface TcpAction {
         GAIN_CALL("应答"),
         GAIN_OK("应答成功"),
         GAIN_FAIL("应答失败"),
-        GAINED("呼叫被应答");
+        GAINED("呼叫被应答"),
+        HCALL("手柄呼叫"),
+        HRESPONSE("响应手柄"),
+        HRESPONSED("响应过手柄了"),
+        NO_MATCH("没有匹配");
 
 
         private final String 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,7 +146,8 @@ public interface TcpAction {
         HANDOFF("挂断"),
         CANCEL("取消"),
         SUCCESS("呼叫成功"),
-        FAILED("呼叫失败");
+        FAILED("呼叫失败"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         VideoAction(String description){
@@ -162,14 +170,15 @@ 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;
         }
     }
 
 
     enum SOSAction implements TcpAction {
-        CALL("紧急呼叫"),
-        CANCEL("取消"),
+        CALL("紧急呼叫"),   //1
+        CANCEL("取消"),   //1
+        CANCELED("已取消"),    //1
         TRANSFER("转接"),
         ALARM_TEST("测试报警"),
         ALARM_INTRUSION("侵入报警"),
@@ -188,7 +197,15 @@ public interface TcpAction {
         ALARM_TEMPERATURE("温度报警"),
         ALARM_FALL("跌到报警"),
         ALARM_VITAL("体征报警"),
-        AlARM_BUTTON("紧急按钮");
+        AlARM_BUTTON("紧急按钮"),
+        ALARM_FALL_RADAR("跌到报警"),
+        ALARM_INFUSION_RADAR("输液报警"),
+        ROOM_CALL("房间紧急呼叫"),    //1
+        OTHER_CALL("其他紧急呼叫"),   //1
+        RECEIVED("客户端收到确认"),
+        // 当设备在科室级时用这个PART_USER_CALL，比如：用户手环
+        PART_USER_CALL("用户紧急呼叫"),   //
+        NO_MATCH("没有匹配");
 
         private final String description;
         SOSAction(String description){
@@ -211,13 +228,14 @@ 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 final String description;
         ReinforceAction(String description){
@@ -240,7 +258,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;
         }
     }
 
@@ -248,7 +266,8 @@ public interface TcpAction {
     enum IMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("客户端收到确认");
+        RECEIVED("客户端收到确认"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         IMAction(String description){
@@ -271,7 +290,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;
         }
 
     }
@@ -279,7 +298,8 @@ public interface TcpAction {
     enum CHANNELIMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("接收端收到确认");
+        RECEIVED("接收端收到确认"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         CHANNELIMAction(String description){
@@ -302,20 +322,25 @@ 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;
         }
 
     }
 
     enum DeviceAction implements TcpAction {
-        RESTART("重启"),
+        RESTART("重启APP"),
+        REBOOT("重启机器"),
+        OPEN_DEBUG("打开网络调试"),
         CONNECT("连接"),
         APP_UPDATE("APP更新"),
         DEVICE_REFRESH("设备刷新"),
         SYSTEM_SETTING("系统设置"),
         DEVICE_CHANGE("设备更换"),
         USER_CHANGE("用户绑定"),
-        SERVER_CHANGE("设备ip地址更换");
+        SERVER_CHANGE("设备ip地址更换"),
+        S485_POWER_RESET("485控制版复位电路"),
+        S485_POWER_RESET_SUCCESS("485控制版复位电路成功"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         DeviceAction(String description){
@@ -337,17 +362,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("完成");
+        NO_TARGET("没有目标设备"),
+        COMPLETED("完成"),
+        NO_MATCH("没有匹配");
         private final String description;
         EventAction(String description){
             this.description = description;
@@ -368,7 +396,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;
         }
     }
 
@@ -379,7 +407,11 @@ public interface TcpAction {
         SOS_CALL("紧急呼叫"),
         SOS_CANCEL("取消"),
         NURSING("护理"),
-        NURSING_END("护理结束");
+        NURSING_END("护理结束"),
+        SHOW("显示"),
+        CLEAR("清除"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         SideAction(String description){
             this.description = description;
@@ -400,7 +432,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;
         }
     }
 
@@ -408,7 +440,9 @@ public interface TcpAction {
 
     enum DataAction implements TcpAction {
         REFRESH("刷新数据"),
-        INTERACTION("刷新交互列表");
+        INTERACTION("刷新交互列表"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         DataAction(String description){
             this.description = description;
@@ -429,13 +463,15 @@ 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("停止");
+        STOP("停止"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         BroadcastAction(String description){
             this.description = description;
@@ -456,12 +492,14 @@ 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("同步");
+        SYNC("同步"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         TimeAction(String description){
             this.description = description;
@@ -482,7 +520,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;
         }
     }
 
@@ -497,7 +535,8 @@ public interface TcpAction {
         SUCCESS("连接主机成功"),
         HANGUP("挂断"),
         TIMEOUT("响应超时"),
-        FAILED("连接失败");
+        FAILED("连接失败"),
+        NO_MATCH("没有匹配");
 
 
         private final String description;
@@ -521,13 +560,15 @@ 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("上传数据");
+        UPDATE("上传数据"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         LocationAction(String description){
             this.description = description;
@@ -548,7 +589,100 @@ 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;
+        }
+    }
+
+    /**
+     * 433相关action
+      */
+    enum S433Action implements TcpAction {
+        CALL("呼叫"),
+        SOS_CALL("紧急呼叫"),
+        CANCEL("取消"),
+        SYNC_TIME("同步时间"),
+        DATA("同步数据"),
+        EXIST("调试"),
+        ACK("返回"),
+        NO_MATCH("没有匹配");
+
+        private final String description;
+        S433Action(String description){
+            this.description = description;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName(){
+            return this.name();
+        }
+
+        private final static Map<String , S433Action> ENUM_MAP = new HashMap<String, S433Action>();
+        static {
+            for(S433Action v : values()) {
+                ENUM_MAP.put(v.toString() , v);
+            }
+        }
+        public static S433Action fromString(String v) {
+            S433Action userOptionEnum = ENUM_MAP.get(v);
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
+        }
+    }
+    enum SignInAction implements TcpAction{
+        SIGN_IN("发起签到"),
+        SIGN_IN_SUCCESS("签到成功"),
+        SIGN_IN_FAILED("签到失败");
+
+        private final String description;
+        SignInAction(String description){
+            this.description = description;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName(){
+            return this.name();
+        }
+
+        private final static Map<String , SignInAction> ENUM_MAP = new HashMap<String, SignInAction>();
+        static {
+            for(SignInAction v : values()) {
+                ENUM_MAP.put(v.toString() , v);
+            }
+        }
+        public static SignInAction fromString(String v) {
+            SignInAction signInAction = ENUM_MAP.get(v);
+            return signInAction;
+        }
+    }
+
+
+    enum PositionAction implements TcpAction{
+        POSITION_START("定位开始"),
+        POSITION_END("结束定位");
+        private final String description;
+        PositionAction(String description){
+            this.description = description;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName(){
+            return this.name();
+        }
+
+        private final static Map<String , PositionAction> ENUM_MAP = new HashMap<String, PositionAction>();
+        static {
+            for(PositionAction v : values()) {
+                ENUM_MAP.put(v.toString() , v);
+            }
+        }
+        public static PositionAction fromString(String v) {
+            PositionAction positionAction = ENUM_MAP.get(v);
+            return positionAction;
         }
     }
 }