打开广播功能

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/MainActivity.kt

@@ -788,43 +788,48 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
 
 
     override fun setPartSettings(partSetting: PartSettingDO) {
-        //设置白昼起止时间
-        SettingConfig.setInitialDayTime(this, partSetting.dayStart.substring(0,5))
-        SettingConfig.setEndOfDay(this,partSetting.nightStart.substring(0,5))
+        try {
+            //设置白昼起止时间
+            SettingConfig.setInitialDayTime(this, partSetting.dayStart.substring(0, 5))
+            SettingConfig.setEndOfDay(this, partSetting.nightStart.substring(0, 5))
 
-        //分机白天夜晚亮度
-        SettingConfig.setExtensionDaytimeBrightness(this, partSetting.dayLight)
-        SettingConfig.setExtensionNightBrightness(this, partSetting.nightLight)
+            //分机白天夜晚亮度
+            SettingConfig.setExtensionDaytimeBrightness(this, partSetting.dayLight)
+            SettingConfig.setExtensionNightBrightness(this, partSetting.nightLight)
 
-        //分机白天夜晚护理灯 也就是LED灯的亮度
-        SettingConfig.setExtensionDaytimeLEDBrightness(this, partSetting.dayNurseLed)
-        SettingConfig.setExtensionNightLEDBrightness(this, partSetting.nightNurseLed)
+            //分机白天夜晚护理灯 也就是LED灯的亮度
+            SettingConfig.setExtensionDaytimeLEDBrightness(this, partSetting.dayNurseLed)
+            SettingConfig.setExtensionNightLEDBrightness(this, partSetting.nightNurseLed)
 
-        //分机白天夜晚系统音量
-        SettingConfig.setExtensionDaytimeSystemVolume(this, partSetting.dayBedVol)
-        SettingConfig.setExtensionNightSystemVolume(this, partSetting.nightBedVol)
+            //分机白天夜晚系统音量
+            SettingConfig.setExtensionDaytimeSystemVolume(this, partSetting.dayBedVol)
+            SettingConfig.setExtensionNightSystemVolume(this, partSetting.nightBedVol)
 
-        //分机通话音量  没做白昼区分
-        SettingConfig.setExtensionCallVolume(this, partSetting.dayBedVol)
+            //分机通话音量  没做白昼区分
+            SettingConfig.setExtensionCallVolume(this, partSetting.dayBedVol)
 
-        SettingConfig.setConversionBoxDaytimeSystemVolume(this, partSetting.dayTransferBoxSystemVol)
-        SettingConfig.setConversionBoxNightSystemVolume(this, partSetting.nightTransferBoxSystemVol)
+            SettingConfig.setConversionBoxDaytimeSystemVolume(this, partSetting.dayTransferBoxSystemVol)
+            SettingConfig.setConversionBoxNightSystemVolume(this, partSetting.nightTransferBoxSystemVol)
 
-        SettingConfig.setSipOverTime(this, partSetting.sipOvertime)
-        SettingConfig.setSleepTime(this, partSetting.sleepSecondsBed)
+            SettingConfig.setSipOverTime(this, partSetting.sipOvertime)
+            SettingConfig.setSleepTime(this, partSetting.sleepSecondsBed)
 
-        VoiceManagerUtil.setCallVoice(activity, partSetting.dayTransferBoxVol)
+            VoiceManagerUtil.setCallVoice(activity, partSetting.dayTransferBoxVol)
+            SettingConfig.setConversionBoxCallVolume(activity, partSetting.dayTransferBoxVol)
 
-        if (partSetting.autoAccept != null && partSetting.autoAccept == 1) {
-            Constant.autoAnswer = true
-        } else {
-            Constant.autoAnswer = false
-        }
+            if (partSetting.autoAccept != null && partSetting.autoAccept == 1) {
+                Constant.autoAnswer = true
+            } else {
+                Constant.autoAnswer = false
+            }
 
-        if (partSetting.twoColorDoorLightValid != null && partSetting.twoColorDoorLightValid == 1) {
-            Constant.colorLight = true
-        } else {
-            Constant.colorLight = false
+            if (partSetting.twoColorDoorLightValid != null && partSetting.twoColorDoorLightValid == 1) {
+                Constant.colorLight = true
+            } else {
+                Constant.colorLight = false
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
 
         //initCallTimer()
@@ -1805,16 +1810,16 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                                 }
                             }
                         }
-                    } /*else if (tcpModel.type == TcpType.BROADCAST) {
+                    } else if (tcpModel.type == TcpType.BROADCAST) {
                         if (tcpModel.action == TcpAction.BroadcastAction.START) {
                             if (Constant.TCP_CONNECTED && !TextUtils.isEmpty(Constant.SIP_ID)) {
                                 if (tcpModel.data != null && !broadcastOn) {
                                     broadcastOn = true
                                     broadcastChannelId = tcpModel.data.toString()
                                     //如果当前有呼叫或通话则等待
-                                    if (Constant.CALL_STATE == Constant.CALL_STANDBY) {
+                                    //if (Constant.CALL_STATE == Constant.CALL_STANDBY) {
                                         startBroadcast()
-                                    }
+                                    //}
                                 }
                             } else {
                                 showMessage("服务未连接或sipId为空")
@@ -1823,7 +1828,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                             broadcastOn = false
                             stopBroadcast(true)
                         }
-                    }*/ else if (tcpModel.type == TcpType.SIDE) {
+                    } else if (tcpModel.type == TcpType.SIDE) {
                         //门灯控制
                         controlDoorLight(tcpModel)
                     } else if (tcpModel.action == TcpAction.DataAction.REFRESH) {
@@ -1905,12 +1910,14 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         janusClient?.setJanusCallback(streamingCallback)
         janusClient?.connect()
 
+        //VoiceManagerUtil.setCallVoice(activity, 20)
+        //WebRTCEngine.getInstance().muteAudio(true)
+
         SerialPortHelper.openBroadcast()
 
         runOnUiThread {
             showMessage(R.string.broadcast_playing)
-            //tv_broadcast_text.text = "广播正在播放......"
-            //tv_broadcast_state.setBackgroundResource(R.drawable.ic_baseline_pause)
+            tv_broadcast_state.text = getString(R.string.broadcast_status) + getString(R.string.broadcast_playing)
         }
     }
 
@@ -1921,6 +1928,10 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
             showMsgMain(getString(R.string.broadcast_stop))
         }
 
+        runOnUiThread {
+            tv_broadcast_state.text = getString(R.string.broadcast_status) + getString(R.string.broadcast_stop)
+        }
+
         if (janusClient != null) {
             janusClient?.destroySession()
             janusClient = null

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/fragment/CallFragment.kt

@@ -14,6 +14,8 @@ import com.wdkl.app.ncs.conversion_box.R
 import com.wdkl.app.ncs.conversion_box.activity.MainActivity
 import com.wdkl.app.ncs.conversion_box.helper.RingPlayHelper
 import com.wdkl.app.ncs.conversion_box.helper.SerialPortHelper
+import com.wdkl.app.ncs.conversion_box.helper.VoiceManagerUtil
+import com.wdkl.app.ncs.conversion_box.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
@@ -78,6 +80,9 @@ class CallFragment: Fragment(), CallSessionCallback {
         //初始化 janusClient
         janusClient = JanusClient(JanusConstant.JANUS_URL, Constant.SIP_ID.toBigInteger())
 
+        VoiceManagerUtil.setCallVoice(activity, SettingConfig.getConversionBoxCallVolume(this.context))
+        WebRTCEngine.getInstance().muteAudio(false)
+
         if (callState == 0) {
             //去电
             outGoing = true

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/fragment/SipCallFragment.kt

@@ -11,6 +11,8 @@ import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.wdkl.app.ncs.conversion_box.R
 import com.wdkl.app.ncs.conversion_box.activity.MainActivity
 import com.wdkl.app.ncs.conversion_box.helper.RingPlayHelper
+import com.wdkl.app.ncs.conversion_box.helper.VoiceManagerUtil
+import com.wdkl.app.ncs.conversion_box.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
@@ -62,6 +64,8 @@ class SipCallFragment: Fragment() {
     fun init() {
         RingPlayHelper.stopRingTone()
 
+        VoiceManagerUtil.setCallVoice(activity, SettingConfig.getConversionBoxCallVolume(this.context))
+
         linphoneManager = LinphoneManager.getInstance(BaseApplication.appContext)
         linphoneManager?.enableMic(true)
         toggleSpeaker(true)

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/settings/SettingConfig.java

@@ -69,6 +69,8 @@ public class SettingConfig {
     private static final String KEY_SP_CONVERSION_BOX_NIGHT_SYSTEM_VOLUME = "KEY_SP_CONVERSION_BOX_NIGHT_SYSTEM_VOLUME";
     private static final int conversion_box_night_system_volume = 50;
 
+    private static final String KEY_SP_CONVERSION_BOX_CALL_VOLUME = "KEY_SP_CONVERSION_BOX_CALL_VOLUME";
+
     //网络异常重启次数
     private static final String KEY_SP_NET_ERR_RESET_COUNT = "KEY_SP_NET_ERR_RESET_COUNT";
 
@@ -230,6 +232,14 @@ public class SettingConfig {
         getEditor(context).putInt(KEY_SP_CONVERSION_BOX_NIGHT_SYSTEM_VOLUME, value).apply();
     }
 
+    public static int getConversionBoxCallVolume(Context context) {
+        return getSP(context).getInt(KEY_SP_CONVERSION_BOX_CALL_VOLUME, 60);
+    }
+
+    public static void setConversionBoxCallVolume(Context context, int volume) {
+        getEditor(context).putInt(KEY_SP_CONVERSION_BOX_CALL_VOLUME, volume).apply();
+    }
+
 
     /**
      * 获取分机手柄录入音量

conversion_box/src/main/res/layout/main_activity_layout.xml

@@ -154,6 +154,14 @@
                 android:textColor="@color/main_color"
                 android:text="@string/call_status" />
             <TextView
+                android:id="@+id/tv_broadcast_state"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textSize="16sp"
+                android:textColor="@color/main_color"
+                android:text="@string/broadcast_status" />
+            <TextView
                 android:id="@+id/tv_uart0_info"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

janus/src/main/java/com/wdkl/ncs/janus/rtc/WebRTCEngine.java

@@ -243,8 +243,7 @@ public class WebRTCEngine {
                 .setVideoEncoderFactory(encoderFactory)
                 .setVideoDecoderFactory(decoderFactory);
 
-        Log.d(TAG,
-                "Create peer connection factory. Use video: true");
+        Log.d(TAG, "Create peer connection factory. Use video: true");
 
         // Initialize field trials.
         PeerConnectionFactory.initializeFieldTrials("");

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClient.java

@@ -143,7 +143,7 @@ public class TcpClient {
                                             doConnect();
                                         }
                                     }
-                                }, 60*5, TimeUnit.SECONDS);
+                                }, 60*3, TimeUnit.SECONDS);
 
                             }else{
                                 doConnect();

resource/src/main/res/values-es/strings.xml

@@ -97,6 +97,7 @@
     <string name="voice_call_speech">%s llamando</string>
     <string name="call_standby">Standby</string>
     <string name="call_status">Call status:</string>
+    <string name="broadcast_status">Broadcast:</string>
     <string name="uart_port0">Uart_0:</string>
     <string name="uart_port1">Uart_1:</string>
 

resource/src/main/res/values-ru/strings.xml

@@ -97,6 +97,7 @@
     <string name="voice_call_speech">%s Calling</string>
     <string name="call_standby">Standby</string>
     <string name="call_status">Call status:</string>
+    <string name="broadcast_status">Broadcast:</string>
     <string name="uart_port0">Uart_0:</string>
     <string name="uart_port1">Uart_1:</string>
 

resource/src/main/res/values-zh/strings.xml

@@ -97,6 +97,7 @@
     <string name="voice_call_speech">%s呼叫</string>
     <string name="call_standby">待机中</string>
     <string name="call_status">呼叫状态:</string>
+    <string name="broadcast_status">广播状态:</string>
     <string name="uart_port0">串口0:</string>
     <string name="uart_port1">串口1:</string>
 

resource/src/main/res/values/strings.xml

@@ -96,6 +96,7 @@
     <string name="voice_call_speech">%s Calling</string>
     <string name="call_standby">Standby</string>
     <string name="call_status">Call status:</string>
+    <string name="broadcast_status">Broadcast:</string>
     <string name="uart_port0">Uart_0:</string>
     <string name="uart_port1">Uart_1:</string>