2024-2-23 代码备份

提现功能调整
绑定银行卡页面开发完成，接口调试完成（部分toast样式没适配）
红积分页面返回键失效问题解决

app/src/main/AndroidManifest.xml

@@ -78,9 +78,14 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
+            android:name=".presentation.invitation.AddBankCardActivity"
+            android:exported="false"
+            android:label="添加银行卡"
+            />
+        <activity
             android:name=".presentation.pay.ShareFriendsPayActivity"
-            android:label="代付详情"
-            android:exported="false" />
+            android:exported="false"
+            android:label="代付详情" />
         <activity
             android:name=".presentation.integral.NewRedIntegralActivity"
             android:exported="false"

app/src/main/java/com/yihucha/hbyhc/network/service/UserService.java

@@ -20,6 +20,7 @@ import com.yihucha.hbyhc.presentation.integral.model.RedIntegralBean;
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralBean2;
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.AccumulatedincomeBean;
+import com.yihucha.hbyhc.presentation.invitation.model.BankCardBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsClassifyBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsPicBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteJavaBean;
@@ -560,6 +561,14 @@ public interface UserService {
 
     @GET("api/user/green_integral_list")
     Observable<DataResponse<List<RedIntegralListBean>>> getRedIntegralBean(@QueryMap Map<String,Object> map);
+
+    @GET("api/bank/list")
+    Observable<DataJavaResponse<List<BankCardBean>>> getBankCardList();
+
+    @POST("/api/bank/create")
+    Observable<DataJavaResponse<String>> addBankCard(@QueryMap Map<String,Object> map);
+
+
 //    /**
 //     *检测用户年费状态
 //     * @param

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityFragment.kt

@@ -134,7 +134,7 @@ class AnnuityFragment : BaseFragment(), View.OnClickListener {
                 AlreadyRealNameActivity.launch(context)
             }
         } else if (view == mViewBinding.llPaymentPlatformBinding) {
-            ThirdPartyBindingActivity.launch(context)
+//            ThirdPartyBindingActivity.launch(context)
         } else if (
             view == mViewBinding.llCiticNotaryOfficeToCheck ||
             view == mViewBinding.llZxgzc

app/src/main/java/com/yihucha/hbyhc/presentation/integral/NewRedIntegralActivity.java

@@ -161,6 +161,8 @@ public class NewRedIntegralActivity extends ViewBindingTitleBaseActivity<Activit
             resetSelector();
             page = 1;
             loadData();
+        }else {
+            super.onClick(v);
         }
     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/AddBankCardActivity.kt

@@ -0,0 +1,176 @@
+package com.yihucha.hbyhc.presentation.invitation
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.lifecycle.ViewModelProvider
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityAddBankCardBinding
+import com.yihucha.hbyhc.presentation.annuity.view_model.RealNameAuthenticationViewModel
+import com.yihucha.hbyhc.presentation.invitation.model.BankCardBean
+import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
+import com.yihucha.hbyhc.utils.EditTextListener
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+import com.yihucha.hbyhc.utils.StringsUtil
+
+class AddBankCardActivity : ViewBindingTitleBaseActivity<ActivityAddBankCardBinding>() {
+    var cardImg: String? = null
+    var bankCardBean: BankCardBean? = null
+    var userNameEmpty = true
+    var userCardEmpty = true
+    var bankNameEmpty = true
+    var bankName2Empty = true
+    var bankCardEmpty = true
+    private val viewModel by lazy {
+        ViewModelProvider(this)[InviteViewModel::class.java]
+    }
+    private val realNameViewModel by lazy {
+        ViewModelProvider(this)[RealNameAuthenticationViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+        initData()
+        initListener()
+    }
+
+    private fun initView() {
+        bankCardBean = intent.getSerializableExtra("beans") as BankCardBean
+        mViewBinding.apply {
+            EditTextListener.onTextListener(edtUserName) {
+                userNameEmpty = it
+                checkBtnEnabled()
+            }
+            EditTextListener.onTextListener(edtCardNumber) {
+                userCardEmpty = it
+                checkBtnEnabled()
+            }
+            EditTextListener.onTextListener(edtBankName) {
+                bankNameEmpty = it
+                checkBtnEnabled()
+            }
+            EditTextListener.onTextListener(edtBankName2) {
+                bankName2Empty = it
+                checkBtnEnabled()
+            }
+            EditTextListener.onTextListener(edtBankCardNumber) {
+                bankCardEmpty = it
+                checkBtnEnabled()
+            }
+        }
+    }
+
+    private fun initData() {
+        if (EmptyCheckUtils.isEmpty(bankCardBean)) {
+            val map = mutableMapOf<String, Any>()
+            map["type"] = 1
+            realNameViewModel.getAutonym(map)
+        } else {
+            bankCardBean?.let {
+                mViewBinding.apply {
+                    edtUserName.setText(it.userName)
+                    edtCardNumber.setText(it.userCard)
+                    edtBankName.setText(it.bankName)
+                    edtBankName2.setText(it.bankOpenName)
+                    edtBankCardNumber.setText(it.account)
+                }
+            }
+        }
+        realNameViewModel.mAutonymData.observe(this) {
+            mViewBinding.edtUserName.setText(it.user_name)
+            mViewBinding.edtCardNumber.setText(it.user_card)
+        }
+        viewModel.addBankCardResult.observe(this) {
+            Toast.makeText(this, it, Toast.LENGTH_LONG).show()
+            finish()
+        }
+        viewModel.failed.observe(this) {
+            Toast.makeText(this, it, Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun initListener() {
+        mViewBinding.apply {
+            btnSubmit.setOnClickListener(this@AddBankCardActivity)
+        }
+    }
+
+    private fun checkBtnEnabled() {
+        val enabled =
+            !(userNameEmpty && userCardEmpty && bankNameEmpty && bankName2Empty && bankCardEmpty)
+        mViewBinding.btnSubmit.isClickable = enabled
+        if (enabled) {
+            mViewBinding.btnSubmit.background = getDrawable(R.drawable.shape_fe0032_50dp)
+        } else {
+            mViewBinding.btnSubmit.background = getDrawable(R.drawable.shape_fe7577_50dp)
+        }
+
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity, bankCardBean: BankCardBean?) {
+            val intent = Intent(activity, AddBankCardActivity::class.java)
+            if (EmptyCheckUtils.isNotEmpty(bankCardBean)) {
+                intent.putExtra("beans", bankCardBean)
+            }
+            activity.startActivity(intent)
+        }
+    }
+
+    override fun onClick(v: View?) {
+
+        if (v == mViewBinding.btnSubmit) {
+            mViewBinding.apply {
+                //提交
+                if (EmptyCheckUtils.isEmpty(edtUserName.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "请输入持卡人姓名", Toast.LENGTH_LONG).show()
+                    return
+                }
+                if (EmptyCheckUtils.isEmpty(edtCardNumber.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "请输入持卡人身份证号", Toast.LENGTH_LONG).show()
+                    return
+                }
+                if (EmptyCheckUtils.isEmpty(edtBankName.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "请输入银行", Toast.LENGTH_LONG).show()
+                    return
+                }
+                if (EmptyCheckUtils.isEmpty(edtBankName2.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "请输入开户支行", Toast.LENGTH_LONG).show()
+                    return
+                }
+                if (EmptyCheckUtils.isEmpty(edtBankCardNumber.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "请输入银行卡号", Toast.LENGTH_LONG).show()
+                    return
+                }
+                if (!StringsUtil.isIdCard(edtCardNumber.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "身份证号格式错误", Toast.LENGTH_LONG).show()
+                    return
+                }
+/*                if (!StringsUtil.isBank(edtBankCardNumber.text.toString())) {
+                    Toast.makeText(this@AddBankCardActivity, "银行卡号格式错误", Toast.LENGTH_LONG).show()
+                    return
+                }*/
+                val map = mutableMapOf<String, Any>()
+                map["account"] = edtBankCardNumber //卡号
+//                map["valid_date"] = edtBankCardNumber //有效期
+                map["bank_card_type"] = 1 //类型
+                map["bank_name"] = edtBankName //银行
+                map["user_name"] = edtUserName //姓名
+                map["user_card"] = edtCardNumber //证件号
+                if (EmptyCheckUtils.isNotEmpty(cardImg)) {
+                    map["pic"] = cardImg!! //图片
+                }
+                map["bank_open_name"] = edtBankName2 //开户行
+                viewModel.addBankCard(map)
+            }
+        } else {
+            super.onClick(v)
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/ImmediateWithdrawalActivity.java

@@ -28,6 +28,7 @@ import com.yihucha.hbyhc.base.WebViewTitleBaseActivity;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.databinding.ActivityImmediateWithdrawalBinding;
 import com.yihucha.hbyhc.presentation.annuity.RealNameAuthenticationActivity;
+import com.yihucha.hbyhc.presentation.invitation.model.BankCardBean;
 import com.yihucha.hbyhc.presentation.invitation.model.SpreadInfoBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalConfigurationBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalServiceBean;
@@ -37,7 +38,9 @@ import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.view_model.BindingStateBViewModel;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
+import com.yihucha.hbyhc.utils.StringsUtil;
 import com.yihucha.hbyhc.view.MyToast;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 
@@ -65,6 +68,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     private String mWithdrawal_wchat;//微信提现0:关闭;1:开启
     private String mWithdrawal_status;//提现功能0:关闭;1:开启
     private String type = "2";//1-微信。2-支付宝
+    private BankCardBean bankCardBean;
     private static final int SDK_AUTH_FLAG = 2;
     private boolean isRed = false;
     private volatile boolean isShow = false;
@@ -120,7 +124,6 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     };
 
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -135,6 +138,8 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         initClick();
         initData();
     }
+
+    @SuppressLint("SetTextI18n")
     private void initData() {
         //佣金信息
         mInviteViewModel.getSpreadInfo();
@@ -146,7 +151,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 mMemberBrokeragePrice = spreadInfoBean.getMember_brokerage_price();
                 mViewBinding.tvRedIntegral.setText("可提现金额:" + mMemberBrokeragePrice);
                 try {
-                    if (mWithdrawal_money!=null&&!isShow){
+                    if (mWithdrawal_money != null && !isShow) {
                         if ((Double.parseDouble(mBrokeragePrice) < Double.parseDouble(mWithdrawal_money))) {
                             Toast toast = Toast.makeText(context, "满" + mWithdrawal_money + "才可以提现~", Toast.LENGTH_SHORT);
                             toast.setGravity(Gravity.CENTER, 0, 0);
@@ -167,12 +172,13 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 for (int i = 0; i < bindingStateBeans.size(); i++) {
                     if (bindingStateBeans.get(i).getType().equals("1")) {
                         type = "1";
-                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_selected);
-                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_unselected);
+                        mViewBinding.tvClickToAccredit.setText("已授权，点击可修改");
+//                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_selected);
+//                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_unselected);
                     } else if (bindingStateBeans.get(i).getType().equals("2")) {
                         type = "2";
-                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_selected);
-                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
+//                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_selected);
+//                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
                         break;
                     }
                 }
@@ -188,7 +194,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 mWithdrawal_wchat = withdrawalConfigurationBean.getWithdrawal_wchat();
                 mWithdrawal_status = withdrawalConfigurationBean.getWithdrawal_status();
                 try {
-                    if (mBrokeragePrice!=null&&!isShow){
+                    if (mBrokeragePrice != null && !isShow) {
                         if ((Double.parseDouble(mBrokeragePrice) < Double.parseDouble(mWithdrawal_money))) {
                             Toast toast = Toast.makeText(context, "满" + mWithdrawal_money + "才可以提现~", Toast.LENGTH_SHORT);
                             toast.setGravity(Gravity.CENTER, 0, 0);
@@ -203,28 +209,28 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
             }
         });
         //提现检测是否绑定提交账户接口数据
-        mInviteViewModel.mBandAccountInfoSucceed.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                if ("400".equals(s)) {
-                    if (type.equals("1")) {
-                        //微信授权
-                        regToWx();
-                        type = "1";
-                    } else {
-                        //支付宝授权
-                        mInviteViewModel.getAuthInfo();
-                    }
-                }else if ("200".equals(s)){
-                    //授权成功状态
-                    if (type.equals("1")) {
-                        //微信授权
-                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_selected);
-                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_unselected);
-                    } else if (type.equals("2")){
-                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_selected);
-                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
-                    }
+        mInviteViewModel.mBandAccountInfoSucceed.observe(this, s -> {
+            if ("400".equals(s)) {
+                if (type.equals("1")) {
+                    //微信授权
+                    regToWx();
+                    type = "1";
+                } else {
+                    //支付宝授权
+                    mInviteViewModel.getAuthInfo();
+                }
+            } else if ("200".equals(s)) {
+                //授权成功状态
+                if (type.equals("1")) {
+                    //微信授权
+                    mViewBinding.tvClickToAccredit.setText("已授权，点击可修改");
+/*                    mViewBinding.ivWx.setImageResource(R.mipmap.icon_duigou_red);
+                    mViewBinding.ivWx.setVisibility(View.VISIBLE);
+                    mViewBinding.ivYhk.setVisibility(View.INVISIBLE);
+                    mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_unselected);*/
+                } else if (type.equals("2")) {
+                    mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_selected);
+                    mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
                 }
             }
         });
@@ -283,21 +289,21 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 WithdrawalRecordActivity.launch(context);
             }
         });
-
-        mInviteViewModel.failed.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                ToastUtils.showLong(s);
+        mInviteViewModel.bankCardList.observe(this, bankCardBeans -> {
+            if (EmptyCheckUtils.isEmpty(bankCardBeans)) {
+                mViewBinding.tvClickToSelectCard.setText("点击添加银行卡");
+            } else {
+                bankCardBean = bankCardBeans.get(0);
+                String account = bankCardBean.getAccount();
+                mViewBinding.tvTitleBankCard.setText(bankCardBean.getBankName()
+                        + " 储蓄卡 (" + account.substring(account.length() - 4) + ")");
+                mViewBinding.tvClickToSelectCard.setText("点击可修改银行卡信息");
             }
         });
+        mInviteViewModel.failed.observe(this, s -> ToastUtils.showLong(s));
 
 
-        mInviteViewModel.userModel.observe(this, new Observer<UserInfoModel>() {
-            @Override
-            public void onChanged(UserInfoModel uesrInfoModel) {
-                mViewBinding.tvIntegral.setText("可用积分:" + uesrInfoModel.getScore());
-            }
-        });
+        mInviteViewModel.userModel.observe(this, uesrInfoModel -> mViewBinding.tvIntegral.setText("可用积分:" + uesrInfoModel.getScore()));
     }
 
     private void initClick() {
@@ -307,6 +313,10 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         mViewBinding.llZfb.setOnClickListener(this);
         mViewBinding.tvTixianguize.setOnClickListener(this);
 
+        mViewBinding.tvClickToAccredit.setOnClickListener(this);
+        mViewBinding.tvClickToSelectCard.setOnClickListener(this);
+        mViewBinding.llYhk.setOnClickListener(this);
+
         mViewBinding.etCashWithdrawalAmount.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -327,7 +337,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                     }
                     if (StringUtil.isBlank(mViewBinding.etCashWithdrawalAmount.getText().toString())) {
                         mViewBinding.tvService.setText("平台服务费 ¥");
-                        mViewBinding.tvServiceMoney.setText("本次提取将扣除服务费 ¥" );
+                        mViewBinding.tvServiceMoney.setText("本次提取将扣除服务费 ¥");
                         mViewBinding.tvMoney.setText("本次提取实际到账额度 ¥");
                         return;
                     }
@@ -384,10 +394,18 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 ToastUtils.showLong("微信提现功能关闭");
                 return;
             }
+            if ("1".equals(type) && mViewBinding.tvClickToAccredit.getText().toString().contains("未授权")) {
+                ToastUtils.showLong("您还没有授权微信，请先授权");
+                return;
+            }
             if ("2".equals(type) && "0".equals(mWithdrawal_alipay)) {
                 ToastUtils.showLong("支付宝提现功能关闭");
                 return;
             }
+            if ("3".equals(type) && mViewBinding.tvClickToSelectCard.getText().toString().equals("点击添加银行卡")) {
+                ToastUtils.showLong("您还没有绑定银行卡，请先绑定银行卡");
+                return;
+            }
             if (type.equals("")) {
                 ToastUtils.showLong("选择提现方式");
                 return;
@@ -407,7 +425,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                     toast.show();
                     return;
                 }
-            }else {
+            } else {
                 if (tixian > Double.parseDouble(mBrokeragePrice)) {
 //                        ToastUtils.showLong("输入金额超过可提现余额");
                     Toast toast = Toast.makeText(context, "输入金额超过可提现余额", Toast.LENGTH_SHORT);
@@ -429,7 +447,10 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
             //微信
             type = "1";
             //提现检测是否绑定提交账户接口
-            mInviteViewModel.getBandAccountInfo(type, "");
+//            mInviteViewModel.getBandAccountInfo(type, "");
+            mViewBinding.ivWx.setVisibility(View.VISIBLE);
+            mViewBinding.ivYhk.setVisibility(View.INVISIBLE);
+            mViewBinding.ivWx.setImageResource(R.mipmap.icon_duigou_red);
         } else if (v == mViewBinding.llZfb) {
             //支付宝
             type = "2";
@@ -438,6 +459,26 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         } else if (v == mViewBinding.tvTixianguize) {
             WebViewTitleBaseActivity.launch(ImmediateWithdrawalActivity.this, getString(R.string.withdrawal_rules),
                     Constants.PROTOCOL + Constants.WITHDRAWAL_RULES);
+        } else if (v == mViewBinding.tvClickToAccredit) {
+            //去绑定微信
+            //微信
+            type = "1";
+            //提现检测是否绑定提交账户接口
+            mInviteViewModel.getBandAccountInfo(type, "");
+        } else if (v == mViewBinding.tvClickToSelectCard) {
+            //去绑定银行卡
+            AddBankCardActivity.launch(this, bankCardBean);
+        } else if (v == mViewBinding.llYhk) {
+            //选中银行卡
+/*            if (EmptyCheckUtils.isNotEmpty(bankCardBean)) {
+
+            }else {
+
+            }*/
+            type = "3";
+            mViewBinding.ivWx.setVisibility(View.INVISIBLE);
+            mViewBinding.ivYhk.setVisibility(View.VISIBLE);
+            mViewBinding.ivYhk.setImageResource(R.mipmap.icon_duigou_red);
         }
     }
 
@@ -464,6 +505,8 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         mInviteViewModel.getYanglaojinInfo();
         //用户信息
         mInviteViewModel.getUserInfo();
+        //获取银行卡列表
+        mInviteViewModel.getBankCardList();
     }
 
     public static void launch(Context context, Bundle bundle) {
@@ -478,12 +521,12 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onBindResult(String result){
+    public void onBindResult(String result) {
         System.out.println("onBindResult result = " + result);
         if ("success".equals(result)) {
             mViewBinding.ivWx.setImageResource(R.mipmap.shopping_selected);
             mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_unselected);
-        }else {
+        } else {
             type = "";
             mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
         }

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/model/BankCardBean.java

@@ -0,0 +1,184 @@
+package com.yihucha.hbyhc.presentation.invitation.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/26 14:09
+ * com.yihucha.hbyhc.presentation.invitation.model
+ */
+public class BankCardBean implements Serializable {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("user_id")
+    private String userId;
+    @SerializedName("account_type")
+    private String accountType;
+    @SerializedName("account")
+    private String account;
+    @SerializedName("is_default")
+    private String isDefault;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("info")
+    private String info;
+    @SerializedName("update_time")
+    private String updateTime;
+    @SerializedName("status")
+    private String status;
+    @SerializedName("valid_date")
+    private String validDate;
+    @SerializedName("bank_name")
+    private String bankName;
+    @SerializedName("phone")
+    private String phone;
+    @SerializedName("bank_card_type")
+    private String bankCardType;
+    @SerializedName("user_name")
+    private String userName;
+    @SerializedName("user_card")
+    private String userCard;
+    @SerializedName("bank_open_name")
+    private String bankOpenName;
+    @SerializedName("pic")
+    private String pic;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getBankCardType() {
+        return bankCardType;
+    }
+
+    public void setBankCardType(String bankCardType) {
+        this.bankCardType = bankCardType;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserCard() {
+        return userCard;
+    }
+
+    public void setUserCard(String userCard) {
+        this.userCard = userCard;
+    }
+
+    public String getBankOpenName() {
+        return bankOpenName;
+    }
+
+    public void setBankOpenName(String bankOpenName) {
+        this.bankOpenName = bankOpenName;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/view_model/InviteViewModel.java

@@ -19,6 +19,7 @@ import com.yihucha.hbyhc.network.request_bean.SpreadNumberRequest;
 import com.yihucha.hbyhc.network.service.UserService;
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.AccumulatedincomeBean;
+import com.yihucha.hbyhc.presentation.invitation.model.BankCardBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsClassifyBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsPicBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteJavaBean;
@@ -33,6 +34,7 @@ import com.yihucha.hbyhc.presentation.invitation.model.UserShareProductListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalConfigurationBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalServiceBean;
+import com.yihucha.hbyhc.presentation.login.model.LoginModel;
 import com.yihucha.hbyhc.presentation.mine.model.CommissionBean;
 import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
@@ -95,6 +97,8 @@ public class InviteViewModel extends BaseViewModel {
     public MutableLiveData<String> mShareImgsData = new MutableLiveData<>();//生成的图片
     public MutableLiveData<CommissionBean> commissionDetail = new MutableLiveData<>();//收益详情
 
+    public MutableLiveData<List<BankCardBean>> bankCardList = new MutableLiveData<>(); //银行卡列表
+    public MutableLiveData<String> addBankCardResult = new MutableLiveData<>(); //添加银行卡
 
 //    /**
 //     * 检查年费状态
@@ -465,6 +469,52 @@ public class InviteViewModel extends BaseViewModel {
     }
 
     /**
+     * 银行卡列表
+     */
+    @SuppressLint("CheckResult")
+    public void getBankCardList(){
+        UserService userService = NetworkApi.createService(UserService.class);
+        userService.getBankCardList().compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<List<BankCardBean>>>() {
+            @Override
+            public void onSuccess(DataJavaResponse<List<BankCardBean>> response) {
+                if (response.responseCode == 200) {
+                    bankCardList.postValue(response.getData());
+                }else {
+                    failed.postValue(response.responseError);
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                e.printStackTrace();
+            }
+        }));
+    }
+
+    /**
+     * 添加银行卡
+     */
+    @SuppressWarnings("checkResult")
+    public void addBankCard(Map<String,Object> map){
+        UserService userService = NetworkApi.createService(UserService.class);
+        userService.addBankCard(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<String>>() {
+            @Override
+            public void onSuccess(DataJavaResponse<String> response) {
+                if (response.responseCode==200) {
+                    addBankCardResult.postValue(response.responseError);
+                }else {
+                    failed.postValue(response.responseError);
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                failed.postValue("添加失败");
+            }
+        }));
+    }
+
+    /**
      * 提现申请
      *
      * @param extract_price

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MineFragment.java

@@ -13,37 +13,22 @@ import androidx.lifecycle.ViewModelProvider;
 import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.BaseFragment;
-import com.yihucha.hbyhc.base.H5TitleActivity;
 import com.yihucha.hbyhc.config.Constants;
-import com.yihucha.hbyhc.config.HttpUrl;
 import com.yihucha.hbyhc.databinding.FragmentMineBinding;
-import com.yihucha.hbyhc.presentation.annuity.AnnuityActivity;
-import com.yihucha.hbyhc.presentation.integral.MyIntegralActivity;
 import com.yihucha.hbyhc.presentation.integral.NewRedIntegralActivity;
-import com.yihucha.hbyhc.presentation.integral.RedIntegralActivity;
-import com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity;
 import com.yihucha.hbyhc.presentation.invitation.MyInvitationActivity;
-import com.yihucha.hbyhc.presentation.mine.model.MyInvitationBean;
-import com.yihucha.hbyhc.presentation.mine.model.OrderQuantityBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
-import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
-import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.presentation.order.AfterSalesOrderListActivity;
 import com.yihucha.hbyhc.presentation.order.OrderActivity;
-import com.yihucha.hbyhc.presentation.order.TripartiteOrderActivity;
-import com.yihucha.hbyhc.presentation.pay.PensionAccountPaySucceedActivity;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.MVUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;
-import com.yihucha.hbyhc.view.CustomDialog;
 import com.tencent.mm.opensdk.constants.Build;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
-import java.util.List;
 
 /**
  * @author qmzh

app/src/main/java/com/yihucha/hbyhc/utils/EditTextListener.kt

@@ -0,0 +1,28 @@
+package com.yihucha.hbyhc.utils
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/26 16:23
+ *  com.yihucha.hbyhc.utils
+ */
+object EditTextListener {
+    @JvmStatic
+    fun onTextListener(editText: EditText, listener: (Boolean) -> Unit){
+        editText.addTextChangedListener(object : TextWatcher{
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+
+            override fun afterTextChanged(s: Editable?) {
+                listener(EmptyCheckUtils.isEmpty(s.toString()))
+            }
+
+        })
+    }
+}

app/src/main/java/com/yihucha/hbyhc/utils/StringsUtil.java

@@ -6,8 +6,12 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.text.Editable;
 import android.text.TextUtils;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -224,9 +228,9 @@ public class StringsUtil {
     public static String encodeIdCard2(String string) {
         StringBuilder temp = new StringBuilder();
         if (!TextUtils.isEmpty(string)) {
-            temp.append(string.substring(0,1));
+            temp.append(string.substring(0, 1));
             temp.append("****************");
-            temp.append(string.substring(string.length()-1,string.length()));
+            temp.append(string.substring(string.length() - 1, string.length()));
         } else {
             return "";
         }
@@ -266,7 +270,7 @@ public class StringsUtil {
      * 银行卡加密显示
      */
     public static String encodeBankCard(String string) {
-        StringBuffer temp = new StringBuffer("");
+        StringBuffer temp = new StringBuffer();
         if (string != null && string.length() >= 16) {
             for (int i = 0; i < 12; i++) {
                 temp.append("*");
@@ -277,6 +281,21 @@ public class StringsUtil {
         }
         return temp.toString();
     }
+    /**
+     * 银行卡加密并格式化
+     */
+
+    public static String encodeAndFormatCard(String card){
+        if (EmptyCheckUtils.isEmpty(card)) {
+            return card+"";
+        }
+        StringBuffer sb = new StringBuffer();
+        sb.append(card.substring(0,4));
+        sb.append(" ");
+        sb.append("**** **** **** ");
+        sb.append(card.substring(card.length()-3));
+        return sb.toString();
+    }
 
     /**
      * 银行卡格式化
@@ -807,4 +826,28 @@ public class StringsUtil {
         }
         return false;
     }
+
+    /**
+     * 银行卡号校验
+     *
+     * @param text
+     * @return
+     */
+    public static boolean isBank(@Nullable String text) {
+        String patternStr = "^([1-9])(\\d{14}|\\d{18})";
+        Pattern pattern = Pattern.compile(patternStr);
+        return pattern.matcher(text).matches();
+    }
+
+    /**
+     * 身份证号正则校验
+     *
+     * @param idcard
+     * @return
+     */
+    public static boolean isIdCard(@NotNull String idcard) {
+        String patternStr = "^\\d{17}(\\d|[Xx])";
+        Pattern pattern = Pattern.compile(patternStr);
+        return pattern.matcher(idcard).matches();
+    }
 }

app/src/main/java/com/yihucha/hbyhc/view/PopCommissionSelector.java

@@ -63,7 +63,7 @@ public class PopCommissionSelector extends PopupWindow implements View.OnClickLi
         sourceBeans.add(new SelectorBean("业绩奖", "2", false));
         sourceBeans.add(new SelectorBean("代理商分红", "3", false));
         sourceBeans.add(new SelectorBean("推荐代理商收益", "4", false));
-        sourceBeans.add(new SelectorBean("消费增值系统收益", "5", false));
+        sourceBeans.add(new SelectorBean("消费增值系统佣金", "5", false));
         sourceBeans.add(new SelectorBean("运营中心收益", "5", false));
         GridLayoutManager sourceManager = new GridLayoutManager(context, 2);
         binding.rvTypeItem.setLayoutManager(sourceManager);

app/src/main/res/drawable/shape_bg_area.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/black_333333"
+        android:dashWidth="5dp"
+        android:dashGap="5dp"
+        />
+</shape>

app/src/main/res/layout/activity_add_bank_card.xml

@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    tools:context=".presentation.invitation.AddBankCardActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <com.yihucha.hbyhc.view.BoldText
+                android:id="@+id/tv_title_user_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="持卡人信息"
+                android:textColor="@color/black_333333"
+                android:textSize="16sp" />
+
+            <RelativeLayout
+                android:id="@+id/layout_user_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_title_user_info"
+                android:background="@drawable/shape_white_8dp"
+                android:padding="16dp">
+
+                <TextView
+                    android:id="@+id/tv_title_user_name"
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:text="姓名"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/edt_user_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_title_user_name"
+                    android:layout_alignBottom="@+id/tv_title_user_name"
+                    android:layout_toRightOf="@+id/tv_title_user_name"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="请输入持卡人姓名"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_title_card_number"
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title_user_name"
+                    android:layout_marginTop="10dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:text="身份证号"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/edt_card_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_title_card_number"
+                    android:layout_alignBottom="@+id/tv_title_card_number"
+                    android:layout_toRightOf="@+id/tv_title_user_name"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="请输入持卡人身份证号"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+            <com.yihucha.hbyhc.view.BoldText
+                android:id="@+id/tv_title_card_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/layout_user_info"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="银行卡信息"
+                android:textColor="@color/black_333333"
+                android:textSize="16sp" />
+
+            <RelativeLayout
+                android:id="@+id/layout_bank_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_title_card_info"
+                android:background="@drawable/shape_white_8dp"
+                android:padding="16dp">
+
+                <TextView
+                    android:id="@+id/tv_title_select_bank"
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:text="所属银行"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/edt_bank_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_title_select_bank"
+                    android:layout_alignBottom="@+id/tv_title_select_bank"
+                    android:layout_toRightOf="@+id/tv_title_select_bank"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="请输入银行名称，如：中国银行"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_title_bank_name_2"
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title_select_bank"
+                    android:layout_marginTop="10dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:text="开户支行"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/edt_bank_name_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_title_bank_name_2"
+                    android:layout_alignBottom="@+id/tv_title_bank_name_2"
+                    android:layout_toRightOf="@+id/tv_title_select_bank"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="请输入开户支行"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_title_bank_card"
+                    android:layout_width="80dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title_bank_name_2"
+                    android:layout_marginTop="10dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:text="银行卡号"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <EditText
+                    android:id="@+id/edt_bank_card_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_title_bank_card"
+                    android:layout_alignBottom="@+id/tv_title_bank_card"
+                    android:layout_toRightOf="@+id/tv_title_select_bank"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/bank_card_hint"
+                    android:inputType="number"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+            <com.yihucha.hbyhc.view.BoldText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/layout_bank_info"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="银行卡照片（选填）"
+                android:textColor="@color/black_333333"
+                android:textSize="16sp"
+                android:visibility="gone"
+                />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:background="@drawable/shape_white_8dp"
+                android:padding="16dp"
+                android:visibility="gone"
+                >
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:background="@drawable/shape_bg_area" />
+
+                <ImageView
+                    android:id="@+id/imgv_bank_card"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="22dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginRight="22dp"
+                    android:layout_marginBottom="5dp"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/bg_bankcard_area" />
+
+                <TextView
+                    android:id="@+id/tv_add_card_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:drawableTop="@mipmap/icon_add"
+                    android:drawablePadding="20dp"
+                    android:text="上传银行卡正面照片"
+                    android:textColor="@color/gray_999999"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/layout_bank_info"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="40dp"
+                android:layout_marginRight="32dp"
+                android:background="@drawable/shape_fe7577_50dp"
+                android:text="提交"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:clickable="false"
+                />
+        </LinearLayout>
+    </ScrollView>
+
+</FrameLayout>

app/src/main/res/layout/activity_immediate_withdrawal.xml

@@ -4,16 +4,17 @@
     android:layout_height="match_parent"
     android:background="@color/white_f8f8f8"
     android:orientation="vertical">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:scrollbars="none"
-        >
+        android:scrollbars="none">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -21,33 +22,35 @@
                 android:layout_marginTop="13dp"
                 android:layout_marginRight="16dp"
                 android:background="@drawable/shape_ffffff_8dp"
+                android:orientation="vertical"
                 android:paddingLeft="13dp"
-                android:paddingRight="13dp"
                 android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:orientation="vertical">
+                android:paddingRight="13dp"
+                android:paddingBottom="16dp">
+
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:gravity="center_vertical"
                     android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <com.yihucha.hbyhc.view.BoldText
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:textSize="15sp"
                         android:text="@string/cash_withdrawal_amount"
-                        android:textColor="@color/black_333333"/>
+                        android:textColor="@color/black_333333"
+                        android:textSize="15sp" />
 
                     <TextView
                         android:id="@+id/tv_tixianguize"
                         android:layout_width="wrap_content"
-                        android:textSize="11sp"
-                        android:textColor="@color/gray_999999"
+                        android:layout_height="wrap_content"
                         android:text="@string/withdrawal_rules"
-                        android:layout_height="wrap_content" />
+                        android:textColor="@color/gray_999999"
+                        android:textSize="11sp" />
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -57,10 +60,9 @@
                     <com.yihucha.hbyhc.view.BoldText
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black_333333"
-                        android:textSize="27sp"
                         android:text="¥"
-                        />
+                        android:textColor="@color/black_333333"
+                        android:textSize="27sp" />
 
                     <EditText
                         android:id="@+id/et_cash_withdrawal_amount"
@@ -70,29 +72,32 @@
                         android:layout_marginRight="5dp"
                         android:layout_weight="1"
                         android:background="@null"
-                        android:textSize="34sp"
                         android:inputType="number|numberDecimal"
-                        android:textColor="@color/black_333333"/>
+                        android:textColor="@color/black_333333"
+                        android:textSize="34sp" />
 
                     <TextView
                         android:id="@+id/tv_all_withdrawal"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="13sp"
                         android:layout_gravity="center_vertical"
                         android:text="@string/all_withdrawal"
-                        android:textColor="@color/red_fe0032"/>
+                        android:textColor="@color/red_fe0032"
+                        android:textSize="13sp" />
                 </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
-                    android:background="@color/gray_e5e5e5"
+                    android:layout_height="0.5dp"
                     android:layout_marginTop="15.5dp"
-                    android:layout_height="0.5dp"></View>
+                    android:background="@color/gray_e5e5e5"></View>
+
                 <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_marginTop="13dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="13dp"
                     android:orientation="horizontal">
+
                     <TextView
                         android:id="@+id/tv_brokerage_price"
                         android:layout_width="wrap_content"
@@ -101,6 +106,7 @@
                         android:text="可用余额:¥"
                         android:textColor="@color/gray_999999"
                         android:textSize="15sp" />
+
                     <TextView
                         android:id="@+id/tv_integral"
                         android:layout_width="wrap_content"
@@ -110,6 +116,7 @@
                         android:text="可用积分:"
                         android:textColor="@color/gray_999999"
                         android:textSize="15sp" />
+
                     <TextView
                         android:id="@+id/tv_red_integral"
                         android:layout_width="wrap_content"
@@ -120,6 +127,7 @@
                         android:textSize="15sp" />
                 </LinearLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -127,74 +135,153 @@
                 android:layout_marginTop="13dp"
                 android:layout_marginRight="16dp"
                 android:background="@drawable/shape_ffffff_8dp"
+                android:orientation="vertical"
                 android:paddingLeft="13dp"
-                android:paddingRight="13dp"
                 android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:orientation="vertical">
+                android:paddingRight="13dp"
+                android:paddingBottom="16dp">
 
                 <com.yihucha.hbyhc.view.BoldText
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
+                    android:text="提现至"
                     android:textColor="@color/black_333333"
-                    android:text="提现至"/>
+                    android:textSize="15sp" />
+
                 <View
                     android:layout_width="match_parent"
-                    android:background="@color/gray_e5e5e5"
+                    android:layout_height="0.5dp"
                     android:layout_marginTop="15.5dp"
-                    android:layout_height="0.5dp"></View>
+                    android:background="@color/gray_e5e5e5"></View>
+
                 <LinearLayout
                     android:id="@+id/ll_zfb"
                     android:layout_width="match_parent"
-                    android:layout_marginTop="16dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
                     android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <ImageView
                         android:layout_width="32.5dp"
                         android:layout_height="32.5dp"
-                        android:src="@mipmap/zfb_logo"/>
+                        android:src="@mipmap/zfb_logo" />
 
                     <TextView
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8dp"
-                        android:text="@string/alipay"/>
+                        android:layout_weight="1"
+                        android:text="@string/alipay" />
 
                     <ImageView
                         android:id="@+id/iv_zfb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/shopping_unselected"/>
+                        android:src="@mipmap/shopping_unselected" />
                 </LinearLayout>
+
                 <LinearLayout
                     android:id="@+id/ll_wx"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="32.5dp"
+                        android:layout_height="32.5dp"
+                        android:src="@mipmap/icon_wx"
+                        android:layout_marginLeft="5dp"
+                        />
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_weight="1"
+                        android:paddingLeft="16dp"
+                        android:paddingTop="5dp"
+                        android:paddingBottom="5dp"
+                        >
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/black_333333"
+                            android:text="@string/wechat"
+                            android:textSize="16sp"
+                            />
+
+                        <TextView
+                            android:id="@+id/tv_click_to_accredit"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="5dp"
+                            android:text="未授权，点击去授权"
+                            android:textSize="14sp"
+                            android:textColor="@color/black_808080"
+                            />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/iv_wx"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/shopping_unselected"
+                        android:padding="5dp"
+                        android:visibility="invisible"
+                        />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_yhk"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <ImageView
                         android:layout_width="32.5dp"
                         android:layout_height="32.5dp"
-                        android:src="@mipmap/wx_logo"/>
-
-                    <TextView
+                        android:src="@mipmap/icon_bank_card"
+                        android:layout_marginLeft="5dp"
+                        />
+                    <LinearLayout
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/wechat"/>
+                        android:orientation="vertical"
+                        android:layout_weight="1"
+                        android:paddingLeft="16dp"
+                        android:paddingTop="5dp"
+                        android:paddingBottom="5dp"
+                        >
+                        <TextView
+                            android:id="@+id/tv_title_bank_card"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yhk"
+                            android:textSize="16sp"
+                            android:textColor="@color/black_333333"
+                            />
+
+                        <TextView
+                            android:id="@+id/tv_click_to_select_card"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="5dp"
+                            android:textSize="14sp"
+                            android:textColor="@color/black_808080"
+                            android:text="点击添加银行卡" />
+                    </LinearLayout>
 
                     <ImageView
-                        android:id="@+id/iv_wx"
+                        android:id="@+id/iv_yhk"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/shopping_unselected"/>
+                        android:padding="5dp"
+                        android:visibility="invisible"
+                        android:src="@mipmap/shopping_unselected" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -202,58 +289,62 @@
             <TextView
                 android:id="@+id/tv_immediate_withdrawal"
                 android:layout_width="match_parent"
-                android:layout_marginTop="25dp"
                 android:layout_height="44dp"
                 android:layout_marginLeft="16dp"
+                android:layout_marginTop="25dp"
                 android:layout_marginRight="16dp"
-                android:textColor="@color/white"
+                android:background="@drawable/selector_button_immediate_withdrawal"
+                android:enabled="false"
                 android:gravity="center"
-                android:textSize="16sp"
                 android:text="@string/immediate_withdrawal"
-                android:enabled="false"
-                android:background="@drawable/selector_button_immediate_withdrawal"/>
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+
             <LinearLayout
                 android:id="@+id/ll_layout_shuoming"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_marginBottom="20dp"
-                >
+                android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="25dp"
+                    android:text="详细说明"
                     android:textColor="@color/gray_999999"
-                    android:text="详细说明"/>
+                    android:textSize="15sp" />
+
                 <TextView
                     android:id="@+id/tv_service"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="15dp"
+                    android:text="平台服务费 ¥"
                     android:textColor="@color/gray_999999"
-                    android:text="平台服务费 ¥"/>
+                    android:textSize="15sp" />
+
                 <TextView
                     android:id="@+id/tv_service_money"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="15dp"
+                    android:text="本次提取将扣除服务费 ¥"
                     android:textColor="@color/gray_999999"
-                    android:text="本次提取将扣除服务费 ¥"/>
+                    android:textSize="15sp" />
+
                 <TextView
                     android:id="@+id/tv_money"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="15dp"
+                    android:text="本次提取实际到账额度 ¥"
                     android:textColor="@color/gray_999999"
-                    android:text="本次提取实际到账额度 ¥"/>
+                    android:textSize="15sp" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/activity_pay.xml

@@ -108,7 +108,9 @@
             android:gravity="center_vertical"
             android:layout_marginRight="13dp"
             android:layout_marginLeft="13dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone"
+            >
 
             <ImageView
                 android:layout_width="wrap_content"

app/src/main/res/values/colors.xml

@@ -53,6 +53,7 @@
     <color name="gray_f5f5f5">#f5f5f5</color>
     <color name="yellow_f4d9ab">#F4D9AB</color>
     <color name="yellow_ffa802">#FFA802</color>
+    <color name="black_808080">#808080</color>
     <color name="yellow_ffdd99">#FFDD99</color>
     <color name="yellow_ffedc6">#FFEDC6</color>
     <color name="yellow_ffede5">#ffede5</color>

app/src/main/res/values/strings.xml

@@ -327,6 +327,7 @@
     <!--    分享-->
     <string name="sharein">分享到</string>
     <string name="wechat">微信</string>
+    <string name="yhk">银行卡</string>
     <string name="circlefriends">朋友圈</string>
     <string name="copylink">复制链接</string>
     <!--    附近-->
@@ -422,4 +423,5 @@
     <string name="jpdc">精品大仓</string>
     <string name="jpsc">精品商城</string>
     <string name="dslm">鼎盛联盟</string>
+    <string name="bank_card_hint">请输入银行卡号（仅支持储蓄卡）</string>
 </resources>