From bfd1ad288092a4b4a010ea230466f5e86a4e3de4 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 24 十二月 2024 10:09:43 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/sinata/xqmuse/ui/home/BuyVoiceActivity.kt | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/home/BuyVoiceActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/home/BuyVoiceActivity.kt
index 199d538..e77e097 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/home/BuyVoiceActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/home/BuyVoiceActivity.kt
@@ -44,18 +44,15 @@
tv_action.setOnClickListener {
if (cb_rule.isChecked){
- if (cb_rule.isChecked){
- if (rb_balance.isChecked&&((data?.balance?:"0.0").toDouble()>=(data?.generalPrice?:"0.0").toDouble())){//余额勾选，并且可用余额大于课程价格，直接扣余额
- payBalance()
- }else if (rb_ali.isChecked){
- pay(2)
- }else if (rb_wx.isChecked){
- pay(1)
- }else{
- toast("请选择支付方式")
- }
- }else
- toast("请阅读并同意《购买协议》")
+ if ((data?.generalPrice?:"0.0").toDouble() == 0.0||rb_balance.isChecked&&((data?.balance?:"0.0").toDouble()>=(data?.generalPrice?:"0.0").toDouble())){//余额勾选，并且可用余额大于课程价格，直接扣余额
+ payBalance()
+ }else if (rb_ali.isChecked){
+ pay(2)
+ }else if (rb_wx.isChecked){
+ pay(1)
+ }else{
+ toast("请选择支付方式")
+ }
}else
toast("请阅读并同意《购买协议》")
}
@@ -118,6 +115,12 @@
val s = "余额抵扣 当前可用 ¥$balance"
rb_balance.text = SpanBuilder(s).size(4,s.length,11).color(this@BuyVoiceActivity,4,s.length,R.color.textColor99).build()
rb_balance.isChecked = !(balance.isNullOrEmpty()||balance.toDouble() == 0.0)
+ if ((data?.generalPrice?:"0.0").toDouble() == 0.0){
+ rb_ali.isEnabled = false
+ rb_wx.isEnabled = false
+ rb_ali.alpha = 0.6f
+ rb_wx.alpha = 0.6f
+ }
}
}
}
--
Gitblit v1.7.1