Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
e06539f9
Commit
e06539f9
authored
Feb 07, 2020
by
yjiucheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付依赖私聊api
parent
c7e2981b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
config.gradle
config.gradle
+1
-1
build.gradle
ydl-pay/build.gradle
+2
-0
PayActivity.kt
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/PayActivity.kt
+13
-4
No files found.
config.gradle
View file @
e06539f9
...
...
@@ -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"
,
...
...
ydl-pay/build.gradle
View file @
e06539f9
...
...
@@ -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
...
...
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/PayActivity.kt
View file @
e06539f9
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment