呼叫问题

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/MainActivity.kt

@@ -425,7 +425,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                 when (content[0]) {
                     "A" -> {
                         if (Constant.CALL_STATE == Constant.CALL_STANDBY) {
-                            startOutCall(addr)
+                            startCall(addr)
                         } else if (Constant.CALL_STATE == Constant.CALL_INCOMING && addr.equals(curDeviceUart)) {
                             //分机接听
                             RingPlayHelper.stopRingTone()
@@ -433,9 +433,9 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                         } else {
                             //分机呼叫
                             if (curInteractionVO == null) {
-                                startOutCall(addr)
-                            } else if (!addr.equals(curInteractionVO!!.fromEthMac)) {
-                                startOutCall(addr)
+                                startCall(addr)
+                            } else if (!addr.equals(curInteractionVO!!.fromEthMac) && !addr.equals(curInteractionVO!!.toEthMac)) {
+                                startCall(addr)
                             }
                         }
                     }
@@ -521,7 +521,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         }
     }
 
-    private fun startOutCall(uart: String) {
+    private fun startCall(uart: String) {
         if (SocketManager.getInstance().socketOpen() && Constant.TCP_CONNECTED) {
             //通过串口地址查找到对应分机设备id
             if (FrameHelper.frameDeviceList.size > 0 ) {