删除声网连接与完成接口的调用，增加声网异常上传接口的调用

config.gradle

@@ -43,7 +43,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.31",
+            "m-confide"       : "0.0.31.8",
             "m-consultant"    : "0.0.44",
             "m-course"        : "0.0.30",
             "m-fm"            : "0.0.21",
@@ -70,7 +70,7 @@ ext {
             "ydl-webview"     : "0.0.28",
             "ydl-media"       : "0.0.14",
             "ydl-pay"         : "0.0.11",
-            "m-audioim"       : "0.0.30",
+            "m-audioim"       : "0.0.31.9",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -107,7 +107,7 @@ ext {
             "ydl-webview"     : "0.0.28",
             "ydl-media"       : "0.0.14",
             "ydl-pay"         : "0.0.11",
-            "m-audioim"       : "0.0.30",
+            "m-audioim"       : "0.0.31.9",
 
             //以下 几乎不会动
 

m-audioim/build.gradle

@@ -83,10 +83,12 @@ dependencies {
         //开发时使用
         api project(':ydl-platform')
         api project(':ydl-webview')
+        implementation modularPublication('com.ydl:m-user-api')
         implementation modularPublication('com.ydl:m-audioim-api')
     }else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-webview"]
+        compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
         compileOnly rootProject.ext.dependencies["ydl-m-audioim-api"]
         api(rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -38,10 +38,7 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydl_av.chat.bean.AudioMessageBean
 import com.ydl.audioim.contract.IAudioHomeActivityContract
-import com.ydl.audioim.http.command.ConnectCommand
-import com.ydl.audioim.http.command.ConnectFinishCommand
-import com.ydl.audioim.http.command.ConnectStartCommand
-import com.ydl.audioim.http.command.NoticePushCommand
+import com.ydl.audioim.http.command.*
 import com.ydl.audioim.player.AudioPlayer
 import com.ydl.audioim.presenter.AudioHomePresenterImpl
 import com.ydl.audioim.utils.DateUtils
@@ -51,10 +48,12 @@ import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.webview.RefreshWebEvent
 import com.ydl.ydlcommon.base.BaseMvpActivity
+import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
+import com.yidianling.user.api.service.IUserService
 import de.greenrobot.event.EventBus
 import io.agora.rtc.IRtcEngineEventHandler
 import io.reactivex.Observable
@@ -174,6 +173,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
         override fun onWarning(warn: Int) {
             super.onWarning(warn)
+            uploadException("mRtcEventHandler-onWarning:warnCode--%${warn}")
             //103：没有可用的频道资源。可能是因为服务端没法分配频道资源
             //104：查找频道超时。在加入频道时 SDK 先要查找指定的频道，出现该警告一般是因为网络太差，连接不到服务器
             //105：查找频道请求被服务器拒绝。服务器可能没有办法处理这个请求或请求是非法的
@@ -192,6 +192,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
         override fun onError(err: Int) {
             super.onError(err)
+            uploadException("mRtcEventHandler-onError:errorCode--%${err}")
             //3：SDK 初始化失败。Agora 建议尝试以下处理方法
             //7：SDK 尚未初始化，就调用其 API。请确认在调用 API 之前已创建 RtcEngine 对象并完成初始化
             //10：API 调用超时。有些 API 调用需要 SDK 返回结果，如果 SDK 处理时间过长，超过 10 秒没有返回，会出现此错误
@@ -288,6 +289,17 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     }
     //
 
+    /**
+     * 上传错误日志
+     */
+    private fun uploadException(message: String) {
+        var time: String = (System.currentTimeMillis() / 1000).toString()
+        var uid: String = ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid!!
+        var payLoad = PayLoad(channelId?:"0", time, uid, "1", "999", message)
+        var connectException = ConnectExceptionCommand(time, "2", "99", payLoad)
+        getPresenter().connectException(connectException)
+    }
+
     override fun createPresenter(): IAudioHomeActivityContract.Presenter {
         return AudioHomePresenterImpl()
     }

m-audioim/src/main/java/com/ydl/audioim/contract/IAudioHomeActivityContract.kt

 package com.ydl.audioim.contract
 
 import com.ydl.audioim.bean.ConnectBean
-import com.ydl.audioim.http.command.ConnectCommand
-import com.ydl.audioim.http.command.ConnectFinishCommand
-import com.ydl.audioim.http.command.ConnectStartCommand
-import com.ydl.audioim.http.command.NoticePushCommand
+import com.ydl.audioim.http.command.*
 import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.mvp.base.BasePresenter
@@ -74,6 +71,11 @@ interface IAudioHomeActivityContract {
          */
 //        fun connectFinish(param: ConnectFinishCommand)
 
+        /**
+         * 通话异常
+         */
+        fun connectException(param: ConnectExceptionCommand)
+
 
         /**
          * 通知服务端发送推送
@@ -98,6 +100,11 @@ interface IAudioHomeActivityContract {
          */
 //        fun connectFinish(param: ConnectFinishCommand): Observable<BaseAPIResponse<Any>>
 
+        /**
+         * 通话异常
+         */
+        fun connectException(param: ConnectExceptionCommand): Observable<BaseAPIResponse<Any>>
+
 
         /**
          * 通知服务端发送推送

m-audioim/src/main/java/com/ydl/audioim/http/AudioApiRequestUtil.kt

@@ -3,10 +3,7 @@ package com.ydl.audioim.http
 import com.google.gson.Gson
 import com.ydl.audioim.bean.AgoraTokenResponse
 import com.ydl.audioim.bean.ConnectBean
-import com.ydl.audioim.http.command.ConnectCommand
-import com.ydl.audioim.http.command.NoticePushCommand
-import com.ydl.audioim.http.command.ConnectFinishCommand
-import com.ydl.audioim.http.command.ConnectStartCommand
+import com.ydl.audioim.http.command.*
 import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.data.http.RxUtils
@@ -62,6 +59,18 @@ class AudioApiRequestUtil {
 //        }
 
         /**
+         * 通话警告与异常回调
+         *
+         * @param param
+         * @return
+         */
+        fun connectException(param: ConnectExceptionCommand): Observable<BaseAPIResponse<Any>> {
+            var str = Gson().toJson(param)
+            val body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), str) as RequestBody
+            return YDLHttpUtils.obtainApi(AudioNetAPi::class.java).connectException(body)
+        }
+
+        /**
          * 通知服务端发送推送
          */
         fun noticeServerPush(param: NoticePushCommand): Observable<BaseResponse<Any>> {

m-audioim/src/main/java/com/ydl/audioim/http/AudioNetAPi.kt

@@ -32,6 +32,13 @@ interface AudioNetAPi {
 //    @POST("auth/listen-order/callback/agora/finish")
 //    fun connectFinish(@Body body:RequestBody): Observable<BaseAPIResponse<Any>>
 
+    /**
+     * 通话警告与错误回调
+     */
+    @Headers( YDL_DOMAIN + YDL_DOMAIN_JAVA,"Content-Type:application/json")
+    @POST("auth/listen-order/callback/agora")
+    fun connectException(@Body body:RequestBody): Observable<BaseAPIResponse<Any>>
+
 
     /**
      * 链接 ：获取axb手机号

m-audioim/src/main/java/com/ydl/audioim/http/command/ConnectExceptionCommand.kt

+package com.ydl.audioim.http.command
+
+import com.ydl.ydlcommon.data.http.BaseCommand
+
+
+/**
+    连接异常请求bean
+ */
+data class ConnectExceptionCommand(
+    var noticeId: String,  // 秒级
+    var productId: String, // 2
+    var eventType: String, // 99
+    var payload: PayLoad
+) : BaseCommand()
+
+data class PayLoad(
+    var channelName: String, // 房间id
+    var ts: String, // 秒级
+    var uid: String,
+    var platform: String,
+    var reason: String,
+    var message: String
+)
\ No newline at end of file

m-audioim/src/main/java/com/ydl/audioim/model/AudioHomeModelImpl.kt

@@ -3,10 +3,7 @@ package com.ydl.audioim.model
 import com.ydl.audioim.bean.ConnectBean
 import com.ydl.audioim.contract.IAudioHomeActivityContract
 import com.ydl.audioim.http.AudioApiRequestUtil
-import com.ydl.audioim.http.command.ConnectCommand
-import com.ydl.audioim.http.command.NoticePushCommand
-import com.ydl.audioim.http.command.ConnectFinishCommand
-import com.ydl.audioim.http.command.ConnectStartCommand
+import com.ydl.audioim.http.command.*
 import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.BaseResponse
 import io.reactivex.Observable
@@ -27,6 +24,10 @@ class AudioHomeModelImpl : IAudioHomeActivityContract.Model {
 //        return AudioApiRequestUtil.connectFinish(param)
 //    }
 
+    override fun connectException(param: ConnectExceptionCommand): Observable<BaseAPIResponse<Any>> {
+        return AudioApiRequestUtil.connectException(param)
+    }
+
     override fun noticeServerPush(param: NoticePushCommand): Observable<BaseResponse<Any>> {
         return AudioApiRequestUtil.noticeServerPush(param)
     }

m-audioim/src/main/java/com/ydl/audioim/presenter/AudioHomePresenterImpl.kt

@@ -3,10 +3,7 @@ package com.ydl.audioim.presenter
 import com.ydl.audioim.BuildConfig
 import com.ydl.ydl_av.chat.config.YDLChatParam
 import com.ydl.audioim.contract.IAudioHomeActivityContract
-import com.ydl.audioim.http.command.ConnectCommand
-import com.ydl.audioim.http.command.ConnectFinishCommand
-import com.ydl.audioim.http.command.ConnectStartCommand
-import com.ydl.audioim.http.command.NoticePushCommand
+import com.ydl.audioim.http.command.*
 import com.ydl.audioim.model.AudioHomeModelImpl
 import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
@@ -68,6 +65,20 @@ class AudioHomePresenterImpl : BasePresenter<IAudioHomeActivityContract.View, IA
 //                })
 //    }
 
+    override fun connectException(param: ConnectExceptionCommand) {
+        mModel.connectException(param)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnSubscribe {
+                }
+                .doAfterTerminate {
+                }
+                .subscribe({
+                }, { e ->
+                    LogUtil.e(e.message)
+                })
+    }
+
     /**
      * 登录声网
      */