فهرست منبع

新增房间紧急呼叫类型

weizhengliang 2 سال پیش
والد
کامیت
3c7d570237

+ 3 - 3
home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -543,7 +543,7 @@ class WdKeepAliveService : AbsWorkService() {
                     }
                     EventBus.getDefault().post(MessageEvent(sosTcpModel, Constants.EVENT_UPDATE_EVENT))
 
-                } else if (sosTcpModel.action === TcpAction.SOSAction.CALL) {
+                } else if (sosTcpModel.action == TcpAction.SOSAction.CALL || sosTcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
                     //取消掉语音留言录音
                     RecordHelper.getInstance().stopCancelRecordByOther(true)
 
@@ -563,7 +563,7 @@ class WdKeepAliveService : AbsWorkService() {
                                 Thread.sleep(400)
                             }
 
-                            if (sosTcpModel.action == TcpAction.SOSAction.CALL) {
+                            if (sosTcpModel.action == TcpAction.SOSAction.CALL || sosTcpModel.action == TcpAction.SOSAction.ROOM_CALL) {
                                 val intent = Intent()
                                 intent.setClass(this, NewEventListActivity::class.java)
                                 //intent.putExtra("tcpModelStr", tcpModelIn.toJson())
@@ -731,7 +731,7 @@ class WdKeepAliveService : AbsWorkService() {
                 //MediaPlayHelper.getInstance().playResMusic(R.raw.new_event, 1.0f, false)
                 RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.new_event, false)
             }
-        } else if (model.type == TcpType.SOS && model.action == TcpAction.SOSAction.CALL) {
+        } else if (model.action == TcpAction.SOSAction.CALL || model.action == TcpAction.SOSAction.ROOM_CALL) {
             AppTool.Time.delay(500) {
                 //MediaPlayHelper.getInstance().playResMusic(R.raw.sos, 1.0f, true)
                 RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.sos, false)

+ 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;