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/ToolbarFragment.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/ToolbarFragment.java b/app/src/main/java/com/basic/security/fragment/ToolbarFragment.java
index b5a4af5..dcea11d 100644
--- a/app/src/main/java/com/basic/security/fragment/ToolbarFragment.java
+++ b/app/src/main/java/com/basic/security/fragment/ToolbarFragment.java
@@ -1,6 +1,5 @@
package com.basic.security.fragment;
-import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.os.SystemClock;
@@ -12,9 +11,9 @@
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.SystemInitManager;
+import com.basic.security.manager.UserManager;
import com.basic.security.utils.Constants;
import com.basic.security.utils.ResolutionAdaptation;
@@ -43,7 +42,8 @@
@ViewById
public ImageView login_photo;
@ViewById
- public View home,
+ public View
+// home,
login,
logout,
admin_msg,
@@ -52,7 +52,6 @@
List<TextView> menus = new ArrayList<>();
List<View> toolbarButtons = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -66,7 +65,8 @@
@AfterViews
public void afterViews() {
- toolbarButtons.addAll(Arrays.asList(home,
+ toolbarButtons.addAll(Arrays.asList(
+// home,
login,
logout,
admin_msg,
@@ -107,20 +107,21 @@
@Click
public void logout() {
- if(Constants.indoorOutdoorInOne) {
-// System.out.println("ToolbarFragment.logout");
- AccountManager.setIsBasic(false);
+ if (Constants.indoorOutdoorInOne) {
+// System1.out.println("ToolbarFragment.logout");
+ UserManager.setIsBasic(false);
// SystemInitManager.hideSecondDisplay(mainActivity());
if (Constants.indoorOutdoorInOne) {
- AccountManager.setAdminAccount1(null);
+ UserManager.setAdminUser1(null);
} else {
- AccountManager.setAdminAccount(null);
+ UserManager.setAdminUser(null);
}
showFragment(mainActivity().fragment_admin_logout);
// mainActivity().hideOneFragment(mainActivity().fragment_advertising_image_view);
}
if (Constants.isOutdoor) {
- AccountManager.setAdminAccount(null);
+
+ UserManager.setAdminUser(null);
showFragment(mainActivity().fragment_home);
}
}
@@ -148,7 +149,7 @@
}
public void toggleGuestModeButton() {
- if (BaseSettingManager.isGuestMode() && AccountManager.adminLoggedIn()) {
+ if (BaseSettingManager.isGuestMode() && UserManager.adminLoggedIn() && Constants.indoorOutdoorInOne) {
visitor_model.setVisibility(View.VISIBLE);
} else {
visitor_model.setVisibility(View.GONE);
@@ -194,11 +195,11 @@
@Click
public void system_setting() {
SystemInitManager.showSecondDisplay(mainActivity());
- if (AccountManager.isBasic) {
+ if (UserManager.isBasic()) {
setSelectedMenuItemBackground(system_setting);
((SystemSettingTabsFragment) mainActivity().fragment_system_setting_tabs).base_set1();
}
- if (!AccountManager.isBasic) {
+ if (!UserManager.isBasic()) {
setSelectedMenuItemBackground(system_setting);
((SystemSettingTabsFragment) mainActivity().fragment_system_setting_tabs).tv_hint_setting();
}
--
Gitblit v1.8.0