Bläddra i källkod

3128主机去掉免提和听筒切换,该主机由mcu控制,app层无需再处理

weizhengliang 1 år sedan
förälder
incheckning
1add8521f7

+ 2 - 3
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -250,8 +250,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                             Log.e("SipCall", "call recording: " + call.isRecording + ", path: " + call.params.recordFile)
                         }*/
 
-                        EventBus.getDefault()
-                            .post(MessageEvent("sip_connected", Constant.SIP_CONNECTED))
+                        EventBus.getDefault().post(MessageEvent("sip_connected", Constant.SIP_CONNECTED))
                     }
                 }
 
@@ -2670,7 +2669,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
             SerialPortUtilHost.getInstance().setHandsFree(false)
             SerialPortUtilHost.getInstance().setMIC(false)
 
-            EventBus.getDefault().post(MessageEvent(false, Constant.EVENT_TOGGLE_SPEAKER))
+            //EventBus.getDefault().post(MessageEvent(false, Constant.EVENT_TOGGLE_SPEAKER))
             if (Constant.hookOn && System.currentTimeMillis() - hookoffTime > 2000) {
                 VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostGamepadPlayVolume(this.activity))
                 if (Constant.CALL_STATE != Constant.CALL_CALLING && Constant.CALL_STATE != Constant.CALL_OUTGOING) {

+ 5 - 5
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SipCallFragment.kt

@@ -1,9 +1,6 @@
 package com.wdkl.ncs.android.component.nursehome.fragment
 
-import android.os.CountDownTimer
-import android.os.Handler
-import android.os.Looper
-import android.os.SystemClock
+import android.os.*
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
@@ -267,7 +264,10 @@ class SipCallFragment: BaseCallFragment() {
     private fun toggleSpeaker(enable: Boolean) {
         Log.d(TAG, "toggle speaker: $enable")
 
-        linphoneManager?.enableSpeaker(enable)
+        //rk3128主机无需免提切换
+        if (Build.MODEL != "rk3128") {
+            linphoneManager?.enableSpeaker(enable)
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)