代码优化

bedlib/src/main/java/serialporttest/utils/SerialPortUtil.java

@@ -181,7 +181,7 @@ public class SerialPortUtil {
     }
 
     public void sendData(String data) {
-        Log.d("bbbb", "data==" + data);
+        //Log.d("bbbb", "data==" + data);
         if (!StringUtils.notEmpty(data)) return;
         if (isOpenSerialPortUtil) {
             //reset data

bedlib/src/main/jni/Application.mk

@@ -1 +1 @@
-APP_ABI := armeabi-v7a armeabi-v8a
+APP_ABI := armeabi-v7a, armeabi-v8a

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     /**
      * Kotlin统一版本
      */
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.3.21'
 
     /**
      * Aop编制版本
@@ -44,7 +44,7 @@ buildscript {
     /**
      * 支持库版本
      */
-    ext.support_library_version = "26.0.1"
+    ext.support_library_version = "26.1.0"
 
     /**
      * APP版本码

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -223,6 +223,10 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     }
 
     private fun showCalling(audioOnly: Boolean) {
+        if (callEnded) {
+            return
+        }
+
         if (audioOnly) {
             //移除视频画面
             fullscreen_video_frame.visibility = View.GONE
@@ -444,6 +448,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     override fun didChangeState(var1: EnumType.CallState?) {
         if (var1 == EnumType.CallState.Connected) {
             handler.post {
+                RingPlayHelper.stopRingTone()
                 //更新界面显示
                 showCalling(audioCall)
             }

settings.gradle

@@ -1,2 +1,3 @@
 include ':app', ':common', ':welcome', ':home', ':resource', ':middleware', ':extra', ':callingbed', ':bedlib', ':janus'
+
 //'webrtc', 'rtc-chat', 'libwebrtc'