|
|
@@ -156,12 +156,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
|
|
|
getCaptcha();
|
|
|
break;
|
|
|
case R.id.phone_sure_tv:
|
|
|
- if(BuildConfig.DEBUG){
|
|
|
+ etPhone = phoneEtAccount.getText().toString().trim();
|
|
|
+ etCode = phoneEtCode.getText().toString().trim();
|
|
|
+ if(BuildConfig.DEBUG && TextUtils.isEmpty(etCode) && TextUtils.isEmpty(etPhone)){
|
|
|
goMain();
|
|
|
return;
|
|
|
}
|
|
|
- etPhone = phoneEtAccount.getText().toString().trim();
|
|
|
- etCode = phoneEtCode.getText().toString().trim();
|
|
|
loginByPhoneGaptcha();
|
|
|
break;
|
|
|
}
|
|
|
@@ -241,7 +241,6 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
|
|
|
@Override
|
|
|
public void returnLogindata(Object o) {
|
|
|
hideProgress();
|
|
|
- hideProgress();
|
|
|
if (o == null) {
|
|
|
return;
|
|
|
}
|