diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
index 417eb39..5ffdfde 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
@@ -113,6 +113,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     public void msgMethod(Message m) {
         super.msgMethod(m);
         switch (m.what) {
+            case RequsetCodeConstants.ERROR:
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                break;
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
                     if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
@@ -191,6 +196,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                                 customDialog.dismiss();
                             }
+                            EventBus.getDefault().post(new HomeWaybillEvent());
+                            finish();
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove(TYPE_NAME[i]);
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 6aef659..e35b971 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
@@ -99,8 +99,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));
@@ -115,18 +118,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;
         }
@@ -241,6 +251,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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#AAAAAA" />
+            <corners android:topLeftRadius="@dimen/dp_29" android:topRightRadius="@dimen/dp_29"
+                android:bottomLeftRadius="@dimen/dp_29" android:bottomRightRadius="@dimen/dp_29" />
+        </shape>
+    </item>
+</selector>
\ 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 @@
     </LinearLayout>
 
     <ImageView
+        android:layout_marginTop="@dimen/dp_210"
         android:id="@+id/img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_centerHorizontal="true"
         android:background="@drawable/face_success"></ImageView>
 
     <TextView