Merge branch 'dev_userCard'

# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -25,6 +25,7 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.fm.openinstall.OpenInstall;
 import com.fm.openinstall.listener.AppInstallAdapter;
 import com.fm.openinstall.model.AppData;
+import com.lzy.okgo.model.Response;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
@@ -39,6 +40,7 @@ import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.http.JsonBean;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
@@ -336,6 +338,13 @@ public class LoginActivity extends AbsActivity {
                                 finish();
 
                             }
+
+                            @Override
+                            public void onError(Response<JsonBean> response) {
+                                super.onError(response);
+                                String message = response.message();
+                                System.out.println(">>>>>"+message);
+                            }
                         });
 
             }