Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

10 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java

@@ -32,7 +32,7 @@
        LoginCabinetParam param = new LoginCabinetParam();
        param.setUsername(userName);
        param.setPassword(pw);
        doAction(3);
        doAction(6);
        getRetrofitService(Apis.class).loginCabinet(ParamsUtil.encodeRequestBody(param))
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse<String>>(rxJavaGcManager) {
@@ -44,7 +44,7 @@
                            MApplication.getLoginBean().setAuthType(2);
                            doAction(5);
                        }else {
                            doAction(4);
                            doAction(4,response.getMessage());
                        }
                    }