From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/fragment/AdminPasswordLoginFragment.java | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/AdminPasswordLoginFragment.java b/app/src/main/java/com/basic/security/fragment/AdminPasswordLoginFragment.java
index f939cf3..ad73d35 100644
--- a/app/src/main/java/com/basic/security/fragment/AdminPasswordLoginFragment.java
+++ b/app/src/main/java/com/basic/security/fragment/AdminPasswordLoginFragment.java
@@ -12,8 +12,8 @@
import com.basic.security.base.BaseApplication;
import com.basic.security.base.BaseFragment;
-import com.basic.security.manager.AccountManager;
import com.basic.security.manager.BaseSettingManager;
+import com.basic.security.manager.UserManager;
import com.basic.security.model.ModelAdapter;
import com.basic.security.utils.Constants;
import com.basic.security.utils.KeyboardUtil;
@@ -36,7 +36,6 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(ResolutionAdaptation.fragment_admin_password_login(), container, false);
}
-
@AfterViews
public void afterViews() {
@@ -69,33 +68,28 @@
@Click
public void login() {
KeyboardUtil.hideSoftKeyboard();
- if (1==1) {
- if (TextUtils.isEmpty(account.getText().toString().trim())) {
- ToastUtil.show("璇疯緭鍏ョ敤鎴峰悕");
- return;
- }
- if (TextUtils.isEmpty(password.getText().toString().trim())) {
- ToastUtil.show("璇疯緭鍏ュ瘑鐮�");
- return;
- }
- AccountManager.loginPerson = null;
- AccountManager.setIsBasic(false);
- ModelAdapter adminAccount = null;
- if ("basic".equals(account.getText().toString()) && "basic123".equals(password.getText().toString())) {
- AccountManager.setIsBasic(true);
- adminAccount = AccountManager.getAccount();
- } else {
- adminAccount = AccountManager.getAccount(account.getText().toString().trim(), password.getText().toString().trim());
- }
- if (adminAccount == null) {
- ToastUtil.show("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛岃閲嶆柊杈撳叆");
- password.setText("");
- } else {
- waitSoftHide(adminAccount);
- }
+ if (TextUtils.isEmpty(account.getText().toString().trim())) {
+ ToastUtil.show("璇疯緭鍏ョ敤鎴峰悕");
+ return;
+ }
+ if (TextUtils.isEmpty(password.getText().toString().trim())) {
+ ToastUtil.show("璇疯緭鍏ュ瘑鐮�");
+ return;
+ }
+ UserManager.loginPerson = null;
+ ModelAdapter user = null;
+ if ("basic".equals(account.getText().toString()) && "basic123".equals(password.getText().toString())) {
+ UserManager.setIsBasic(true);
+ user = UserManager.getUserByName(account.getText().toString());
} else {
- ModelAdapter adminAccount = AccountManager.getAccount("admin", "admin123");
- waitSoftHide(adminAccount);
+ UserManager.setIsBasic(false);
+ user = UserManager.getUser(account.getText().toString().trim(), password.getText().toString().trim());
+ }
+ if (user == null) {
+ ToastUtil.show("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛岃閲嶆柊杈撳叆");
+ password.setText("");
+ } else {
+ waitSoftHide(user);
}
}
@@ -113,7 +107,7 @@
if (adminAccount == null) {
mainActivity().showFragment(mainActivity().fragment_admin_face_login);
} else {
- AccountManager.setAdminAccount(adminAccount);
+ UserManager.setAdminUser(adminAccount);
if (Constants.indoorOutdoorInOne) {
if (BaseSettingManager.isGuestMode()) {
mainActivity().fragment_toolbar.visitor_model();
--
Gitblit v1.8.0