Commit b136eb3e by YKai

feat:m-confide组件升级

parent 224fedd0
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.00", "m-confide" : "0.0.49.01",
"m-consultant" : "0.0.59.65", "m-consultant" : "0.0.59.65",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.10", "m-user" : "0.0.61.10",
...@@ -88,7 +88,7 @@ ext { ...@@ -88,7 +88,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.00", "m-confide" : "0.0.49.01",
"m-consultant" : "0.0.59.65", "m-consultant" : "0.0.59.65",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.10", "m-user" : "0.0.61.10",
......
...@@ -52,10 +52,6 @@ class ConfdieServiceImpl : IConfideService { ...@@ -52,10 +52,6 @@ class ConfdieServiceImpl : IConfideService {
} }
override fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType: String?) { override fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType: String?) {
if (!RxSPTool.getBoolean(BaseApp.getApp(),YDLavManager.IS_ONLINE_RTM)){
ToastUtil.toastShort("网络通话错误代码001")
return
}
val myTellData: TellData? = if (tellData == null ) null else Gson().fromJson(tellData, TellData::class.java) val myTellData: TellData? = if (tellData == null ) null else Gson().fromJson(tellData, TellData::class.java)
ConfideWebServiceImpl().connectionJava(id, type, activity, myTellData, callType) ConfideWebServiceImpl().connectionJava(id, type, activity, myTellData, callType)
} }
......
...@@ -7,6 +7,7 @@ import android.net.Uri ...@@ -7,6 +7,7 @@ import android.net.Uri
import android.text.TextUtils import android.text.TextUtils
import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.launcher.ARouter
import com.ydl.audioim.IntentConstants import com.ydl.audioim.IntentConstants
import com.ydl.audioim.YDLavManager
import com.ydl.audioim.bean.ExpertInfoBean import com.ydl.audioim.bean.ExpertInfoBean
import com.ydl.audioim.widget.AxbConfirmDialog import com.ydl.audioim.widget.AxbConfirmDialog
import com.ydl.confide.home.bean.ConnectParamJava import com.ydl.confide.home.bean.ConnectParamJava
...@@ -16,9 +17,12 @@ import com.ydl.confide.home.util.ConfideNetworkUtil ...@@ -16,9 +17,12 @@ import com.ydl.confide.home.util.ConfideNetworkUtil
import com.ydl.webview.H5Params import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity import com.ydl.webview.NewH5Activity
import com.ydl.webview.TellData import com.ydl.webview.TellData
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.modular.ModularServiceManager import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.remind.ToastHelper import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.dialog.CommonDialog import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.common.tools.RxSPTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.api.service.IUserService import com.yidianling.user.api.service.IUserService
import com.yidianling.ydl_pay.pay.payDialog.CallBack import com.yidianling.ydl_pay.pay.payDialog.CallBack
import com.yidianling.ydl_pay.pay.payDialog.ConfidePayParams import com.yidianling.ydl_pay.pay.payDialog.ConfidePayParams
...@@ -107,6 +111,10 @@ class ConfideWebServiceImpl { ...@@ -107,6 +111,10 @@ class ConfideWebServiceImpl {
if (it.data?.dialDetail?.callConnectType ?: -1 == 3) { if (it.data?.dialDetail?.callConnectType ?: -1 == 3) {
//声网 //声网
it.data?.dialDetail?.agoraExpertInfo ?: return@subscribe it.data?.dialDetail?.agoraExpertInfo ?: return@subscribe
if (!RxSPTool.getBoolean(BaseApp.getApp(), YDLavManager.IS_ONLINE_RTM)){
ToastUtil.toastShort("网络通话错误代码001")
return@subscribe
}
callAgora( callAgora(
activity, activity,
id, id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment