2024-2-28 代码备份

银行卡提现功能开发完成

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

@@ -28,11 +28,14 @@ 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.apply_channel.model.UserInvitationCodeBean;
 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;
 import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel;
+import com.yihucha.hbyhc.presentation.login.LoginActivity;
+import com.yihucha.hbyhc.presentation.login.view_model.LoginViewModel;
 import com.yihucha.hbyhc.presentation.mine.model.BindingStateBean;
 import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
@@ -42,9 +45,11 @@ import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
+import com.yihucha.hbyhc.utils.MVUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;
 import com.yihucha.hbyhc.view.MyToast;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.yihucha.hbyhc.view.SmsCodeDialog;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -60,7 +65,7 @@ import java.util.Map;
  * @date 2022/8/2
  * note:立即提现
  */
-public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<ActivityImmediateWithdrawalBinding> implements View.OnClickListener {
+public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<ActivityImmediateWithdrawalBinding> implements View.OnClickListener, SmsCodeDialog.DialogCallBack {
     private InviteViewModel mInviteViewModel;
     private String is_certification;//是否实名认证:1是
     private String mBrokeragePrice;//可提现
@@ -77,6 +82,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     private BindingStateBViewModel mBindingStateBViewModel;
     private MineViewModel mineViewModel;
     private MineSpreadInfo mineSpreadInfo;//用户信息数据
+    private SmsCodeDialog smsCodeDialog;
     @SuppressLint("HandlerLeak")
     private Handler mHandler = new Handler() {
         @SuppressWarnings("unused")
@@ -126,7 +132,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
             }
         }
     };
-
+    private LoginViewModel loginViewModel;
 
 
     @Override
@@ -134,6 +140,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         super.onCreate(savedInstanceState);
         mInviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class);
         mineViewModel = new ViewModelProvider(this).get(MineViewModel.class);
+        loginViewModel = new ViewModelProvider(this).get(LoginViewModel.class);
         mBindingStateBViewModel = new ViewModelProvider(this).get(BindingStateBViewModel.class);
         Bundle data = getIntent().getBundleExtra("data");
         //保持提现页面一致，暂时隐藏该部分
@@ -147,9 +154,12 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
 
     @SuppressLint("SetTextI18n")
     private void initData() {
+        String phone = MVUtils.getString(Constants.PHONE);
+        smsCodeDialog = new SmsCodeDialog(ImmediateWithdrawalActivity.this,
+                phone, this);
+        loginViewModel.mPhone.postValue(phone);
         //佣金信息
-        mInviteViewModel.getSpreadInfo();
-        mInviteViewModel.mSpreadInfoData.observe(this, spreadInfoBean -> {
+       /* mInviteViewModel.mSpreadInfoData.observe(this, spreadInfoBean -> {
             mBrokeragePrice = spreadInfoBean.getBrokerage_price();
             mViewBinding.tvBrokeragePrice.setText("可用余额:¥" + mBrokeragePrice);
             mMemberBrokeragePrice = spreadInfoBean.getMember_brokerage_price();
@@ -166,7 +176,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
             } catch (Exception e) {
 
             }
-        });
+        });*/
         mBindingStateBViewModel.getBindingState();
 //        mInviteViewModel.getBandAccountInfo(type, "");
         mBindingStateBViewModel.mBindingStateBean.observe(this, bindingStateBeans -> {
@@ -240,18 +250,15 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         });
         //支付宝授权链接
         mInviteViewModel.mAuthInfoSucceed.observe(this, s -> {
-            Runnable authRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    // 构造AuthTask 对象
-                    AuthTask authTask = new AuthTask(ImmediateWithdrawalActivity.this);
-                    // 调用授权接口，获取授权结果
-                    Map<String, String> result = authTask.authV2(s, true);
-                    Message msg = new Message();
-                    msg.what = SDK_AUTH_FLAG;
-                    msg.obj = result;
-                    mHandler.sendMessage(msg);
-                }
+            Runnable authRunnable = () -> {
+                // 构造AuthTask 对象
+                AuthTask authTask = new AuthTask(ImmediateWithdrawalActivity.this);
+                // 调用授权接口，获取授权结果
+                Map<String, String> result = authTask.authV2(s, true);
+                Message msg = new Message();
+                msg.what = SDK_AUTH_FLAG;
+                msg.obj = result;
+                mHandler.sendMessage(msg);
             };
 
             // 必须异步调用
@@ -280,8 +287,25 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         });
 
         mineViewModel.getSpreadInfoYhc();
-        mineViewModel.spreadInfo.observe(this,mineSpreadInfo -> {
+        mineViewModel.spreadInfo.observe(this, mineSpreadInfo -> {
             this.mineSpreadInfo = mineSpreadInfo;
+            mMemberBrokeragePrice = mBrokeragePrice = mineSpreadInfo.getCurrentBalance();
+            mViewBinding.tvRedIntegral.setText("可提现金额:" + mMemberBrokeragePrice);
+            mViewBinding.tvRedIntegral.setVisibility(View.VISIBLE);
+            mViewBinding.tvIntegral.setVisibility(View.GONE);
+            mViewBinding.tvBrokeragePrice.setVisibility(View.GONE);
+            try {
+                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);
+                        toast.show();
+                    }
+                    isShow = true;
+                }
+            } catch (Exception e) {
+
+            }
         });
 
         mInviteViewModel.failed.observe(this, s -> ToastUtils.showLong(s));
@@ -370,7 +394,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 mViewBinding.etCashWithdrawalAmount.setText(mBrokeragePrice);
             }
         } else if (v == mViewBinding.tvImmediateWithdrawal) {
-            if ("0".equals(mineSpreadInfo.getIdentity())){
+            if ("0".equals(mineSpreadInfo.getIdentity())) {
                 ToastUtils.showLong("需要您升级为合伙人");
                 return;
             }
@@ -428,9 +452,14 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 RealNameAuthenticationActivity.launch(context);
                 return;
             }
-            //TODO 这里如果是银行卡提现，需要弹窗获取验证码，然后输入验证码后进行提现此操作
-            //立即提现
-            mInviteViewModel.getApplicationWithdrawal(mViewBinding.etCashWithdrawalAmount.getText().toString(), type, isRed);
+            if ("1".equals(type)) {
+                //立即提现
+                mInviteViewModel.getApplicationWithdrawal(mViewBinding.etCashWithdrawalAmount.getText().toString(), type, isRed);
+            } else {
+//                loginViewModel.getCode(ImmediateWithdrawalActivity.this);
+                smsCodeDialog.show();
+            }
+
         } else if (v == mViewBinding.llWx) {
             //微信
             type = "1";
@@ -520,4 +549,16 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
+    @Override
+    public void onConfirm(String code) {
+        //验证码确认
+        mInviteViewModel.getApplicationWithdrawal(mViewBinding.etCashWithdrawalAmount.getText().toString(), type, code);
+    }
+
+    @Override
+    public void onReGetCode() {
+        //重新获取验证码
+        loginViewModel.getCode(ImmediateWithdrawalActivity.this);
+    }
 }

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

@@ -520,13 +520,23 @@ public class InviteViewModel extends BaseViewModel {
      * @param extract_price
      * @param extract_type
      */
-    @SuppressLint("CheckResult")
+    //微信提现
     public void getApplicationWithdrawal(String extract_price, String extract_type, boolean isRed) {
+        getApplicationWithdrawal(extract_price,extract_type,isRed,null);
+    }
+    //银行卡提现
+    public void getApplicationWithdrawal(String extract_price, String extract_type, String sms_code) {
+        getApplicationWithdrawal(extract_price,extract_type,false,sms_code);
+    }
+    @SuppressLint("CheckResult")
+    public void getApplicationWithdrawal(String extract_price, String extract_type, boolean isRed,String sms_code) {
         Map<String, Object> map = new HashMap<>();
         map.put("extract_price", extract_price);
         map.put("extract_type", extract_type);
         if (isRed)
             map.put("type", 2);
+        if (EmptyCheckUtils.isNotEmpty(sms_code))
+            map.put("sms_code",sms_code);
         UserService userService = NetworkApi.createService(UserService.class);
         userService.getApplicationWithdrawal(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyCommissionActivity.kt

@@ -44,15 +44,6 @@ class MyCommissionActivity :
     }
 
     private fun initData() {
-        /* TODO 不确定该接口是否还有用
-        mInviteViewModel.getAgentInfo()
-        mInviteViewModel.mInvitePHPBean.observe(this) {
-
-        }
-        mInviteViewModel.failed.observe(this) {
-            ToastUtils.showLong(it)
-        }
-        */
         mInviteViewModel.getYanglaojinInfo()
         mInviteViewModel.userAnnuityInfoBeanMutableLiveData.observe(
             this

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

@@ -10,7 +10,7 @@ import java.lang.ref.WeakReference;
  * 倒计时
  */
 public class CountDownTimeUtil {
-
+    private int tvColor = Color.parseColor("#9E9E9E");
     private WeakReference<TextView> tvCodeWr;//控件软引用，防止内存泄漏
 
     private CountDownTimer timer;
@@ -22,7 +22,9 @@ public class CountDownTimeUtil {
         super();
         this.tvCodeWr = new WeakReference(textView);
     }
-
+    public void setTvColor(int color){
+        tvColor = color;
+    }
     public void runTimer() {
         //倒计时的总时长   每次的间隔时间   单位都是毫秒
         timer = new CountDownTimer(times, 1000) {
@@ -35,7 +37,7 @@ public class CountDownTimeUtil {
                 if (tvCodeWr.get() != null) {
                     tvCodeWr.get().setClickable(true);
                     tvCodeWr.get().setText("重新获取");
-                    tvCodeWr.get().setTextColor(Color.parseColor("#9E9E9E"));
+                    tvCodeWr.get().setTextColor(tvColor);
                 }
                 cancel();
             }
@@ -50,7 +52,7 @@ public class CountDownTimeUtil {
                 if (tvCodeWr.get() != null) {
                     tvCodeWr.get().setClickable(false);
                     tvCodeWr.get().setText("重新发送("+millisUntilFinished / 1000+")");
-                    tvCodeWr.get().setTextColor(Color.parseColor("#9E9E9E"));
+                    tvCodeWr.get().setTextColor(tvColor);
                 }
             }
         }.start();

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

@@ -626,12 +626,7 @@ public class CustomDialog {
         }
         TextView areaView = lDialog.getView(R.id.tv_content_area);
         areaView.setText(area);
-        lDialog.getView(R.id.imgv_close).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                lDialog.dismiss();
-            }
-        });
+        lDialog.getView(R.id.imgv_close).setOnClickListener(v -> lDialog.dismiss());
         lDialog.show();
     }
 
@@ -643,4 +638,7 @@ public class CustomDialog {
         lDialog.getView(R.id.tv_dialog_iknow).setOnClickListener(v -> lDialog.dismiss());
         lDialog.show();
     }
+
+
+
 }

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

@@ -0,0 +1,78 @@
+package com.yihucha.hbyhc.view;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Color;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.liys.dialoglib.LDialog;
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.utils.CountDownTimeUtil;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+import com.yihucha.hbyhc.utils.StringUtils;
+import com.yihucha.hbyhc.utils.StringsUtil;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/29 9:51
+ * com.yihucha.hbyhc.view
+ * 提现获取验证码代理类
+ */
+public class SmsCodeDialog {
+    private CountDownTimeUtil mCountDownTimeUtil = null;
+    private TextView tvCode;
+    private Context context;
+    private LDialog lDialog;
+
+    @SuppressLint("SetTextI18n")
+    public SmsCodeDialog(Context context, String phone, DialogCallBack dialogCallBack) {
+        this.context = context;
+        lDialog = LDialog.newInstance(context, R.layout.dialog_smscode_tixian);
+        EditText editText = lDialog.getView(R.id.et_code);
+        tvCode = lDialog.getView(R.id.tv_code);
+        TextView textView = lDialog.getView(R.id.tv_phone_smscode);
+        textView.setText("已给" + StringUtils.resetPhone(phone) + "发送验证码");
+        lDialog.getView(R.id.confirm_negative).setOnClickListener(v -> {
+            lDialog.dismiss();
+            mCountDownTimeUtil.cancel();
+        });
+        lDialog.getView(R.id.confirm_positive).setOnClickListener(v -> {
+            if (EmptyCheckUtils.isNotEmpty(dialogCallBack)) {
+                dialogCallBack.onConfirm(editText.getText().toString());
+                lDialog.dismiss();
+                mCountDownTimeUtil.cancel();
+            }
+        });
+        lDialog.getView(R.id.tv_code).setOnClickListener(v -> {
+            if (EmptyCheckUtils.isNotEmpty(dialogCallBack))
+                dialogCallBack.onReGetCode();
+            mCountDownTimeUtil.runTimer();
+        });
+        mCountDownTimeUtil = new CountDownTimeUtil(tvCode);
+        mCountDownTimeUtil.setTvColor(Color.WHITE);
+    }
+
+    public void show() {
+        if (EmptyCheckUtils.isNotEmpty(lDialog)) {
+            mCountDownTimeUtil.runTimer();
+            lDialog.show();
+        }
+
+    }
+
+    public void cancle() {
+        mCountDownTimeUtil.cancel();
+        if (EmptyCheckUtils.isNotEmpty(lDialog)) {
+            lDialog.dismiss();
+        }
+    }
+
+    public interface DialogCallBack {
+        void onConfirm(String code);
+
+        void onReGetCode();
+    }
+
+}

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

@@ -6,11 +6,11 @@
     android:orientation="vertical">
 
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_withdrawal_record"
-            android:layout_width="match_parent"
-            android:background="@color/white"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="13dp" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_withdrawal_record"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13dp"
+        android:background="@color/white" />
 
 </LinearLayout>

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="280dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/shape_white_8dp"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="请输入验证码"
+        android:textColor="@color/black_333333"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/tv_phone_smscode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:text="已给188****3333发送验证码"
+        android:textColor="@color/black_333333"
+        android:textSize="14sp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/et_code"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="5dp"
+            android:background="@null"
+            android:hint="@string/input_code"
+            android:maxLength="11"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_code"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/shape_fe0032_50dp"
+            android:paddingLeft="8dp"
+            android:paddingTop="4dp"
+            android:paddingRight="8dp"
+            android:paddingBottom="4dp"
+            android:text="@string/get_code"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="10dp"
+        android:alpha="0.5"
+        android:background="@color/gray_999999" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/confirm_negative"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="@color/black_333333"
+            android:textSize="18sp" />
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="0.5dp"
+            android:layout_height="match_parent"
+            android:background="@color/gray_e5e5e5" />
+
+        <com.yihucha.hbyhc.view.BoldText
+            android:id="@+id/confirm_positive"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="@color/red_fe0032"
+            android:textSize="18sp" />
+    </LinearLayout>
+</LinearLayout>