Browse Source

<主机主动和分机通话时去掉语音提示>

weizhengliang 4 years ago
parent
commit
8ac4417434

+ 4 - 4
app/src/main/java/com/wdkl/callingbed/ui/CallingBedActivity.java

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