瀏覽代碼

xiugai bug

wjk 4 年之前
父節點
當前提交
ada513b075

+ 20 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioActivity.kt

@@ -59,7 +59,10 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
     private var gEngineKit: SkyEngineKit? = null
     private var gEngineKit: SkyEngineKit? = null
     private var handsFree:Boolean = false  //免提状态
     private var handsFree:Boolean = false  //免提状态
 
 
-
+    private var CALL_TIMEOUT = 2 //多久可以再次点击
+    //呼叫倒计时
+    lateinit var countDownTimer: CountDownTimer
+    private var isClick = false //是否可点击
 
 
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -71,6 +74,8 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
         if (!EventBus.getDefault().isRegistered(this)) {
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
             EventBus.getDefault().register(this)
         }
         }
+        initCountDownTimer()
+        countDownTimer.start()
 
 
         //todo 设置为通话状态 有其他用户输入时 DeviceChannel设置返回通话中
         //todo 设置为通话状态 有其他用户输入时 DeviceChannel设置返回通话中
         DeviceChannel.calling = true
         DeviceChannel.calling = true
@@ -217,6 +222,8 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
     override fun onClick(p0: View?) {
     override fun onClick(p0: View?) {
         when (p0?.id) {
         when (p0?.id) {
             R.id.hang_up_imagev -> {
             R.id.hang_up_imagev -> {
+                if(!isClick)return
+
                 var interactionVO: InteractionVO? = null
                 var interactionVO: InteractionVO? = null
                 if (tcpModel.data.javaClass.name == String::class.java.name) {
                 if (tcpModel.data.javaClass.name == String::class.java.name) {
                     interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                     interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
@@ -281,8 +288,17 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
         }
         }
 
 
     }
     }
+    fun initCountDownTimer() {
+        countDownTimer = object : CountDownTimer(CALL_TIMEOUT * 1000L, 1000) {
+            override fun onTick(millisUntilFinished: Long) {
 
 
+            }
 
 
+            override fun onFinish() {
+                isClick = true
+            }
+        }
+    }
 
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
     fun onMoonEvent(messageEvent: MessageEvent) {
@@ -395,6 +411,9 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
         super.onDestroy()
         super.onDestroy()
         //todo 状态设置为未在通话中
         //todo 状态设置为未在通话中
         DeviceChannel.calling = false
         DeviceChannel.calling = false
+        if(countDownTimer != null){
+            countDownTimer.cancel()
+        }
         MediaPlayHelper.getInstance().stopMusic()
         MediaPlayHelper.getInstance().stopMusic()
         EventBus.getDefault().unregister(this)
         EventBus.getDefault().unregister(this)
 
 

+ 2 - 0
home/src/main/java/com/wdkl/ncs/android/component/home/SOSEmergencyCallActivity.kt

@@ -35,6 +35,8 @@ class SOSEmergencyCallActivity : Activity(), View.OnClickListener {
         interactionVO = Gson().fromJson(tcpModel!!.getData().toString(), InteractionVO::class.java)
         interactionVO = Gson().fromJson(tcpModel!!.getData().toString(), InteractionVO::class.java)
         init()
         init()
         MediaPlayHelper.getInstance().playResMusic(R.raw.sos2, 1.0f, true)
         MediaPlayHelper.getInstance().playResMusic(R.raw.sos2, 1.0f, true)
+
+
     }
     }