|
@@ -1958,8 +1958,16 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
}
|
|
}
|
|
if (StringUtils.notEmpty(Constants.MORNING_NIGTH) && Constants.MORNING_NIGTH.equals("1")) {//晚上
|
|
if (StringUtils.notEmpty(Constants.MORNING_NIGTH) && Constants.MORNING_NIGTH.equals("1")) {//晚上
|
|
lightStatus = setWSHLight(serialPortUtil, true);
|
|
lightStatus = setWSHLight(serialPortUtil, true);
|
|
- if (Constants.SCREENLIGHT.equals("1") && !isVisible(vNurse) && !isVisible(vSupport) && !isVisible(vCall)) {//排除呼叫状态
|
|
|
|
- showBlackView();
|
|
|
|
|
|
+ if (Constants.SCREENLIGHT.equals("1")) {
|
|
|
|
+ if (!isVisible(vNurse) && !isVisible(vSupport) && !isVisible(vCall)) {//排除呼叫状态
|
|
|
|
+ showBlackView();
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ handler.removeMessages(TURN_OFF_SCREEN);
|
|
|
|
+ if (isVisible(blackView)) {
|
|
|
|
+ blackView.setVisibility(View.GONE);
|
|
|
|
+ showThisView(vMain);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
lightStatus = setWSHLight(serialPortUtil, false);
|
|
lightStatus = setWSHLight(serialPortUtil, false);
|