|
|
@@ -2935,8 +2935,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
protected void comeBackMainPage() {
|
|
|
timeOfBackMainPage++;
|
|
|
timeOut--;
|
|
|
- if ((timeOut <= 0) || (!isVisible(vMain) && timeOfBackMainPage >= callTimeOutBack
|
|
|
- && !CALL_STATUS.equals(Constants.IN_CALL) && !CALL_STATUS.equals(Constants.IN_CALLING) && !isEmptyInfo)) {
|
|
|
+ if (!isVisible(vMain) && timeOfBackMainPage >= callTimeOutBack
|
|
|
+ && !CALL_STATUS.equals(Constants.IN_CALL) && !CALL_STATUS.equals(Constants.IN_CALLING) && !isEmptyInfo) {
|
|
|
// if (callNurse) {//超时自动取消呼叫了，20191118 之前是长按取消呼叫，后来又改成了根据UI的改变来取消，说让客户一目了然
|
|
|
// callNurse = false;
|
|
|
// UdpSendUtil.sendHangUp(initDataEntity, mainDataEntity);//取消呼叫 add by waderson 20191118
|
