Explorar el Código

优化杂音问题

weizhengliang hace 3 años
padre
commit
dcd188f018

+ 2 - 2
build.gradle

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

+ 6 - 6
conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/OfflineMainActivity.kt

@@ -339,7 +339,7 @@ class OfflineMainActivity :BaseActivity<MainActivityPresenter, OfflineMainActivi
 
     //串口处理
     override fun serialPortBedOnclick(str: String) {
-        /*try {
+        try {
             if (Constant.CALL_STATE == Constant.CALL_CALLING) {
                 //正在通话中,先静音然后再开启,防止噪音
                 if (SkyEngineKit.Instance() != null && SkyEngineKit.Instance().currentSession != null) {
@@ -351,11 +351,11 @@ class OfflineMainActivity :BaseActivity<MainActivityPresenter, OfflineMainActivi
                             SkyEngineKit.Instance().currentSession.toggleMuteAudio(false)
                         }
                     }
-                }, 800)
+                }, 300)
             }
         } catch (ex: Exception) {
             ex.printStackTrace()
-        }*/
+        }
 
         try {
             val newStr: String = CutSerialPortUtil.delHeadAndEnd(str, "$", "#")
@@ -385,14 +385,14 @@ class OfflineMainActivity :BaseActivity<MainActivityPresenter, OfflineMainActivi
                                 updateCallText("待机中")
                                 Constant.CALL_STATE = Constant.CALL_STANDBY
                                 UdpSendUtil.getInstance().sendUdpData(UdpIndex.HOST_CALL_REJECT, "", "", addr, "", "", "", Constant.DEVICE_ID.toString(), Constant.PART_ID.toString())
-                                SerialPortHelper.closeSoundChannel(addr)
+                                //SerialPortHelper.closeSoundChannel(addr)
                                 RingPlayHelper.stopRingTone()
                             } else {
                                 cancelOutCall(addr, false)
                             }
                         } else if (Constant.CALL_STATE == Constant.CALL_CALLING) {
                             if (addr.equals(callingUart, true)) {
-                                SerialPortHelper.closeSoundChannel(addr)
+                                //SerialPortHelper.closeSoundChannel(addr)
                                 RingPlayHelper.stopRingTone()
                                 handoffCall(addr)
                             } else {
@@ -514,7 +514,7 @@ class OfflineMainActivity :BaseActivity<MainActivityPresenter, OfflineMainActivi
     }
 
     private fun cancelOutCall(uart: String, resetCall: Boolean) {
-        SerialPortHelper.closeSoundChannel(uart)
+        //SerialPortHelper.closeSoundChannel(uart)
         for (device in FrameHelper.offlineDevices) {
             if (uart.equals(device.uartAddr, true)) {
                 updateSendTcpInfo("udp cancel $uart")

+ 2 - 2
janus/src/main/java/com/wdkl/ncs/janus/rtc2/engine/webrtc/MyWebRTCEngine.java

@@ -64,7 +64,7 @@ public class MyWebRTCEngine implements IEngine, Peer.IPeerEvent {
     private SurfaceViewRenderer localRenderer;
 
     // 服务器实例列表
-    private String serverIP = "120.76.246.253";
+    private String serverIP = "172.28.100.100";
     private String turnUser = "wdklrtc";
     private String turnUserPwd = "Wdkl2021Rtc";
 
@@ -375,7 +375,7 @@ public class MyWebRTCEngine implements IEngine, Peer.IPeerEvent {
             audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
             if (enable) {
                 audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
-                        audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
+                        audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL),
                         AudioManager.FX_KEY_CLICK);
                 audioManager.setSpeakerphoneOn(true);
             } else {