## [1.1.58] version 76 - 2020-08-23

### Fixed
- 优化通话连接

WebRTC/build.gradle

@@ -82,4 +82,5 @@ dependencies {
 
     //通知提示弹出库
     api 'com.tapadoo.android:alerter:6.2.1'
+    implementation group: 'org.webrtc', name: 'google-webrtc', version: '1.0.32006'
 }

WebRTC/src/main/java/com/wdkl/core/socket/SocketManager.java

@@ -289,7 +289,7 @@ public class SocketManager implements IEvent {
             CallSession currentSession = SkyEngineKit.Instance().getCurrentSession();
             Log.i(TAG,"current RoomId:"+currentSession.getRoomId()+",reject:"+room);
             if (currentSession != null) {
-                if((myId.equals(userId)||currentSession.getRoomId().equals(room)&&myId.equals(userId))) {
+                if(currentSession.getRoomId().equals(room)&&myId.equals(userId)) {
                     currentSession.onRefuse(userId, type);
                 }
             }

WebRTC/src/main/java/com/wdkl/core/voip/VoipEvent.java

@@ -19,7 +19,7 @@ public class VoipEvent implements ISkyEvent {
     private AsyncPlayer ringPlayer;
 
     public VoipEvent() {
-        ringPlayer = new AsyncPlayer(null);
+        //ringPlayer = new AsyncPlayer(null);
     }
 
     @Override

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -83,7 +83,7 @@ class Application : BaseApplication() {
                 .addNetInterceptor(RestfulExceptionInterceptor())
 
         // 初始化信令
-        SkyEngineKit.init(VoipEvent())
-        SocketManager.getInstance().init(applicationContext)
+        //SkyEngineKit.init(VoipEvent())
+        //SocketManager.getInstance().init(applicationContext)
     }
 }

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 75
+    ext.app_version_code = 76
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.57"
+    ext.app_version = "1.1.58"
 
     /**
      * 项目依赖库

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

@@ -22,6 +22,7 @@ import com.google.common.base.Strings
 import com.wdkl.core.consts.Urls
 import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
+import com.wdkl.core.voip.VoipEvent
 import com.wdkl.ncs.android.component.home.BuildConfig
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
@@ -50,6 +51,7 @@ import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import com.wdkl.ncs.keepbackground.utils.SpManager
 import com.wdkl.ncs.keepbackground.work.DaemonEnv
+import com.wdkl.skywebrtc.SkyEngineKit
 import io.reactivex.Observable
 import kotlinx.android.synthetic.main.watch_activity_home2.*
 import kotlinx.android.synthetic.main.watch_activity_register.*
@@ -82,6 +84,11 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         }
         loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image)
         netOffLoadingDialog = CommonTool.createLoadingDialog(this, R.layout.netoff_loading,R.id.netoff_loading_image)
+
+        // 初始化信令
+        SkyEngineKit.init(VoipEvent())
+        SocketManager.getInstance().init(applicationContext)
+
         super.onCreate(savedInstanceState)
     }
 

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

@@ -61,7 +61,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
     lateinit var countDownTimer: CountDownTimer
     private var isClick = true //是否可点击
     private var createEnabled = true
-    private var selftHandOff = false
+    private var tcpHandOff = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -167,7 +167,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
                         Thread(Runnable {
                             Thread.sleep(6000)
                             Log.i(TAG,"session state:"+gEngineKit?.currentSession?.state+"，userState:"+ SocketManager.getInstance().userState)
-                            if (gEngineKit?.currentSession?.state != EnumType.CallState.Connected && !selftHandOff){
+                            if (gEngineKit?.currentSession?.state != EnumType.CallState.Connected && !tcpHandOff){
                                 runOnUiThread {
                                     showMessage("连接失败，请重试")
                                 }
@@ -265,7 +265,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
                 TcpClient.getInstance().sendMsg(voiceUtilTcpModel.toJson())
             }
         }
-        selftHandOff = true
+        tcpHandOff = true
         gEngineKit?.endCall()
         finish()
     }
@@ -310,6 +310,7 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
                         showMessage("对方挂断")
                         call_duration_tv.stop()
                         createEnabled = false
+                        tcpHandOff = true
                         gEngineKit?.endCall()
                         finish()
                     }
@@ -325,12 +326,14 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
                 if (interactionVO!!.id == currentTnVO.id){
                     showMessage("对方拒绝接听")
                     createEnabled = false
+                    tcpHandOff = true
                     gEngineKit?.endCall()
                     finish()
                 }
 
             } else if (tcpModel.action === TcpAction.VoiceAction.CALLING) {
                 createEnabled = false
+                tcpHandOff = true
                 //gEngineKit?.endCall()
                 //showMessage("对方正在通话")
                 AppTool.Time.delay(800) {
@@ -341,12 +344,14 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener, CallSessionCal
                 //voiceStatus.setText("对方拒绝");
                 showMessage("呼叫失败，对方可能不在线")
                 createEnabled = false
+                tcpHandOff = true
                 AppTool.Time.delay(800) {
                     finish()
                 }
             } else if (tcpModel.action === TcpAction.VoiceAction.CANCEL) {
                 showMessage("对方取消")
                 createEnabled = false
+                tcpHandOff = true
                 gEngineKit?.endCall()
                 AppTool.Time.delay(400) {
                     finish()

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

@@ -158,7 +158,7 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
         intent.putExtra("targetId", targetId)
         intent.putExtra("TcpModel", tcpModel)
         intent.putExtra(WebRTCVoipAudioActivity().ACTION, WebRTCVoipAudioActivity().CALLING)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         startActivity(intent)
         finish()

readme.md

@@ -25,6 +25,13 @@
 在发布新版本时，可以直接将Unreleased区块中的内容移动至新发 布版本的描述区块就可以了
 
 ---
+
+## [1.1.58] version 76 - 2020-08-23
+### Fixed
+- 优化通话连接
+
+---
+
 ## [1.1.57] version 75 - 2020-08-21
 ### Fixed
 - 修复若干个问题

rtc-chat/build.gradle

@@ -29,9 +29,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // 官方库
-    //api group: 'org.webrtc', name: 'google-webrtc', version: '1.0.32006'
+    implementation group: 'org.webrtc', name: 'google-webrtc', version: '1.0.32006'
     // 自己编译的库
-    api project(path: ':libwebrtc')
+    //api project(path: ':libwebrtc')
 }
 
 // upload

rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

@@ -92,7 +92,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
     private AudioManager audioManager;
     private boolean isSpeakerOn = true;
 
-    public WebRTCEngine(boolean mIsAudioOnly, Context mContext) {
+    public  WebRTCEngine(boolean mIsAudioOnly, Context mContext) {
         this.mIsAudioOnly = mIsAudioOnly;
         this.mContext = mContext;
         audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);