Преглед изворни кода

修复bug:分机呼叫超时取消后未退出janus通话,导致下次呼叫失败

weizhengliang пре 3 година
родитељ
комит
2a15b3cdbd

+ 2 - 2
build.gradle

@@ -49,12 +49,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 11
+    ext.app_version_code = 12
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.5"
+    ext.app_version = "1.1.6"
 
     /**
      * 项目依赖库

+ 4 - 1
callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/BaseCallFragment.kt

@@ -81,6 +81,8 @@ abstract class BaseCallFragment: Fragment() {
 
     protected abstract fun destroy()
 
+    protected abstract fun callEnd()
+
     //初始化计时器
     protected fun initCountDownTimer(view: TextView) {
         val overTime = SettingConfig.getSipOverTime(baseActivity) * 1000L
@@ -98,7 +100,8 @@ abstract class BaseCallFragment: Fragment() {
                 showMessage("无人应答...")
                 Constant.CALL_STATE = Constant.CALL_STANDBY
                 VoiceUtil.cancelAudioCall(Constant.DEVICE_ID)
-                backToMain()
+                //backToMain()
+                callEnd()
             }
         }
     }

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

@@ -249,7 +249,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     }
 
     //通话结束
-    private fun callEnd() {
+    override fun callEnd() {
         synchronized(this) {
             if (callEnded) {
                 return