## [1.1.18] version 37 - 2020-08-04

### Fixed
- 解决若干个问题

build.gradle

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

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioActivity.kt

@@ -60,7 +60,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
     private var CALL_TIMEOUT = 2 //多久可以再次点击
     //呼叫倒计时
     lateinit var countDownTimer: CountDownTimer
-    private var isClick = false //是否可点击
+    private var isClick = true //是否可点击
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -107,6 +107,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
         } else if (action == RING) {
             Log.i(TAG, "接电话。。。")
         } else if (action == CALL) { //主动拨出，服务端回复success时
+            call_duration_tv.text = "等待接听"
             MediaPlayHelper.getInstance().playResMusic(R.raw.outgoing_call, 0.6f, true)
         }
     }
@@ -207,6 +208,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
     override fun onClick(p0: View?) {
         when (p0?.id) {
             R.id.hang_up_imagev -> {
+                countDownTimer.start()
                 handOffCall()
             }
             R.id.hands_free_image -> {
@@ -227,7 +229,12 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
     }
 
     fun handOffCall(){
-        if(!isClick)return
+        if(!isClick) {
+            showMessage("勿频繁点击，2秒后可用")
+            return
+        }
+        hang_up_imagev.isEnabled = false
+        isClick = false
 
         var interactionVO: InteractionVO? = null
         if (tcpModel.data.javaClass.name == String::class.java.name) {
@@ -257,6 +264,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
             override fun onTick(millisUntilFinished: Long) {
             }
             override fun onFinish() {
+                hang_up_imagev.isEnabled = true
                 isClick = true
             }
         }

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioRingingActivity.kt

@@ -211,14 +211,18 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
         if (messageEvent.tag == 2) {
             val tcpModel = messageEvent.getMessage() as TcpModel?
             Log.i(TAG,"收到tcp"+tcpModel!!.action)
-            if (tcpModel!!.action === TcpAction.VoiceAction.CANCEL || tcpModel!!.action === TcpAction.VoiceAction.HANDOFF) {
-                //对方取消;
-                countDownTimer?.cancel()
-                MediaPlayHelper.getInstance().stopMusic()
-                mVibrator.cancel()
-                DeviceChannel.calling = false
+            if (tcpModel.action === TcpAction.VoiceAction.CANCEL || tcpModel.action === TcpAction.VoiceAction.HANDOFF) {
+
+                val curInteractionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+                if (curInteractionVO.id==interactionVO.id) {
+                    //对方取消;
+                    countDownTimer?.cancel()
+                    MediaPlayHelper.getInstance().stopMusic()
+                    mVibrator.cancel()
+                    DeviceChannel.calling = false
 //                asyncPlayer.stop()
-                finish()
+                    finish()
+                }
             }
         } else if (messageEvent.tag == Constants.EVENT_BLUETOOTH_ACCEPT_CALL){
             answerCall()

readme.md

@@ -26,6 +26,12 @@
 
 ---
 
+## [1.1.18] version 37 - 2020-08-04
+### Fixed
+- 解决若干个问题
+
+---
+
 ## [1.1.17] version 36 - 2020-08-04
 ### Fixed
 - 解决两方通话中，第三方呼出会导致全部退出的问题