Prechádzať zdrojové kódy

修改模拟紧急按钮呼叫,点阵屏无显示问题

weizhengliang 2 rokov pred
rodič
commit
e2b9b94afe

+ 3 - 2
android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/LedHelper.java

@@ -37,7 +37,8 @@ public class LedHelper {
 
         Log.d("led", "update led info, deviceType: " + interactionVO.getFromDeviceType() + ", frameName: " + interactionVO.getFromFrameFullName() + ", data: " + interactionVO.getData());
         if (interactionVO.getFromDeviceType() == DeviceTypeEnum.DIGIT_BED_DEVICE.value()
-                || interactionVO.getFromDeviceType() == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()) {
+                || interactionVO.getFromDeviceType() == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()
+                || interactionVO.getFromDeviceType() == DeviceTypeEnum.DOOR_DEVICE.value()) {
             //如果交互记录中的fromdevice是分机,有可能是数字分机发送过来的紧急呼叫,需要特别处理
             if (emergency) {
                 String frameName = CommonUtils.subStringBefore(interactionVO.getFromFrameFullName(), "-");
@@ -68,7 +69,7 @@ public class LedHelper {
                 frameName = interactionVO.getFromDeviceName();
             }
 
-            if (Strings.isNullOrEmpty(interactionVO.getData())) {
+            if (!Strings.isNullOrEmpty(interactionVO.getData())) {
                 if (isAdd) {
                     //新增led节目
                     LedManagerUtils.getInstance().updateProgram(interactionVO.getData(), 1);

+ 1 - 1
android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/LedHelper.java

@@ -69,7 +69,7 @@ public class LedHelper {
                 frameName = interactionVO.getFromDeviceName();
             }
 
-            if (Strings.isNullOrEmpty(interactionVO.getData())) {
+            if (!Strings.isNullOrEmpty(interactionVO.getData())) {
                 if (isAdd) {
                     //新增led节目
                     LedManagerUtils.getInstance().updateProgram(interactionVO.getData(), 1);