Commit e06539f9 by yjiucheng

支付依赖私聊api

parent c7e2981b
......@@ -74,7 +74,7 @@ ext {
"ydl-webview" : "0.0.37.2",
"ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17.1",
"ydl-pay" : "0.0.17.2",
"m-audioim" : "0.0.46.2",
"ydl-flutter-base": "0.0.10",
......
......@@ -44,7 +44,9 @@ dependencies {
if (rootProject.ext.dev_mode){
//开发时使用
api project(':ydl-platform')
implementation modularPublication('com.ydl:m-im-api')
}else {
compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
//发布时使用
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
......
......@@ -16,8 +16,11 @@ import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.api.service.IImService
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.common.bean.params.AliPayParam
import com.yidianling.ydl_pay.common.bean.params.BalanceParam
......@@ -26,7 +29,10 @@ import com.yidianling.ydl_pay.common.bean.params.WxPayParam
import com.yidianling.ydl_pay.common.http.HttpUtils
import com.yidianling.ydl_pay.pay.PayParams.CREATOR.INLET_NORMAL
import com.yidianling.ydl_pay.pay.PayParams.CREATOR.INLET_TEST
import com.yidianling.ydl_pay.pay.bean.*
import com.yidianling.ydl_pay.pay.bean.PayStatus
import com.yidianling.ydl_pay.pay.bean.RechargeParam
import com.yidianling.ydl_pay.pay.bean.TestAddOrderBean
import com.yidianling.ydl_pay.pay.bean.WXRechargeIdParam
import com.yidianling.ydl_pay.pay.redpacket.RedPacketBean
import com.yidianling.ydl_pay.pay.redpacket.RedPacketPayBean
import com.yidianling.ydl_pay.pay.redpacket.RedPacketPopWindow
......@@ -201,8 +207,11 @@ class PayActivity : BaseActivity() {
//客服
ll_kefu.setOnClickListener {
// ModularServiceManager.provide(IMServiceImpl::class.java).startP2PXiaoYi(this)
//todo
// ModularServiceManager.provide(IImService::class.java).startP2PXiaoYi(this)
try {
ModularServiceManager.provide(IImService::class.java).startP2PXiaoYi(this)
} catch (e: Exception) {
LogUtil.e(e.message)
}
}
//选择红包
ll_redPacket.setOnClickListener {
......@@ -767,7 +776,7 @@ class PayActivity : BaseActivity() {
*/
private fun aliPayById(payId: String): Observable<PayStatus> {
var bean = AliPayParam(payId, 1)
return HttpUtils.getAliPayOrderId(bean)
return HttpUtils.getAliPayOrderId(bean)
.compose(RxUtils.resultData())
.flatMap {
when (inlet) {
......
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