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/manager/helper/rm/base/CurrentBasePersonList.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/basic/security/manager/helper/rm/base/CurrentBasePersonList.java b/app/src/main/java/com/basic/security/manager/helper/rm/base/CurrentBasePersonList.java
index d554dfe..b8a79d1 100644
--- a/app/src/main/java/com/basic/security/manager/helper/rm/base/CurrentBasePersonList.java
+++ b/app/src/main/java/com/basic/security/manager/helper/rm/base/CurrentBasePersonList.java
@@ -3,13 +3,13 @@
import android.widget.ImageView;
import com.basic.security.base.BaseApplication;
-import com.basic.security.fragment.AccountSettingFragment;
-import com.basic.security.manager.AccountManager;
+import com.basic.security.fragment.UserFragment;
import com.basic.security.manager.BaseSettingManager;
import com.basic.security.manager.DetectResultManager;
import com.basic.security.manager.FaceTitleAndTipsManager;
import com.basic.security.manager.HintDoorAccessManager;
import com.basic.security.manager.PersonIdentityManager;
+import com.basic.security.manager.UserManager;
import com.basic.security.model.ModelAdapter;
import com.basic.security.model.Person;
import com.basic.security.utils.Constants;
@@ -21,17 +21,17 @@
public class CurrentBasePersonList extends CurrentBaseSignUp {
protected boolean adminLogin1(ModelAdapter person) {
- AccountManager.loginPerson = person;
+ UserManager.loginPerson = person;
// SystemInitManager.showSecondDisplay(mainActivity());
ToastUtil.show("绠＄悊鍛樼櫥鍏ユ垚鍔燂紒");
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
- AccountManager.setAdminId(currentCompareFeatureResult.personId);
+ UserManager.setAdminId(currentCompareFeatureResult.personId);
try {
ImageView login_photo = BaseApplication.getApplication().activity.fragment_toolbar.login_photo;
login_photo.setImageResource(com.basic.security.utils.RUtils.R_drawable_yuyin);
- AccountManager.setIsBasic(false);
+ UserManager.setIsBasic(false);
} catch (Exception e) {
e.printStackTrace();
}
@@ -64,7 +64,7 @@
if (Constants.indoorOutdoorInOne) {
// doorAccessS();
String denyMessage = HintDoorAccessManager.getNoRegisterHint();
-// System.out.println("CurrentBasePersonList.doShowFragment denyMessage="+denyMessage);
+// System1.out.println("CurrentBasePersonList.doShowFragment denyMessage="+denyMessage);
currentFaceTitleAndTipsS.faceTitle(denyMessage);
currentFaceTitleAndTipsS.faceTitle2(denyMessage, true);
setDoorAccessMessageS1(denyMessage);
@@ -73,7 +73,7 @@
setDoorAccessMessage1(denyMessage);
}
if (currentFacePosition.detectScoreCanSignUp()) {
-// System.out.println("CurrentBasePersonList.doShowFragment currentFacePosition.detectScoreCanSignUp()=true");
+// System1.out.println("CurrentBasePersonList.doShowFragment currentFacePosition.detectScoreCanSignUp()=true");
addToNeedSignUpPersonList();
} else {
if (activity.currentFragment == activity.fragment_su_auto_wait_face ||
@@ -103,8 +103,8 @@
currentFaceTitleAndTips.tipsTxt = "";
currentFaceTitleAndTipsS.tipsTxt = "";
}
- if (activity.currentFragment == activity.fragment_account_setting) {
- if (AccountSettingFragment.isChangePhoto) {
+ if (activity.currentFragment == activity.fragment_user) {
+ if (UserFragment.isChangePhoto) {
ToastUtil.show("姝や汉宸茶娉ㄥ唽锛屼笉鑳借缃负绯荤粺绠＄悊鍛樺ご鍍�");
}
}
@@ -127,14 +127,14 @@
}
}
printFacePositionList();
- if (AccountManager.adminLoggedIn()) {
+ if (UserManager.adminLoggedIn()) {
if (needSignUpPersonList.size() > 0) {
if (!BaseSettingManager.isDoorAccessOnlyMode()) {
signUpPerson();
}
}
}
- if (!AccountManager.adminLoggedIn()) {
+ if (!UserManager.adminLoggedIn()) {
if (Constants.indoorOutdoorInOne) {
if (currentPerson != null && activity.currentFragment == activity.fragment_admin_password_login) {
List<String> identityNameByPersonId = PersonIdentityManager.findIdentityNameByPersonId(currentPerson.getId());
--
Gitblit v1.8.0