|
@@ -483,7 +483,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
checkAndDownloadMP3(0);
|
|
|
break;
|
|
|
case NEW_INCOMING_CALL:
|
|
|
- newCalling();
|
|
|
+ //newCalling();
|
|
|
break;
|
|
|
}
|
|
|
} else {
|
|
@@ -2337,7 +2337,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- if (CALL_STATUS.equals(Constants.STANDBY)) {
|
|
|
+ /*if (CALL_STATUS.equals(Constants.STANDBY)) {
|
|
|
//主机主动呼叫分机
|
|
|
CALL_STATUS = Constants.IN_CALLING;
|
|
|
//正在通话中:isIncomingCall() = true
|
|
@@ -2347,7 +2347,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
tvNurseText.setText("主机请求通话...");
|
|
|
tvNurseTimeOut.setText("");
|
|
|
handler.sendEmptyMessageDelayed(NEW_INCOMING_CALL, 2000);
|
|
|
- } else {
|
|
|
+ } else {*/
|
|
|
//分机主动呼叫主机
|
|
|
CALL_STATUS = Constants.IN_CALL;
|
|
|
handsMICStatus = setHandsMIC(serialPortUtil, true);//面板mic有回音,需要禁掉
|
|
@@ -2363,7 +2363,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
//jbVNurse.stopJumping();
|
|
|
tvNurseText.setText("正在通话中...");
|
|
|
tvNurseTimeOut.setText("");
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
if (isTransfer) {
|
|
|
} else {
|