Skip to content

Y
YDL-Component-Medical
Commit cd2b5f93 by 万齐军
Options

Merge branch 'feat/lp/lp_confide_optimized' into 'd/v_confide_optimized' 

feat:倾诉dial接口拆分

See merge request app_android_lib/YDL-Component!204
parents d6b0bb70 813a30dd
Showing with 162 additions and 17 deletions
api/confide/build.gradle
......@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply from: "../../maven_push_api.gradle"
version = '1.0.0'
version = '1.0.1'
android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
......
api/confide/src/main/java/com/ydl/confide/api/IConfideService.kt
......@@ -20,6 +20,9 @@ interface IConfideService : IProvider {
fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType:String?)
//直接拨打倾诉或者axb电话
fun confideDial(id: Int, data: String, activity: Activity)
fun ydlAvManagerLogin(uid: String?)
fun startCondifeHomePage(context: Context, isSplash: Boolean)
......
app/src/main/java/com/ydl/component/service/web/JsMethod.kt
package com.ydl.component.service.web
import com.alibaba.android.arouter.launcher.ARouter
import com.google.gson.JsonObject
import com.google.gson.JsonParser
import com.hjq.permissions.Permission
import com.hjq.permissions.XXPermissions
import com.tencent.smtt.sdk.WebView
import com.ydl.audioim.YDLavManager
import com.ydl.confide.api.IConfideService
import com.ydl.confide.home.event.ConfideDialogEvent
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivityMgr
import com.ydl.ydlcommon.modular.findRouteService
import com.ydl.ydlcommon.ui.Loading
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.UserHelper
import de.greenrobot.event.EventBus
......@@ -68,6 +73,27 @@ class JsMethod(private val webView: WebView?) {
webView?.loadUrl("javascript:$callback(${if (grantedPermission) 1 else 0})")
return true
}
"confide_dial" -> {
//倾诉链接 java接口，支持axb和声网
val id = param.getAsJsonPrimitive("id").asInt
val data = param.getAsJsonPrimitive("data").asString
val topActivity = BaseActivityMgr.INST.topActivity
if (!YDLavManager.isOnlineRtm) {
//异常退出或者账号被顶掉，重新登录并拨打
YDLavManager.instances.login(UserHelper.getUserInfo()?.uid) { isSuccess: Boolean, _ ->
if (isSuccess) {
findRouteService(IConfideService::class.java).confideDial(id, data, topActivity)
} else {
ToastUtil.toastShort("请重新拨打")
}
}
} else {
findRouteService(IConfideService::class.java).confideDial(id, data, topActivity)
}
return true
}
else -> {
return false
}
......
config.gradle
......@@ -234,7 +234,7 @@ ext {
"ydl-m-home-api" : "com.ydl:m-home-api:${ydlPublishVersion["m-home-api"]}",
"ydl-m-consultant-api" : "com.ydl:m-consultant-api:1.0.0",
"ydl-m-dynamic-api" : "com.ydl:m-dynamic-api:1.0.0",
"ydl-m-confide-api" : "com.ydl:m-confide-api:1.0.0",
"ydl-m-confide-api" : "com.ydl:m-confide-api:1.0.1",
"ydl-m-course-api" : "com.ydl:m-course-api:1.0.0",
]
......
m-confide/src/main/java/com/ydl/confide/home/http/ConfideHomeApi.kt
......@@ -35,6 +35,11 @@ interface ConfideHomeApi {
@GET("auth/listen/dial")
fun connectJava(@QueryMap params: Map<String, String>): Observable<BaseAPIResponse<ConfideConnectResponse>>
//拨打前 下单支付接口
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA, "Content-Type:application/json")
@GET("auth/listen/submitOrderAndPay")
fun submitOrderAndPay(@QueryMap params: Map<String, String>): Observable<BaseAPIResponse<ConfideConnectResponse>>
// 1=在线 3-通话中 2-离线
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
@GET("auth/listen/dialchangestatus")
......
m-confide/src/main/java/com/ydl/confide/home/http/ConfideHomeHttpImpl.kt
......@@ -70,4 +70,11 @@ class ConfideHomeHttpImpl private constructor() : IConfideHomeHttp {
YDLHttpUtils.obtainApi(ConfideHomeApi::class.java).connectJava(it)
}
}
override fun submitOrderAndPay(connectParam: ConnectParamJava): Observable<BaseAPIResponse<ConfideConnectResponse>> {
return RxUtils.mapObservable(connectParam)
.flatMap { it ->
YDLHttpUtils.obtainApi(ConfideHomeApi::class.java).submitOrderAndPay(it)
}
}
}
\ No newline at end of file
m-confide/src/main/java/com/ydl/confide/home/http/IConfideHomeHttp.kt
......@@ -24,6 +24,13 @@ interface IConfideHomeHttp {
*/
fun recommendList(param: ConfideRecommendParam): Observable<BaseAPIResponse<ConfideHomeDataBean>>
//倾诉链接，java接口，支持axb和声网
/**
* 倾诉链接，java接口，支持axb和声网
*/
fun connectionJava(connectParam: ConnectParamJava): Observable<BaseAPIResponse<ConfideConnectResponse>>
/**
* 拨打前 下单支付接口
* */
fun submitOrderAndPay(connectParam: ConnectParamJava): Observable<BaseAPIResponse<ConfideConnectResponse>>
}
\ No newline at end of file
m-confide/src/main/java/com/ydl/confide/home/modular/service/ConfdieServiceImpl.kt
......@@ -15,6 +15,7 @@ import com.ydl.audioim.widget.AxbConfirmDialog
import com.ydl.confide.api.IConfideService
import com.ydl.confide.home.ConfideBottomSheetDialogFragment
import com.ydl.confide.home.ConfideHomeActivity
import com.ydl.confide.home.bean.ConfideConnectResponse
import com.ydl.webview.TellData
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.config.YDLConstants
......@@ -58,6 +59,20 @@ class ConfdieServiceImpl : IConfideService {
ConfideWebServiceImpl().connectionJava(id, type, activity, myTellData, callType)
}
/**
* 直接拨打
* */
override fun confideDial(id: Int, data: String, activity: Activity) {
val gson = Gson()
val bean = gson.fromJson(data, ConfideConnectResponse::class.java)
if (bean?.dialDetail?.callConnectType == 3) {
ConfideWebServiceImpl().agora(id, activity, bean)
} else {
ConfideWebServiceImpl().axb(activity, bean?.dialDetail?.phoneNu)
}
}
override fun ydlAvManagerLogin(uid: String?) {
YDLavManager.instances.login(uid)
}
......
m-confide/src/main/java/com/ydl/confide/home/modular/service/ConfideWebServiceImpl.kt
package com.ydl.confide.home.modular.service
import android.Manifest
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
......@@ -7,6 +8,7 @@ import android.content.Intent
import android.net.Uri
import android.text.TextUtils
import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions
import com.ydl.audioim.IntentConstants
import com.ydl.audioim.YDLavManager
import com.ydl.audioim.bean.ExpertInfoBean
......@@ -20,6 +22,8 @@ import com.ydl.webview.NewH5Activity
import com.ydl.webview.TellData
import com.ydl.ydlcommon.modular.findRouteService
import com.ydl.ydlcommon.ui.Loading
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.common.tools.ToastUtil
......@@ -31,6 +35,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
/**
* Created by haorui on 2019-10-10.
* Des: 对应主项目中的WebServiceImpl
......@@ -97,13 +102,11 @@ class ConfideWebServiceImpl {
.show()
}
private fun agora(
fun agora(
id: Int,
type: Int,
activity: Context,
callType: String?,
tellData: TellData?,
data: ConfideConnectResponse?){
data: ConfideConnectResponse?
) {
val expertInfo = data?.dialDetail?.agoraExpertInfo ?: return
if (!YDLavManager.isOnlineRtm) { // 判断如果账号在其它设备登录rtm是否在线
ToastUtil.toastShort("网络通话错误代码001")
......@@ -115,14 +118,16 @@ class ConfideWebServiceImpl {
expertInfo,
data.callId ?: "0",
data.listenOrderId ?: 0L,
tellData,
data.isShowAxb,
data.dialDetail?.dialStatus.toString()
)
}
private fun axb(activity: Activity,phone:String?){
if(phone.isNullOrEmpty())return
/**
* axb 通话
* */
fun axb(activity: Activity, phone: String?) {
if (phone.isNullOrEmpty()) return
val dialog = AxbConfirmDialog(
activity,
1,
......@@ -149,7 +154,7 @@ class ConfideWebServiceImpl {
callType: String?
) {
ConfideHomeDataManager.getHttp()
.connectionJava(ConnectParamJava("" + id, "" + type, callType))
.submitOrderAndPay(ConnectParamJava("" + id, "" + type, callType))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
......@@ -157,9 +162,11 @@ class ConfideWebServiceImpl {
when (it.data?.dialDetail?.dialStatus) {
0 -> {//连接成功
if (it.data?.dialDetail?.callConnectType == 3) {
agora(id, type, activity, callType, tellData, it.data)
//checkpermission
checkPermission(id, type, activity,callType)
} else {
axb(activity, it.data?.dialDetail?.phoneNu)
//axb
listenDial(id, type, activity,"1")
}
}
100007 -> {
......@@ -179,6 +186,76 @@ class ConfideWebServiceImpl {
ToastHelper.show(it.message ?: "连接失败")
})
}
/**
* 检查权限
* */
@SuppressLint("CheckResult")
private fun checkPermission(id: Int, type: Int, activity: Activity, callType: String?) {
try {
val rxPermissions = RxPermissions(activity)
rxPermissions.requestEach(Manifest.permission.RECORD_AUDIO).subscribe { permission ->
when {
//权限已申请 进行通话
permission.granted -> {
listenDial(id, type, activity, callType)
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.AGORA, "请求音频权限通过")
}
//权限未申请 重新申请
permission.shouldShowRequestPermissionRationale -> {
checkPermission(id, type, activity, callType)
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.AGORA, "权限未申请 重新申请")
}
//跳转设置界面
else -> {
listenDial(id, type, activity, "1")
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.AGORA, "权限拒绝 转axb")
}
}
}
} catch (e: Exception) {
listenDial(id, type, activity,"1");
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.AGORA, "请求音频权限异常${e.message}")
}
}
@SuppressLint("CheckResult")
fun listenDial(
id: Int,
type: Int,
activity: Activity,
callType: String?
) {
ConfideHomeDataManager.getHttp()
.connectionJava(ConnectParamJava("" + id, "" + type, callType))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
if ("200" == it.code) {
when (it.data?.dialDetail?.dialStatus) {
0 -> {//连接成功
if (it.data?.dialDetail?.callConnectType == 3) {
agora(id, activity, it.data)
} else {
axb(activity, it.data?.dialDetail?.phoneNu)
}
}
else -> {
ToastHelper.show(it.data?.dialDetail?.dialReason ?: "连接失败")
}
}
} else {
ToastHelper.show(it.msg)
}
}, {
ToastHelper.show(it.message ?: "连接失败")
})
}
fun connectionJava(
id: Int,
......@@ -189,7 +266,7 @@ class ConfideWebServiceImpl {
): Disposable {
Loading.show(activity)
return ConfideHomeDataManager.getHttp()
.connectionJava(ConnectParamJava("" + id, "" + type, callType))
.submitOrderAndPay(ConnectParamJava("" + id, "" + type, callType))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
......@@ -198,7 +275,11 @@ class ConfideWebServiceImpl {
when (it.data?.dialDetail?.dialStatus) {
0 -> {//连接成功
if (it.data?.dialDetail?.callConnectType == 3) {
agora(id, type, activity, callType, null, it.data)
//检查音频权限
checkPermission(id, type, activity as Activity,callType)
}else{
//axb
listenDial(id, type, activity as Activity,"1");
}
}
100007 -> {
......@@ -228,7 +309,6 @@ class ConfideWebServiceImpl {
expertInfo: ExpertInfoBean,
call_id: String,
relation_id: Long,
tellData: TellData?,
isShowAXB: Boolean,
dialStatus: String
) {
......
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