|
@@ -456,6 +456,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
|
|
|
private void callingBedNotice() throws Exception {
|
|
|
if (System.currentTimeMillis() - millsCurrent > (1000 * 60 * 5)) {
|
|
|
+ millsCurrent = System.currentTimeMillis();
|
|
|
//床位号文字闪烁重置
|
|
|
try {
|
|
|
for (int i = 0; i < mBedDataList.size(); i++) {
|
|
@@ -466,10 +467,12 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
}
|
|
|
//门灯重置
|
|
|
if (MyApplication.serialPortUtil != null){
|
|
|
- if (SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.DoorLight) == 0) {
|
|
|
- MyApplication.serialPortUtil.doorControl(0, null);//关闭门灯
|
|
|
- } else {
|
|
|
- MyApplication.serialPortUtil.doorControl(1, "111");//白色
|
|
|
+ if (!isEnterNurseControlDoorLight) {
|
|
|
+ if (SharedPreferencesUtil.getIntSp(MyApplication.getAppContext(), Constants.MSG_SP, SharedPreferencesUtil.DoorLight) == 0) {
|
|
|
+ MyApplication.serialPortUtil.doorControl(0, null);//关闭门灯
|
|
|
+ } else {
|
|
|
+ MyApplication.serialPortUtil.doorControl(1, "111");//白色
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|