2024-2-28 代码备份

手机号验证码登录页面绑定邀请人功能完成
提现页面接口调整部分完成

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

@@ -4,6 +4,7 @@ import com.yihucha.hbyhc.network.BaseResponse;
 import com.yihucha.hbyhc.network.DataJavaResponse;
 import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.presentation.login.model.LoginModel;
+import com.yihucha.hbyhc.presentation.login.model.UidAndPhoneBean;
 import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.WechatOpenIdBean;
 
@@ -12,6 +13,7 @@ import java.util.Map;
 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 
 /**
@@ -95,6 +97,12 @@ public interface AuthService {
      */
     @POST("api/user/updateAccount")
     Observable<DataResponse> getUpdateAccount(@QueryMap Map<String, Object> request);
+
+    /**
+     *
+     */
+    @POST("api/auth/query_uid")
+    Observable<DataResponse<UidAndPhoneBean>> getUidByPhone(@Query("phone")String phone);
 }
 
 

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

@@ -44,7 +44,9 @@ class AddBankCardActivity : ViewBindingTitleBaseActivity<ActivityAddBankCardBind
     }
 
     private fun initView() {
-        bankCardBean = intent.getSerializableExtra("beans") as BankCardBean
+        intent.getSerializableExtra("beans")?.apply {
+            bankCardBean = this as BankCardBean
+        }
         mViewBinding.apply {
             EditTextListener.onTextListener(edtUserName) {
                 userNameEmpty = it

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

@@ -38,6 +38,8 @@ 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.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.StringsUtil;
@@ -73,6 +75,8 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     private boolean isRed = false;
     private volatile boolean isShow = false;
     private BindingStateBViewModel mBindingStateBViewModel;
+    private MineViewModel mineViewModel;
+    private MineSpreadInfo mineSpreadInfo;//用户信息数据
     @SuppressLint("HandlerLeak")
     private Handler mHandler = new Handler() {
         @SuppressWarnings("unused")
@@ -124,10 +128,12 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     };
 
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mInviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class);
+        mineViewModel = new ViewModelProvider(this).get(MineViewModel.class);
         mBindingStateBViewModel = new ViewModelProvider(this).get(BindingStateBViewModel.class);
         Bundle data = getIntent().getBundleExtra("data");
         //保持提现页面一致，暂时隐藏该部分
@@ -143,70 +149,61 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
     private void initData() {
         //佣金信息
         mInviteViewModel.getSpreadInfo();
-        mInviteViewModel.mSpreadInfoData.observe(this, new Observer<SpreadInfoBean>() {
-            @Override
-            public void onChanged(SpreadInfoBean spreadInfoBean) {
-                mBrokeragePrice = spreadInfoBean.getBrokerage_price();
-                mViewBinding.tvBrokeragePrice.setText("可用余额:¥" + mBrokeragePrice);
-                mMemberBrokeragePrice = spreadInfoBean.getMember_brokerage_price();
-                mViewBinding.tvRedIntegral.setText("可提现金额:" + mMemberBrokeragePrice);
-                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;
+        mInviteViewModel.mSpreadInfoData.observe(this, spreadInfoBean -> {
+            mBrokeragePrice = spreadInfoBean.getBrokerage_price();
+            mViewBinding.tvBrokeragePrice.setText("可用余额:¥" + mBrokeragePrice);
+            mMemberBrokeragePrice = spreadInfoBean.getMember_brokerage_price();
+            mViewBinding.tvRedIntegral.setText("可提现金额:" + mMemberBrokeragePrice);
+            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();
                     }
-                } catch (Exception e) {
-
+                    isShow = true;
                 }
+            } catch (Exception e) {
+
             }
         });
         mBindingStateBViewModel.getBindingState();
 //        mInviteViewModel.getBandAccountInfo(type, "");
-        mBindingStateBViewModel.mBindingStateBean.observe(this, new Observer<List<BindingStateBean>>() {
-            @Override
-            public void onChanged(List<BindingStateBean> bindingStateBeans) {
-                for (int i = 0; i < bindingStateBeans.size(); i++) {
-                    if (bindingStateBeans.get(i).getType().equals("1")) {
-                        type = "1";
-                        mViewBinding.tvClickToAccredit.setText("已授权，点击可修改");
+        mBindingStateBViewModel.mBindingStateBean.observe(this, bindingStateBeans -> {
+            for (int i = 0; i < bindingStateBeans.size(); i++) {
+                if (bindingStateBeans.get(i).getType().equals("1")) {
+                    type = "1";
+                    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";
+                } else if (bindingStateBeans.get(i).getType().equals("2")) {
+                    type = "2";
 //                        mViewBinding.ivZfb.setImageResource(R.mipmap.shopping_selected);
 //                        mViewBinding.ivWx.setImageResource(R.mipmap.shopping_unselected);
-                        break;
-                    }
+                    break;
                 }
             }
         });
         //提现配置
         mInviteViewModel.getConfig();
-        mInviteViewModel.mWithdrawalConfigurationData.observe(this, new Observer<WithdrawalConfigurationBean>() {
-            @Override
-            public void onChanged(WithdrawalConfigurationBean withdrawalConfigurationBean) {
-                mWithdrawal_money = withdrawalConfigurationBean.getWithdrawal_money();
-                mWithdrawal_alipay = withdrawalConfigurationBean.getWithdrawal_alipay();
-                mWithdrawal_wchat = withdrawalConfigurationBean.getWithdrawal_wchat();
-                mWithdrawal_status = withdrawalConfigurationBean.getWithdrawal_status();
-                try {
-                    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);
-                            toast.show();
-                        }
-                        isShow = true;
+        mInviteViewModel.mWithdrawalConfigurationData.observe(this, withdrawalConfigurationBean -> {
+            mWithdrawal_money = withdrawalConfigurationBean.getWithdrawal_money();
+            mWithdrawal_alipay = withdrawalConfigurationBean.getWithdrawal_alipay();
+            mWithdrawal_wchat = withdrawalConfigurationBean.getWithdrawal_wchat();
+            mWithdrawal_status = withdrawalConfigurationBean.getWithdrawal_status();
+            try {
+                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);
+                        toast.show();
                     }
-                } catch (Exception e) {
-
+                    isShow = true;
                 }
+            } catch (Exception e) {
 
             }
+
         });
         //提现检测是否绑定提交账户接口数据
         mInviteViewModel.mBandAccountInfoSucceed.observe(this, s -> {
@@ -236,58 +233,39 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
         });
         mInviteViewModel.getWithdrawalService("0");
         //提现服务费计算
-        mInviteViewModel.mWithdrawalServiceData.observe(this, new Observer<WithdrawalServiceBean>() {
-            @Override
-            public void onChanged(WithdrawalServiceBean withdrawalServiceBean) {
-                mViewBinding.tvService.setText("平台服务费 ¥" + withdrawalServiceBean.getService());
-                mViewBinding.tvServiceMoney.setText("本次提取将扣除服务费 ¥" + withdrawalServiceBean.getService_money());
-                mViewBinding.tvMoney.setText("本次提取实际到账额度 ¥" + withdrawalServiceBean.getMoney());
-            }
+        mInviteViewModel.mWithdrawalServiceData.observe(this, withdrawalServiceBean -> {
+            mViewBinding.tvService.setText("平台服务费 ¥" + withdrawalServiceBean.getService());
+            mViewBinding.tvServiceMoney.setText("本次提取将扣除服务费 ¥" + withdrawalServiceBean.getService_money());
+            mViewBinding.tvMoney.setText("本次提取实际到账额度 ¥" + withdrawalServiceBean.getMoney());
         });
         //支付宝授权链接
-        mInviteViewModel.mAuthInfoSucceed.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String 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);
-                    }
-                };
+        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);
+                }
+            };
 
-                // 必须异步调用
-                Thread authThread = new Thread(authRunnable);
-                authThread.start();
-            }
-        });
-        mInviteViewModel.mUpdateAccountData.observe(this, new Observer<UpdateAccountBean>() {
-            @Override
-            public void onChanged(UpdateAccountBean updateAccountBean) {
-                mInviteViewModel.getBandAccountInfo(type, "");
-            }
+            // 必须异步调用
+            Thread authThread = new Thread(authRunnable);
+            authThread.start();
         });
+        mInviteViewModel.mUpdateAccountData.observe(this, updateAccountBean -> mInviteViewModel.getBandAccountInfo(type, ""));
         //养老金信息
-        mInviteViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, new Observer<UserAnnuityInfoBean>() {
-            @Override
-            public void onChanged(UserAnnuityInfoBean userAnnuityInfoBean) {
-                is_certification = userAnnuityInfoBean.getIs_certification();
-            }
-        });
+        mInviteViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, userAnnuityInfoBean -> is_certification = userAnnuityInfoBean.getIs_certification());
 
-        mInviteViewModel.mApplicationWithdrawal.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                ToastUtils.showLong(s);
-                //提现成功
-                WithdrawalRecordActivity.launch(context);
-            }
+        mInviteViewModel.mApplicationWithdrawal.observe(this, s -> {
+            ToastUtils.showLong(s);
+            //提现成功
+            WithdrawalRecordActivity.launch(context);
         });
         mInviteViewModel.bankCardList.observe(this, bankCardBeans -> {
             if (EmptyCheckUtils.isEmpty(bankCardBeans)) {
@@ -300,6 +278,12 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 mViewBinding.tvClickToSelectCard.setText("点击可修改银行卡信息");
             }
         });
+
+        mineViewModel.getSpreadInfoYhc();
+        mineViewModel.spreadInfo.observe(this,mineSpreadInfo -> {
+            this.mineSpreadInfo = mineSpreadInfo;
+        });
+
         mInviteViewModel.failed.observe(this, s -> ToastUtils.showLong(s));
 
 
@@ -386,6 +370,10 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 mViewBinding.etCashWithdrawalAmount.setText(mBrokeragePrice);
             }
         } else if (v == mViewBinding.tvImmediateWithdrawal) {
+            if ("0".equals(mineSpreadInfo.getIdentity())){
+                ToastUtils.showLong("需要您升级为合伙人");
+                return;
+            }
             if ("0".equals(mWithdrawal_status)) {
                 ToastUtils.showLong("提现功能关闭");
                 return;
@@ -407,7 +395,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 return;
             }
             if (type.equals("")) {
-                ToastUtils.showLong("选择提现方式");
+                ToastUtils.showLong("请先勾选提现方式");
                 return;
             }
             double tixian = Double.parseDouble(mViewBinding.etCashWithdrawalAmount.getText().toString());
@@ -440,7 +428,7 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
                 RealNameAuthenticationActivity.launch(context);
                 return;
             }
-
+            //TODO 这里如果是银行卡提现，需要弹窗获取验证码，然后输入验证码后进行提现此操作
             //立即提现
             mInviteViewModel.getApplicationWithdrawal(mViewBinding.etCashWithdrawalAmount.getText().toString(), type, isRed);
         } else if (v == mViewBinding.llWx) {
@@ -470,11 +458,6 @@ public class ImmediateWithdrawalActivity extends ViewBindingTitleBaseActivity<Ac
             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);

app/src/main/java/com/yihucha/hbyhc/presentation/login/LoginActivity.java

@@ -15,6 +15,7 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 
+import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ActivityStack;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
@@ -36,7 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPhoneBinding> implements View.OnClickListener {
-    private static final String INTENT_OPEN_ID="intentOpenId";
+    private static final String INTENT_OPEN_ID = "intentOpenId";
     LoginViewModel loginViewModel;
     private CountDownTimeUtil mCountDownTimeUtil;
 
@@ -44,17 +45,18 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
     private String mPhone;//手机号
 
     private LoginModel loginModel;
-    private  String mOpenId;//微信code
+    private String mOpenId;//微信code
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 //        setContentView(R.layout.activity_login_phone);
-         mOpenId=getIntent().getStringExtra(INTENT_OPEN_ID);
+        mOpenId = getIntent().getStringExtra(INTENT_OPEN_ID);
         //绑定
-        loginViewModel=new ViewModelProvider(this).get(LoginViewModel.class);
-         initView();
-         initClick();
-         initData();
+        loginViewModel = new ViewModelProvider(this).get(LoginViewModel.class);
+        initView();
+        initClick();
+        initData();
     }
 
     private void initClick() {
@@ -69,51 +71,45 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
     }
 
     private void initData() {
-      inputMonitor();
-      loginViewModel.verify.observe(this, new Observer<BaseResponse>() {
-          @Override
-          public void onChanged(BaseResponse baseResponse) {
+        inputMonitor();
+        loginViewModel.verify.observe(this, baseResponse -> {
 
-          }
-      });
-      loginViewModel.mPhone.observe(this, new Observer<String>() {
-          @Override
-          public void onChanged(String s) {
-              Log.v("qmzz",s);
-              mPhone=s;
-              //没有点击协议或者手机号密码为空
-                if (!mViewBinding.cbSelector.isSelected()|| TextUtils.isEmpty(mPhone)||TextUtils.isEmpty(mCode)){
-                    mViewBinding.tvLogin.setEnabled(false);
-                    mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.black_333333));
-                }else {
-                    mViewBinding.tvLogin.setEnabled(true);
-                    mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.white));
-                }
-          }
-      });
+        });
+        loginViewModel.mPhone.observe(this, s -> {
+            Log.v("qmzz", s);
+            mPhone = s;
+            //没有点击协议或者手机号密码为空
+            if (!mViewBinding.cbSelector.isSelected() || TextUtils.isEmpty(mPhone) || TextUtils.isEmpty(mCode)) {
+                mViewBinding.tvLogin.setEnabled(false);
+                mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.black_333333));
+            } else {
+                mViewBinding.tvLogin.setEnabled(true);
+                mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.white));
+            }
+        });
         loginViewModel.mPwd.observe(LoginActivity.this, new Observer<String>() {
             @Override
             public void onChanged(String s) {
-                Log.v("qmzz",s);
-                mCode=s;
+                Log.v("qmzz", s);
+                mCode = s;
                 //没有点击协议或者手机号密码为空
-                if (!mViewBinding.cbSelector.isSelected()|| TextUtils.isEmpty(mPhone)||TextUtils.isEmpty(mCode)){
+                if (!mViewBinding.cbSelector.isSelected() || TextUtils.isEmpty(mPhone) || TextUtils.isEmpty(mCode)) {
                     mViewBinding.tvLogin.setEnabled(false);
                     mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.black_333333));
-                }else {
+                } else {
                     mViewBinding.tvLogin.setEnabled(true);
                     mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.white));
                 }
             }
         });
         loginViewModel.loginModel.observe(LoginActivity.this, loginModelDataResponse -> {
-            loginModel=  loginModelDataResponse.getData();
+            loginModel = loginModelDataResponse.getData();
             //保存token
-            MVUtils.put(Constants.TOKEN,loginModel.getToken());
-            MVUtils.put(Constants.PHONE,loginModel.getUser().getPhone());
-            MVUtils.put(Constants.USER_ID,loginModel.getUser().getUid());
-            MVUtils.put(Constants.AVATAR,loginModel.getUser().getAvatar());
-            MVUtils.put(Constants.NICK_NAME,loginModel.getUser().getNickname());
+            MVUtils.put(Constants.TOKEN, loginModel.getToken());
+            MVUtils.put(Constants.PHONE, loginModel.getUser().getPhone());
+            MVUtils.put(Constants.USER_ID, loginModel.getUser().getUid());
+            MVUtils.put(Constants.AVATAR, loginModel.getUser().getAvatar());
+            MVUtils.put(Constants.NICK_NAME, loginModel.getUser().getNickname());
 
 //                MainActivity.launch(LoginActivity.this);
 
@@ -122,16 +118,27 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
             ActivityStack.getScreenManager().finishArrayActivity(activityList);
             finish();
         });
-        loginViewModel.failed.observe(LoginActivity.this,msg->{
+        //查询到邀请人的UID后，继续登录操作
+        loginViewModel.uidAndPhoneBean.observe(this, uidAndPhoneBean -> {
+            if (TextUtils.isEmpty(mOpenId)) {
+                loginViewModel.getLogin(LoginActivity.this, mCode, uidAndPhoneBean.getUid());
+            } else {
+                //微信绑定手机号
+                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId, uidAndPhoneBean.getUid());
+            }
+        });
+        loginViewModel.failed.observe(LoginActivity.this, msg -> {
             //如果返回了400 表示需要填写邀请人信息，弹窗进行绑定
-            if ("400".equals(msg)){
-                CustomDialog.getEnterCodeWithTitle(this,"请输入邀请人手机号",phone->{
+            if ("400".equals(msg)) {
+                CustomDialog.getEnterCodeWithTitle(this, "请输入邀请人手机号", phone -> {
                     if (!StringUtils.isPhone(phone)) {
                         Toast.makeText(context, "手机号码格式输入错误", Toast.LENGTH_SHORT).show();
                         return;
                     }
-                    //TODO 下面做绑定手机号流程，暂时不做处理
+                    loginViewModel.getUidByPhone(phone);
                 });
+            } else {
+                ToastUtils.showShort(msg);
             }
         });
     }
@@ -145,18 +152,20 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
      * 输入监听
      */
     private void inputMonitor() {
-             //手机号输入监听
-            mViewBinding.etPhone.addTextChangedListener(new TextWatcher() {
+        //手机号输入监听
+        mViewBinding.etPhone.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-              //  loginViewModel.mPhone.postValue(mViewBinding.etPwd.getText().toString().trim());
+                //  loginViewModel.mPhone.postValue(mViewBinding.etPwd.getText().toString().trim());
 
             }
+
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                 //loginViewModel.mPhone.postValue(mViewBinding.etPwd.getText().toString().trim());
 
             }
+
             @Override
             public void afterTextChanged(Editable editable) {
                 loginViewModel.mPhone.postValue(mViewBinding.etPhone.getText().toString().trim());
@@ -166,12 +175,14 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         mViewBinding.etPwd.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-               // loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
+                // loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
             }
+
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-               // loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
+                // loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
             }
+
             @Override
             public void afterTextChanged(Editable editable) {
                 loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
@@ -182,21 +193,21 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
     @Override
     public void onClick(View v) {
         super.onClick(v);
-        if (v == mViewBinding.cbSelector){
+        if (v == mViewBinding.cbSelector) {
             //协议按钮
-            if (mViewBinding.cbSelector.isSelected()){
+            if (mViewBinding.cbSelector.isSelected()) {
                 mViewBinding.cbSelector.setSelected(false);
-            }else {
+            } else {
                 mViewBinding.cbSelector.setSelected(true);
             }
-            if (!mViewBinding.cbSelector.isSelected()|| TextUtils.isEmpty(mPhone)||TextUtils.isEmpty(mCode)){
+            if (!mViewBinding.cbSelector.isSelected() || TextUtils.isEmpty(mPhone) || TextUtils.isEmpty(mCode)) {
                 mViewBinding.tvLogin.setEnabled(false);
                 mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.black_333333));
-            }else {
+            } else {
                 mViewBinding.tvLogin.setEnabled(true);
                 mViewBinding.tvLogin.setTextColor(ContextCompat.getColor(LoginActivity.this, R.color.white));
             }
-        }else if (v == mViewBinding.tvCode) {
+        } else if (v == mViewBinding.tvCode) {
             //获取验证码
             if (TextUtils.isEmpty(mPhone)) {
                 MyToast.makeText(LoginActivity.this, "请输入手机号", Toast.LENGTH_LONG).show();
@@ -209,34 +220,34 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
             loginViewModel.getCode(LoginActivity.this);
             mCountDownTimeUtil = new CountDownTimeUtil(mViewBinding.tvCode);
             mCountDownTimeUtil.runTimer();
-        }else if (v == mViewBinding.tvLogin) {
+        } else if (v == mViewBinding.tvLogin) {
             //请求接口
             if (TextUtils.isEmpty(mPhone)) {
                 MyToast.makeText(LoginActivity.this, "请输入手机号", Toast.LENGTH_LONG).show();
                 return;
             }
-            if (TextUtils.isEmpty(mCode)){
+            if (TextUtils.isEmpty(mCode)) {
                 MyToast.makeText(LoginActivity.this, "请输入验证码", Toast.LENGTH_LONG).show();
                 return;
             }
-            if (!mViewBinding.cbSelector.isSelected()){
+            if (!mViewBinding.cbSelector.isSelected()) {
                 MyToast.makeText(LoginActivity.this, "请点击同意协议", Toast.LENGTH_LONG).show();
                 return;
             }
-            if (TextUtils.isEmpty(mOpenId)){
-                loginViewModel.getLogin(LoginActivity.this,mCode);
-            }else {
+            if (TextUtils.isEmpty(mOpenId)) {
+                loginViewModel.getLogin(LoginActivity.this, mCode);
+            } else {
                 //微信绑定手机号
-                loginViewModel.getWxBinding(LoginActivity.this,mCode,mOpenId);
+                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId);
             }
 
-        }else if (v == mViewBinding.tvRegistrationProtocol){
+        } else if (v == mViewBinding.tvRegistrationProtocol) {
             //注册协议
-            WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.registration_protocol),
+            WebViewTitleBaseActivity.launch(LoginActivity.this, getString(R.string.registration_protocol),
                     Constants.PROTOCOL_YHC_REGIST);
-        }else if (v ==  mViewBinding.tvPrivacyAgreement){
+        } else if (v == mViewBinding.tvPrivacyAgreement) {
             //隐私协议
-            WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.privacy_agreement),
+            WebViewTitleBaseActivity.launch(LoginActivity.this, getString(R.string.privacy_agreement),
                     Constants.PROTOCOL_YHC_YINSI);
         }
     }
@@ -253,9 +264,10 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         Intent intent = new Intent(context, LoginActivity.class);
         context.startActivity(intent);
     }
-    public static void launch(Context context,String openId) {
+
+    public static void launch(Context context, String openId) {
         Intent intent = new Intent(context, LoginActivity.class);
-        intent.putExtra(INTENT_OPEN_ID,openId);
+        intent.putExtra(INTENT_OPEN_ID, openId);
         context.startActivity(intent);
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/login/model/UidAndPhoneBean.java

@@ -0,0 +1,27 @@
+package com.yihucha.hbyhc.presentation.login.model;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/28 15:41
+ * com.yihucha.hbyhc.presentation.login.model
+ */
+public class UidAndPhoneBean {
+    private String phone;
+    private String uid;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/login/view_model/LoginViewModel.java

@@ -18,6 +18,8 @@ import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.network.NetworkApi;
 import com.yihucha.hbyhc.network.service.AuthService;
 import com.yihucha.hbyhc.presentation.login.model.LoginModel;
+import com.yihucha.hbyhc.presentation.login.model.UidAndPhoneBean;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.view.MyToast;
 
@@ -29,6 +31,7 @@ public class LoginViewModel extends BaseViewModel {
     public MutableLiveData<String> mPwd = new MutableLiveData<>();//密码
     public MutableLiveData<BaseResponse> verify = new MutableLiveData<>();//验证码获取成功
     public MutableLiveData<DataResponse<LoginModel>> loginModel = new MutableLiveData<>();//登录返回的数据
+    public MutableLiveData<UidAndPhoneBean> uidAndPhoneBean = new MutableLiveData<>(); //邀请人信息
 //    public MutableLiveData<DataResponse<LoginHomeXieyiModel>> xieyi = new MutableLiveData<>();//验证码获取成功
 
 //    /**
@@ -54,50 +57,83 @@ public class LoginViewModel extends BaseViewModel {
 //            }
 //        }));
 //    }
+
+    /**
+     * 根据手机号，查询UID，查询邀请人信息
+     */
+    @SuppressLint("checkResult")
+    public void getUidByPhone(String phone) {
+        AuthService service = NetworkApi.createService(AuthService.class);
+        service.getUidByPhone(phone)
+                .compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<UidAndPhoneBean>>() {
+                    @Override
+                    public void onSuccess(DataResponse<UidAndPhoneBean> response) {
+                        if (response.responseCode == 200) {
+                            uidAndPhoneBean.postValue(response.getData());
+                        } else {
+                            failed.postValue(response.responseError);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e) {
+                        failed.postValue("请求失败");
+                    }
+                }));
+    }
+
     /**
      * 获取验证码
+     *
      * @param context
      */
     @SuppressLint("CheckResult")
-    public void getCode(Context context){
+    public void getCode(Context context) {
         Map<String, Object> map = new HashMap<>();
-        map.put("phone",mPhone.getValue());
+        map.put("phone", mPhone.getValue());
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.verify(map).compose(NetworkApi.applySchedulers(new BaseObserver<BaseResponse>() {
 
             @Override
             public void onSuccess(BaseResponse baseResponse) {
-              MyToast.makeText(context, baseResponse.responseError, Toast.LENGTH_LONG).show();
-              verify.setValue(baseResponse);
+                MyToast.makeText(context, baseResponse.responseError, Toast.LENGTH_LONG).show();
+                verify.setValue(baseResponse);
             }
 
             @Override
             public void onFailure(Throwable e) {
                 LogUtil.LogInfo("Throwable", e.getMessage());
-               // MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
+                // MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
             }
         }));
     }
 
     /**
      * 登录
+     *
      * @param context
      * @param sms_code 验证码
      */
+    public void getLogin(Context context, String sms_code) {
+        getLogin(context,sms_code,null);
+    }
+
     @SuppressLint("CheckResult")
-    public void  getLogin(Context context,String sms_code){
+    public void getLogin(Context context, String sms_code, String uid) {
         Map<String, Object> map = new HashMap<>();
-        map.put("phone",mPhone.getValue());
-        map.put("sms_code",sms_code);
+        map.put("phone", mPhone.getValue());
+        map.put("sms_code", sms_code);
+        if (EmptyCheckUtils.isNotEmpty(uid))
+            map.put("spread", uid);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.smslogin(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
-                if (loginModelDataResponse.responseCode==200){
+                if (loginModelDataResponse.responseCode == 200) {
                     loginModel.postValue(loginModelDataResponse);
-                }else if (loginModelDataResponse.responseCode == 400){
+                } else if (loginModelDataResponse.responseCode == 400) {
                     failed.postValue("400");
-                }else {
+                } else {
                     MyToast.makeText(context, loginModelDataResponse.responseError, Toast.LENGTH_LONG).show();
                 }
 
@@ -106,25 +142,26 @@ public class LoginViewModel extends BaseViewModel {
             @Override
             public void onFailure(Throwable e) {
                 LogUtil.LogInfo("Throwable", e.getMessage());
-              //  MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
+                //  MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
             }
         }));
     }
+
     /**
      * 登录
      */
     @SuppressLint("CheckResult")
-    public void  getPhonePasswordLogin(String phone,String password){
+    public void getPhonePasswordLogin(String phone, String password) {
         Map<String, Object> map = new HashMap<>();
-        map.put("phone",phone);
-        map.put("password",password);
+        map.put("phone", phone);
+        map.put("password", password);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.login(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
-                if (loginModelDataResponse.responseCode==200){
+                if (loginModelDataResponse.responseCode == 200) {
                     loginModel.postValue(loginModelDataResponse);
-                }else {
+                } else {
                     ToastUtils.showLong(loginModelDataResponse.responseError);
                 }
             }
@@ -135,25 +172,34 @@ public class LoginViewModel extends BaseViewModel {
             }
         }));
     }
+
     /**
      * 微信登录-绑定用户-手机号验证码
+     *
      * @param context
      * @param sms_code 验证码
      */
+    public void getWxBinding(Context context, String sms_code, String openId) {
+        getWxBinding(context,sms_code,openId,null);
+    }
     @SuppressLint("CheckResult")
-    public void  getWxBinding(Context context,String sms_code,String openId){
+    public void getWxBinding(Context context, String sms_code, String openId,String uid) {
         Map<String, Object> map = new HashMap<>();
-        map.put("phone",mPhone.getValue());
-        map.put("sms_code",sms_code);
-        map.put("type","1");
-        map.put("third_user_id",openId);
+        map.put("phone", mPhone.getValue());
+        map.put("sms_code", sms_code);
+        map.put("type", "1");
+        map.put("third_user_id", openId);
+        if (EmptyCheckUtils.isNotEmpty(uid)){
+            map.put("spread", uid);
+        }
+
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.wxloginbinding(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
-                if (loginModelDataResponse.responseCode==200){
+                if (loginModelDataResponse.responseCode == 200) {
                     loginModel.postValue(loginModelDataResponse);
-                }else {
+                } else {
                     MyToast.makeText(context, loginModelDataResponse.responseError, Toast.LENGTH_LONG).show();
                 }
 
@@ -162,26 +208,27 @@ public class LoginViewModel extends BaseViewModel {
             @Override
             public void onFailure(Throwable e) {
                 LogUtil.LogInfo("Throwable", e.getMessage());
-               // MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
+                // MyToast.makeText(context, getString(R.string.failed_string), Toast.LENGTH_LONG).show();
             }
         }));
     }
 
     /**
      * 一键登录
+     *
      * @param token
      */
     @SuppressLint("CheckResult")
-    public void getAKeyToLogIn(String token){
+    public void getAKeyToLogIn(String token) {
         Map<String, Object> map = new HashMap<>();
-        map.put("token",token);
-        AuthService authService=NetworkApi.createService(AuthService.class);
+        map.put("token", token);
+        AuthService authService = NetworkApi.createService(AuthService.class);
         authService.getAKeyToLogIn(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
-                if (loginModelDataResponse.responseCode==200){
+                if (loginModelDataResponse.responseCode == 200) {
                     loginModel.postValue(loginModelDataResponse);
-                }else {
+                } else {
                     ToastUtils.showLong(loginModelDataResponse.responseError);
                 }
 
@@ -189,36 +236,37 @@ public class LoginViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
 
     /**
      * 一键登录
+     *
      * @param openid 微信用户唯一标识
      */
     @SuppressLint("CheckResult")
-    public void getWechatLogIn(String openid){
+    public void getWechatLogIn(String openid) {
         Map<String, Object> map = new HashMap<>();
-        map.put("openid",openid);
-        AuthService authService=NetworkApi.createService(AuthService.class);
+        map.put("openid", openid);
+        AuthService authService = NetworkApi.createService(AuthService.class);
         authService.getWechatLogIn(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
-                if (loginModelDataResponse.responseCode ==200){
+                if (loginModelDataResponse.responseCode == 200) {
                     loginModel.postValue(loginModelDataResponse);
-                }else {
+                } else {
                     ToastUtils.showLong(loginModelDataResponse.responseError);
                 }
 
-                LogUtil.LogInfo("Code++",JSON.toJSONString(loginModelDataResponse));
+                LogUtil.LogInfo("Code++", JSON.toJSONString(loginModelDataResponse));
             }
 
             @Override
             public void onFailure(Throwable e) {
-             //   failed.postValue(getString(R.string.failed_string));
-                LogUtil.LogInfo("Code++",e.getMessage());
+                //   failed.postValue(getString(R.string.failed_string));
+                LogUtil.LogInfo("Code++", e.getMessage());
             }
         }));
     }

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

@@ -490,7 +490,13 @@ public class CustomDialog {
             lDialog.setText(R.id.tv_title, title);
         }
         EditText etInvitationCode = lDialog.getView(R.id.et_invitationcode);
-        lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.confirm_negative).setOnClickListener((v, lDialog1) -> oneInputButtonsListener.clickButton(etInvitationCode.getText().toString()), R.id.confirm_positive).show();
+        lDialog.setMaskValue(0.5f)
+                .setGravity(Gravity.CENTER)
+                .setCancelBtn(R.id.confirm_negative)
+                .setOnClickListener((v, lDialog1) -> {
+                    oneInputButtonsListener.clickButton(etInvitationCode.getText().toString());
+                    lDialog.dismiss();
+                }, R.id.confirm_positive).show();
     }
 
     /**