解决BUG

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

@@ -387,10 +387,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Log.i(TAG,"收到设置设备数据 transferDuration"+partSettingDO.transferDuration)
         Log.i(TAG,"收到设置设备数据 transferDurationLeader"+partSettingDO.transferDurationLeader)
         if(partSettingDO != null&&partSettingDO.transferDuration !=null&&partSettingDO.transferDurationLeader != null){
-            if (!Constants.user_role_name!!.contains("护士组长")&& Constants.user_role_name!!.contains("护士")) {
-                SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
-            }else if(Constants.user_role_name!!.contains("护士组长")){
-                SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
+            if (Constants.user_role_name != null) {
+                if (!Constants.user_role_name!!.contains("护士组长") && Constants.user_role_name!!.contains("护士")) {
+                    SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
+                } else if (Constants.user_role_name!!.contains("护士组长")) {
+                    SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
+                }
             }
         }
     }

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

@@ -88,17 +88,18 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
                 MediaPlayHelper.getInstance().stopMusic()
                 countDownTimer?.cancel()
                 //todo 给服务器发送转接 tcp
+                DeviceChannel.calling = false
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 val voiceTransferTcpModel = VoiceUtil.voiceTransfer(Integer.parseInt(Constants.ids), tcpModel.fromId, interactionVO)
                 TcpClient.getInstance().sendMsg(voiceTransferTcpModel.toJson())
                 finish()
             }
             R.id.hang_up_imagev ->{
+                DeviceChannel.calling = false
                 isAnswerOrHangUp = true
                 MediaPlayHelper.getInstance().stopMusic()
                 countDownTimer?.cancel()
-                //todo 给服务器发送拒接 tcp
-//            InteractionVO interactionVO = (InteractionVO) tcpModel.getData();
+                //t给服务器发送拒接 tcp
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 val voiceUtilTcpModel = VoiceUtil.voiceReject(Integer.parseInt(Constants.ids), tcpModel.fromId, interactionVO.id)
                 TcpClient.getInstance().sendMsg(voiceUtilTcpModel.toJson())
@@ -108,24 +109,19 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
                 isAnswerOrHangUp = true
                 MediaPlayHelper.getInstance().stopMusic()
                 countDownTimer?.cancel()
-                //todo 给服务器发送接听 tcp
-//            InteractionVO interactionVO = (InteractionVO) tcpModel.getData();
+                //给服务器发送接听 tcp
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 val voiceUtilTcpModel = VoiceUtil.voiceAccept(Integer.parseInt(Constants.ids), tcpModel.fromId, interactionVO.id)
                 TcpClient.getInstance().sendMsg(voiceUtilTcpModel.toJson())
 
                 val intent = Intent(this, WebRTCVoipAudioActivity::class.java)
                 intent.putExtra("targetId", targetId)
-//            intent.putExtra("interactionVO", interactionVO);
                 intent.putExtra("TcpModel", tcpModel)
                 intent.putExtra(WebRTCVoipAudioActivity().ACTION, WebRTCVoipAudioActivity().CALLING)
                 startActivity(intent)
                 finish()
-
             }
-
         }
-
     }
 
     private fun initCountDownTimer() {

home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -8,6 +8,7 @@ import com.google.gson.Gson
 import com.wdkl.ncs.android.component.home.SOSEmergencyCallActivity
 import com.wdkl.ncs.android.component.home.activity.WatchEventDetailActivity
 import com.wdkl.ncs.android.component.home.activity.WebRTCVoipAudioActivity
+import com.wdkl.ncs.android.component.home.activity.WebRTCVoipAudioRingingActivity
 import com.wdkl.ncs.android.component.home.util.AppUtils
 import com.wdkl.ncs.android.component.home.util.SpeechUtil
 import com.wdkl.ncs.android.component.home.util.Util
@@ -52,19 +53,19 @@ class TcpHandleService : Service(){
 //                var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
                 var interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 var intent = Intent()
-                intent.setClass(this, WebRTCVoipAudioActivity::class.java)
 
                 if (tcpModel.action == TcpAction.VoiceAction.SUCCESS){  //拨出成功
                     DeviceChannel.calling = true;
+                    intent.setClass(this, WebRTCVoipAudioActivity::class.java)
                     intent.putExtra("targetId", interactionVO?.toSipId)
                     intent.putExtra("TcpModel", tcpModel)
                     intent.putExtra(WebRTCVoipAudioActivity().ACTION, WebRTCVoipAudioActivity().CALL)
                     startActivity(intent)
                 } else if (tcpModel.action == TcpAction.VoiceAction.CALL){  //有来电
                     DeviceChannel.calling = true;
+                    intent.setClass(this, WebRTCVoipAudioRingingActivity::class.java)
                     intent.putExtra("targetId", interactionVO?.fromSipId)
                     intent.putExtra("TcpModel", tcpModel)
-                    intent.putExtra(WebRTCVoipAudioActivity().ACTION, WebRTCVoipAudioActivity().CALL)
                     startActivity(intent)
                 }
             }