|
@@ -414,7 +414,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
*/
|
|
*/
|
|
private long callTimeOut = (StringUtils.parseInt(Constants.CALLINGTIMEOUT) == 0 ? 30000 : StringUtils.parseInt(Constants.CALLINGTIMEOUT) * 1000);//默认30秒
|
|
private long callTimeOut = (StringUtils.parseInt(Constants.CALLINGTIMEOUT) == 0 ? 30000 : StringUtils.parseInt(Constants.CALLINGTIMEOUT) * 1000);//默认30秒
|
|
|
|
|
|
- private long screenTimeOut = 15000;
|
|
|
|
|
|
+ private long screenTimeOut = 15;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 时间线程
|
|
* 时间线程
|
|
@@ -889,6 +889,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
Constants.SCREENEXTINGUISHTIME = object.getString("screenExtinguishTime");
|
|
Constants.SCREENEXTINGUISHTIME = object.getString("screenExtinguishTime");
|
|
//Constants.DOORCALLVOICE = object.getString("DoorSipVol");
|
|
//Constants.DOORCALLVOICE = object.getString("DoorSipVol");
|
|
Constants.BEDCALLVOICE = object.getString("BedSipVol");
|
|
Constants.BEDCALLVOICE = object.getString("BedSipVol");
|
|
|
|
+ screenTimeOut = Integer.parseInt(Constants.SCREENEXTINGUISHTIME);
|
|
handler.sendEmptyMessage(SYSTEM_DATA_RESPONSE);
|
|
handler.sendEmptyMessage(SYSTEM_DATA_RESPONSE);
|
|
setSYSParameter();
|
|
setSYSParameter();
|
|
}
|
|
}
|
|
@@ -1598,7 +1599,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
private void resetOffScreen() {
|
|
private void resetOffScreen() {
|
|
handler.removeMessages(TURN_OFF_SCREEN);
|
|
handler.removeMessages(TURN_OFF_SCREEN);
|
|
if (StringUtils.notEmpty(Constants.MORNING_NIGTH) && Constants.MORNING_NIGTH.equals("1") && Constants.SCREENLIGHT.equals(SCREEN_OFF_LIGHT)) {//晚上
|
|
if (StringUtils.notEmpty(Constants.MORNING_NIGTH) && Constants.MORNING_NIGTH.equals("1") && Constants.SCREENLIGHT.equals(SCREEN_OFF_LIGHT)) {//晚上
|
|
- handler.sendEmptyMessageDelayed(TURN_OFF_SCREEN, screenTimeOut);
|
|
|
|
|
|
+ handler.sendEmptyMessageDelayed(TURN_OFF_SCREEN, screenTimeOut*1000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|