Browse Source

修改sos呼叫tcp action

weizhengliang 2 năm trước cách đây
mục cha
commit
38e3d75d76

+ 1 - 1
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之后紧急按钮灯自动复位

+ 13 - 0
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());

+ 2 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/enums/TcpAction.java

@@ -196,6 +196,8 @@ public interface TcpAction {
         ALARM_VITAL("体征报警"),
         AlARM_BUTTON("紧急按钮"),
         ALARM_FALL_RADAR("跌到报警"),
+        ALARM_INFUSION_RADAR("输液报警"),
+        ROOM_CALL("房间紧急呼叫"),
         NO_MATCH("没有匹配");
 
         private final String description;