From 0d88ea3f3a3424eed619fc6e1b0325fdf5f1893a Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 11 Apr 2024 16:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=8F=90=E7=8E=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authperson/EditBankCardActivity.kt | 2 +- .../ui/mine/activity/PersonInfoActivity.kt | 2 + .../ui/mine/activity/WalletActivity.kt | 45 ++++++- .../com/dahe/gldriver/utils/CommonPopUtils.kt | 21 ++++ .../dahe/gldriver/weight/pop/InputMoneyPop.kt | 65 ++++++++++ app/src/main/res/drawable/shape_blue_12.xml | 8 ++ .../main/res/layout/activity_person_info.xml | 2 +- app/src/main/res/layout/activity_wallet.xml | 4 +- app/src/main/res/layout/pop_input_money.xml | 113 ++++++++++++++++++ 9 files changed, 257 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/dahe/gldriver/weight/pop/InputMoneyPop.kt create mode 100644 app/src/main/res/drawable/shape_blue_12.xml create mode 100644 app/src/main/res/layout/pop_input_money.xml diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt index 99c172f..a2e86c3 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt @@ -33,7 +33,7 @@ class EditBankCardActivity : BaseActivity() { var perInfoBean: UserDetail = UserDetail() override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证", true) + setTitleBar("更换银行卡", true) binding.run { tvNote.visibility = View.GONE diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt index f29a19e..37d38da 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt @@ -70,6 +70,8 @@ class PersonInfoActivity : BaseActivity(), View.OnCli .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) + if (t.data==null) + return initViewByData(t.data) } })) diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt index 4fcc365..c4174e0 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt @@ -2,18 +2,30 @@ package com.dahe.gldriver.ui.mine.activity import android.graphics.Color import android.os.Bundle +import android.view.View import android.widget.LinearLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.dahe.gldriver.adapter.CarsAdapter import com.dahe.gldriver.adapter.WalletAdapter +import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.databinding.ActivityWalletBinding +import com.dahe.gldriver.net.BaseObserver +import com.dahe.gldriver.net.DataManager +import com.dahe.gldriver.net.RxHttpCallBack import com.dahe.gldriver.ui.account.authperson.EditBankCardActivity +import com.dahe.gldriver.utils.CommonPopUtils +import com.dahe.glex.bean.UserDetail import com.dahe.glex.bean.WayBillBean import com.dahe.mylibrary.base.BaseActivity +import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.mylibrary.utils.ConvertUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.ToastUtils +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers /** * @ClassName WalletActivity @@ -24,8 +36,14 @@ import com.dahe.mylibrary.utils.ConvertUtils class WalletActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusHeightParams(binding.rlTop) - setTitleBar("钱包",true,true,"更换银行卡"){ - ActivityUtils.startActivity(mContext,EditBankCardActivity::class.java) + setTitleBar("钱包", true, true) + binding.run { + tvLeft.setOnClickListener { + ActivityUtils.startActivity(mContext, EditBankCardActivity::class.java) + } + tvRight.setOnClickListener { + getCurrBank() + } } } @@ -57,4 +75,27 @@ class WalletActivity : BaseActivity() { adapter.submitList(datas) } + + + /** + * 获取当前银行卡 + */ + private fun getCurrBank() { + DataManager.getInstance().getUserDetail() + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + if (t.data != null && t.data.driverBankcardNumber.isNullOrEmpty()) { + ToastUtils.showToast(mContext, "请先绑定银行卡") + return + } + + CommonPopUtils.getInstance().showPickMoney(mContext, t.data) { + val toDouble = it.toDouble() + ToastUtils.showToast(mContext, "值是：：：：$toDouble") + } + } + })) + } } \ No newline at end of file diff --git a/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt b/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt index 5b8b87c..f9cd54c 100644 --- a/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt +++ b/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt @@ -11,7 +11,9 @@ import com.dahe.gldriver.callback.OnResultListener import com.dahe.gldriver.mypop.AgreementAlert import com.dahe.gldriver.mypop.OnCarSelectListener import com.dahe.gldriver.mypop.PopBottomCar +import com.dahe.gldriver.weight.pop.InputMoneyPop import com.dahe.gldriver.weight.pop.UpAppPop +import com.dahe.glex.bean.UserDetail import com.dahe.mylibrary.base.SingletonNoPHolder import com.dahe.mylibrary.utils.ConvertUtils import com.lxj.xpopup.XPopup @@ -162,4 +164,23 @@ class CommonPopUtils private constructor() { .show() } + + /** + * 提现弹窗 + * @param context Context + * @param userInfo UserDetail + * @param listener OnInputConfirmListener + */ + fun showPickMoney(context: Context, userInfo : UserDetail, listener: OnInputConfirmListener){ + XPopup.Builder(context) + .dismissOnBackPressed(true) + .dismissOnTouchOutside(true) + .asCustom( + InputMoneyPop( + context,userInfo,listener + ) + ) + .show() + } + } \ No newline at end of file diff --git a/app/src/main/java/com/dahe/gldriver/weight/pop/InputMoneyPop.kt b/app/src/main/java/com/dahe/gldriver/weight/pop/InputMoneyPop.kt new file mode 100644 index 0000000..881aacb --- /dev/null +++ b/app/src/main/java/com/dahe/gldriver/weight/pop/InputMoneyPop.kt @@ -0,0 +1,65 @@ +package com.dahe.gldriver.weight.pop + +import android.content.Context +import android.widget.Button +import android.widget.EditText +import android.widget.TextView +import androidx.core.widget.addTextChangedListener +import com.dahe.gldriver.R +import com.dahe.glex.bean.UserDetail +import com.dahe.mylibrary.utils.ToastUtils +import com.lxj.xpopup.core.CenterPopupView +import com.lxj.xpopup.interfaces.OnInputConfirmListener + +/** + * @ClassName InputMoneyPop + * @Author john + * @Date 2024/4/11 14:58 + * @Description TODO + */ +class InputMoneyPop( + context: Context, + val userInfo: UserDetail, + val listener: OnInputConfirmListener +) : + CenterPopupView(context) { + + override fun getImplLayoutId() = R.layout.pop_input_money + + override fun onCreate() { + super.onCreate() + + val tvName = findViewById(R.id.tvName) + val etMoney = findViewById(R.id.etMoney) + val btnOk = findViewById