Commit e4d67352 authored by 王雪伟's avatar 王雪伟

[提交人]:王雪伟

[提交简述] :小象省钱
[实现方案] :加入优惠券弹窗
parent 3987a6c4
...@@ -41,13 +41,14 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity ...@@ -41,13 +41,14 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
private var pay_type: Int? = RightsDetailActivity.H5_PAY private var pay_type: Int? = RightsDetailActivity.H5_PAY
private var payResultObservable: Observable<PayResultEntity>? = null private var payResultObservable: Observable<PayResultEntity>? = null
var goodsID: String? = "" var goodsID: String? = ""
var couponId:String?="" var couponId: String? = ""
override fun onClick(v: View?) { override fun onClick(v: View?) {
when (v) { when (v) {
id_tv_select_coupons -> { id_tv_select_coupons -> {
//如果有默认选中,传入默认选中的优惠券 //如果有默认选中,传入默认选中的优惠券
DialogUtils.showFetchAllCard( DialogUtils.showFetchAllCard(
this, this,
"",
null, null,
mCouponsResult, mCouponsResult,
object : DialogUtils.OnFetchCardListener { object : DialogUtils.OnFetchCardListener {
......
...@@ -13,6 +13,7 @@ import com.zxhl.cms.AppContext ...@@ -13,6 +13,7 @@ import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseRecyclerAdapter import com.zxhl.cms.common.base.BaseRecyclerAdapter
import com.zxhl.cms.net.model.qy.CouponsEntity import com.zxhl.cms.net.model.qy.CouponsEntity
import com.zxhl.cms.utils.OnRecycleItemClickListener import com.zxhl.cms.utils.OnRecycleItemClickListener
import com.zxhl.cms.utils.Utils
import com.zxhl.cms.widget.RecycleImageView import com.zxhl.cms.widget.RecycleImageView
...@@ -20,6 +21,7 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda ...@@ -20,6 +21,7 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda
private var mContext: Activity? = null private var mContext: Activity? = null
private val listener: OnRecycleItemClickListener<CouponsEntity> private val listener: OnRecycleItemClickListener<CouponsEntity>
private var mSelectPos = -1; private var mSelectPos = -1;
private var originalPrice = "";
constructor( constructor(
content: Activity?, content: Activity?,
...@@ -29,8 +31,9 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda ...@@ -29,8 +31,9 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda
this.listener = listener this.listener = listener
} }
fun setSelectPos(pos: Int) { fun setSelectPos(pos: Int, originalPrice: String) {
mSelectPos = pos; mSelectPos = pos;
this.originalPrice = originalPrice;
notifyDataSetChanged() notifyDataSetChanged()
} }
...@@ -48,6 +51,21 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda ...@@ -48,6 +51,21 @@ class HuafeiCouponsAdapter : BaseRecyclerAdapter<CouponsEntity, HuafeiCouponsAda
holder.id_tv_huafei_amount?.text = "¥ ${couponsEntity.amount}" holder.id_tv_huafei_amount?.text = "¥ ${couponsEntity.amount}"
holder.id_tv_huafei_desc?.text = "${couponsEntity.desc}" holder.id_tv_huafei_desc?.text = "${couponsEntity.desc}"
holder.id_ll_huafei_coupons_item_view?.setOnClickListener { holder.id_ll_huafei_coupons_item_view?.setOnClickListener {
if (originalPrice == "50") {
Utils.showToast(mContext, "无法使用此优惠券")
return@setOnClickListener
} else if (originalPrice == "100") {
if (couponsEntity.amount != "5") {
Utils.showToast(mContext, "无法使用此优惠券")
return@setOnClickListener
}
} else if (originalPrice == "200") {
if (couponsEntity.amount != "10") {
Utils.showToast(mContext, "无法使用此优惠券")
return@setOnClickListener
}
}
if (mSelectPos != position) { if (mSelectPos != position) {
mSelectPos = position mSelectPos = position
listener.onItemClick(it, position, couponsEntity) listener.onItemClick(it, position, couponsEntity)
......
...@@ -454,6 +454,7 @@ object DialogUtils { ...@@ -454,6 +454,7 @@ object DialogUtils {
//话费优惠券列表 //话费优惠券列表
fun showFetchAllCard( fun showFetchAllCard(
context: Activity, context: Activity,
originalPrice: String,
defaultCoupon: CouponsEntity?, defaultCoupon: CouponsEntity?,
result: List<CouponsEntity>?, result: List<CouponsEntity>?,
listener: OnFetchCardListener listener: OnFetchCardListener
...@@ -494,14 +495,14 @@ object DialogUtils { ...@@ -494,14 +495,14 @@ object DialogUtils {
} }
} }
if (defaultCoupon == null) { if (defaultCoupon == null) {
huafeiCouponsAdapter.setSelectPos(-1) huafeiCouponsAdapter.setSelectPos(-1,originalPrice)
btnBg.setBackgroundResource(R.drawable.icon_huafei_bottom_bg_unselect) btnBg.setBackgroundResource(R.drawable.icon_huafei_bottom_bg_unselect)
btnTv.setTextColor(Color.parseColor("#999999")) btnTv.setTextColor(Color.parseColor("#999999"))
btnTv.text = "暂不使用" btnTv.text = "暂不使用"
} else { } else {
for (i in result.indices) { for (i in result.indices) {
if (defaultCoupon.id == result[i].id) { if (defaultCoupon.id == result[i].id) {
huafeiCouponsAdapter.setSelectPos(i) huafeiCouponsAdapter.setSelectPos(i,originalPrice)
btnBg.setBackgroundResource(R.drawable.icon_huafei_bottom_bg) btnBg.setBackgroundResource(R.drawable.icon_huafei_bottom_bg)
btnTv.setTextColor(Color.parseColor("#F8E8CC")) btnTv.setTextColor(Color.parseColor("#F8E8CC"))
btnTv.text = "立即支付" btnTv.text = "立即支付"
......
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