diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
index 6d7a163..1ebd42d 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
@@ -98,8 +98,11 @@ public class LoginActivity extends BaseActivity {
Log.e("--短信发送res--", "短信发送成功");
}
if (CacheGroup.cacheList.get(LOGIN_RESULT) != null) {
- if (customDialog!=null&&customDialog.isShowing())
+ if (customDialog != null && customDialog.isShowing())
customDialog.dismiss();
+
+ btn_login.setEnabled(true);
+ btn_login.setBackgroundResource(R.drawable.bg_btn);
//存储登录记录
loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
Log.e("--登录信息--", new Gson().toJson(loginBean));
@@ -112,18 +115,25 @@ public class LoginActivity extends BaseActivity {
// JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
appInfoBean.setStatus("0");
appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
- ur.postAppInfo(appInfoBean,"post");
+ ur.postAppInfo(appInfoBean, "post");
UiAuxiliary.homeRequest("登录成功");
finish();
} else {
appInfoBean.setStatus("1");
appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
- ur.postAppInfo(appInfoBean,"post");
+ ur.postAppInfo(appInfoBean, "post");
Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
}
CacheGroup.cacheList.remove(LOGIN_RESULT);
}
break;
+
+ case RequsetCodeConstants.ERROR:
+ if (customDialog != null && customDialog.isShowing())
+ customDialog.dismiss();
+ btn_login.setEnabled(true);
+ btn_login.setBackgroundResource(R.drawable.bg_btn);
+ break;
default:
break;
}
@@ -238,6 +248,8 @@ public class LoginActivity extends BaseActivity {
Log.e("--code--", code);
if (judgeFormat(phone, code)) {
if (key) {
+ btn_login.setEnabled(false);
+ btn_login.setBackgroundResource(R.drawable.bg_btn_gray);
customDialog = new CustomDialog(con, "登陆中...");
customDialog.show();
LoginRegInputBean lb = new LoginRegInputBean();
diff --git a/app/src/main/res/drawable/bg_btn_gray.xml b/app/src/main/res/drawable/bg_btn_gray.xml
new file mode 100644
index 0000000..0c638df
--- /dev/null
+++ b/app/src/main/res/drawable/bg_btn_gray.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_face_succ_result.xml b/app/src/main/res/layout/activity_face_succ_result.xml
index b0855fe..b5772a5 100644
--- a/app/src/main/res/layout/activity_face_succ_result.xml
+++ b/app/src/main/res/layout/activity_face_succ_result.xml
@@ -26,10 +26,11 @@