|
@@ -1626,10 +1626,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
}
|
|
|
|
|
|
if (!udpEntity.getType().equals(Constants.WSHROOM_CALL)) {//排除卫生间;卫生间是不能呼叫的
|
|
|
- //护士主机消除请求增援
|
|
|
- if (CALL_STATUS.equals(Constants.SUPPORT_IN_CALL)) {
|
|
|
+ if (!CALL_STATUS.equals(STANDBY)) {
|
|
|
CALL_STATUS = STANDBY;
|
|
|
showThisView(vMain);
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
|
}
|
|
|
} else {
|
|
|
flickerStatus = setWSHLightFlicker(serialPortUtil, false);
|
|
@@ -2311,7 +2311,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
versionEntityList.add(entity2);
|
|
|
VersionEntity entity3 = new VersionEntity();
|
|
|
entity3.setTitle("APP版本");
|
|
|
- entity3.setValue(BuildConfig.VERSION_NAME);
|
|
|
+ entity3.setValue("V" + BuildConfig.VERSION_NAME);
|
|
|
versionEntityList.add(entity3);
|
|
|
VersionEntity entity4 = new VersionEntity();
|
|
|
entity4.setTitle("MCU版本");
|