YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev-lxj-beta' into dev-lxj

Browse Source 
# Conflicts:
#	.idea/.name
#	.idea/vcs.xml
This commit is contained in:
梁小江
2025-11-05 11:25:39 +08:00
parent 773c3fc8b4 d0337a723c
commit c1d77850f1
47 changed files with 418 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
View File

@@ -408,7 +408,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
.setPrivacyTextSize(11)
.setPrivacyAlertContentVerticalMargin(20)
.setPrivacyMargin(39)
.setPrivacyState(true)
.setPrivacyState(false)
.setCheckboxHidden(false)
.setCheckedImgPath("ic_agreement_selected")
.setUncheckedImgPath("ic_agreement_unselect")
@@ -485,20 +485,20 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
}
String phone = mBinding.edPhone.getText().toString().trim();
if (TextUtils.isEmpty(phone)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
ToastUtils.show("请输入手机号");
return;
}
if (type == 1) {
String code = mBinding.edPassword.getText().toString().trim();
if (TextUtils.isEmpty(code)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
ToastUtils.show("请输入验证码");
return;
}
MvpPre.login(phone, "", code, 1);
} else if (type == 2) {
String password = mBinding.edPasswordCode.getText().toString().trim();
if (TextUtils.isEmpty(password)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入密码");
ToastUtils.show("请输入密码");
return;
}
MvpPre.login(phone, password, "", 2);
@@ -525,7 +525,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} else if (id == R.id.tv_send_code) {
String phone = mBinding.edPhone.getText().toString().trim();
if (TextUtils.isEmpty(phone)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
ToastUtils.show("请输入手机号");
return;
}
sendCodeSuccess(phone);