From d1a9e3312387b6c47e6186af506787a8a66369d1 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期六, 09 十一月 2024 18:40:36 +0800
Subject: [PATCH] fix
---
app/src/main/java/com/sinata/xqmuse/ui/mine/RechargeActivity.kt | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/mine/RechargeActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/mine/RechargeActivity.kt
index b6c6cd8..f4e5c7d 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/mine/RechargeActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/mine/RechargeActivity.kt
@@ -4,23 +4,15 @@
import android.content.Intent
import android.text.Editable
import android.text.TextWatcher
-import androidx.recyclerview.widget.GridLayoutManager
-import cn.sinata.xldutils.utils.LengthFilter
-import cn.sinata.xldutils.utils.SpanBuilder
import cn.sinata.xldutils.utils.myToast
import com.sinata.xqmuse.R
import com.sinata.xqmuse.dialog.PayDialog
import com.sinata.xqmuse.network.HttpManager
-import com.sinata.xqmuse.network.entity.RechargeItem
import com.sinata.xqmuse.network.request
-import com.sinata.xqmuse.ui.H5Activity
import com.sinata.xqmuse.ui.TransparentStatusBarActivity
-import com.sinata.xqmuse.ui.home.PayResultActivity
-import com.sinata.xqmuse.ui.mine.adapter.RechargeAdapter
import com.sinata.xqmuse.utils.Const
import com.sinata.xqmuse.utils.NumberInputFilter
import com.sinata.xqmuse.utils.event.EmptyEvent
-import com.sinata.xqmuse.utils.extention.clickDelay
import com.sinata.xqmuse.utils.interfaces.StringCallback
import com.sinata.xqmuse.utils.pay.PayListener
import com.sinata.xqmuse.utils.pay.PayUtil
@@ -28,7 +20,6 @@
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.sdk27.coroutines.onClick
import org.jetbrains.anko.startActivity
-import org.jetbrains.anko.startActivityForResult
import org.jetbrains.anko.toast
import java.lang.Exception
@@ -86,19 +77,16 @@
private fun pay(payType:Int,money:Double){
toast("%s充值%.2f".format(if (payType == 1) "微信" else "支付宝",money))
+ HttpManager.placeOrder(4,payType,2,money,null,null,null )
+ .request(this){_,data->
+ if (payType == 1){
+ PayUtil.initWeChatPay(this,Const.WX_APP_ID)
+ PayUtil.weChatPay(data!!)
+ }else{
+ PayUtil.aliPay(this,data?.orderInfo?:"")
+ }
+ }
onPaySuccess()
-// HttpManager.payCourse(null,payType,3,null,money).request(this){ _, data->
-// HttpManager.pay(data?.id?:"",payType,3).request(this,false,success = {_,data->
-// if (payType == 2){
-// PayUtil.aliPay(this,data?.orderInfo?:"")
-// }else{
-// PayUtil.initWeChatPay(this,Const.WX_APP_ID)
-// PayUtil.weChatPay(data!!)
-// }
-// }){_,msg->
-// startActivityForResult<PayResultActivity>(1,"type" to PayResultActivity.TYPE_RECHARGE_FAILED,"msg" to msg)
-// }
-// }
}
override fun onPaySuccess() {
@@ -112,7 +100,6 @@
}
override fun onPayError(msg: String) {
- startActivityForResult<PayResultActivity>(1,"type" to PayResultActivity.TYPE_RECHARGE_FAILED)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
--
Gitblit v1.7.1