版本升级到1.1.17

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 29
+    ext.app_version_code = 30
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.16"
+    ext.app_version = "1.1.17"
 
     /**
      * 项目依赖库

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

@@ -50,6 +50,7 @@ import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.udp.ServerInfoUtil
 import com.wdkl.ncs.android.middleware.utils.AppUtil
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
+import com.wdkl.ncs.janus.rtc.WebRTCEngine
 import com.wdkl.ncs.janus.util.JanusConstant
 import kotlinx.android.synthetic.main.conversion_box_main_lay.*
 import kotlinx.android.synthetic.main.main_activity_layout.*
@@ -764,6 +765,20 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
 
     //串口处理
     override fun serialPortBedOnclick(str: String) {
+        /*try {
+            if (Constant.CALL_STATE == Constant.CALL_CALLING) {
+                //正在通话中，先静音然后再开启，防止噪音
+                WebRTCEngine.getInstance().muteAudio(true)
+                handler.postDelayed({
+                    if (Constant.CALL_STATE == Constant.CALL_CALLING) {
+                        WebRTCEngine.getInstance().muteAudio(false)
+                    }
+                }, 800)
+            }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }*/
+
         try {
             val newStr: String = CutSerialPortUtil.delHeadAndEnd(str, "$", "#")
             val content = newStr.split(",").toTypedArray()

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/fragment/CallFragment.kt

@@ -235,6 +235,7 @@ class CallFragment: Fragment(), CallSessionCallback {
 
     //通话结束
     private fun callEnd() {
+        Constant.CALL_STATE = Constant.CALL_STANDBY
         if (callEnded) {
             return
         }
@@ -254,7 +255,6 @@ class CallFragment: Fragment(), CallSessionCallback {
         }
 
         targetSip = ""
-        Constant.CALL_STATE = Constant.CALL_STANDBY
 
         backToMain()
     }