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/UserFragment.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/AccountSettingFragment.java b/app/src/main/java/com/basic/security/fragment/UserFragment.java
similarity index 87%
rename from app/src/main/java/com/basic/security/fragment/AccountSettingFragment.java
rename to app/src/main/java/com/basic/security/fragment/UserFragment.java
index e3b5b4c..6c49444 100644
--- a/app/src/main/java/com/basic/security/fragment/AccountSettingFragment.java
+++ b/app/src/main/java/com/basic/security/fragment/UserFragment.java
@@ -11,13 +11,13 @@
import android.widget.EditText;
import com.basic.security.base.BaseFragment;
-import com.basic.security.manager.AccountManager;
import com.basic.security.manager.CompanyManager;
import com.basic.security.manager.DeviceManager;
+import com.basic.security.manager.FeatureManager;
import com.basic.security.manager.PersonManager;
+import com.basic.security.manager.UserManager;
import com.basic.security.model.ModelAdapter;
import com.basic.security.model.Person;
-import com.basic.security.utils.FaceId;
import com.basic.security.utils.FacePosition;
import com.basic.security.utils.ResolutionAdaptation;
import com.basic.security.utils.ToastUtil;
@@ -32,7 +32,7 @@
import de.hdodenhof.circleimageview.CircleImageView;
@EFragment
-public class AccountSettingFragment extends BaseFragment {
+public class UserFragment extends BaseFragment {
public static boolean isChangePhoto = false;
public FacePosition currentFacePosition;
@ViewById
@@ -44,7 +44,7 @@
private String accountName, oldPassword, newPassword, againPassword;
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- return inflater.inflate(ResolutionAdaptation.fragment_account_setting1(), container, false);
+ return inflater.inflate(ResolutionAdaptation.fragment_user1(), container, false);
}
@Override
@@ -56,9 +56,9 @@
new_password.setText("");
old_password.setText("");
try {
- ModelAdapter adminAccount = AccountManager.getAdminAccount();
+ ModelAdapter adminAccount = UserManager.adminUser();
if (adminAccount != null) {
- ModelAdapter admin_person = PersonManager.findPersonById(AccountManager.getAdminAccount().getString("person_id"));
+ ModelAdapter admin_person = PersonManager.findPersonById(UserManager.adminUser().getString("person_id"));
byte[] data = admin_person.getBlob("camera_image_path");
if (data != null) {
user_photo.setImageBitmap(BitmapFactory.decodeByteArray(data, 0, data.length));
@@ -83,7 +83,7 @@
@Click
void btn_delete_photo() {
- ModelAdapter user = AccountManager.getAdminAccount();
+ ModelAdapter user = UserManager.adminUser();
ModelAdapter admin_in_person = PersonManager.findPersonById(user.getString("person_id"));
String camera_image_path = ModelAdapter.getAttachmentPath(admin_in_person.getId(), Person.camera_image_path, Person.tableName);
if (!TextUtils.isEmpty(camera_image_path)) {
@@ -92,7 +92,7 @@
camera_image_path_file.delete();
}
}
- FaceId.instance.removeFeatureFromDb(admin_in_person.getString(Person.id));
+ FeatureManager.removeFeature(admin_in_person.getString(Person.id));
admin_in_person.setString(Person.camera_image_path, "");
admin_in_person.setString(Person.camera_image_feature, "");
PersonManager.savePerson(admin_in_person);
@@ -106,7 +106,7 @@
void btn_sure_photo() {
try {
isChangePhoto = false;
- ModelAdapter user = AccountManager.getAdminAccount();
+ ModelAdapter user = UserManager.adminUser();
user.setString("table", "user");
user.setString("password", newPassword);
user.setString("device_id", DeviceManager.getDeviceId());
@@ -121,7 +121,7 @@
PersonManager.savePerson(admin_in_person);
}
if (admin_in_person.getBlob("camera_image_feature") != null) {
- FaceId.instance.addFeatureToDb(admin_in_person.getId(), admin_in_person.getBlob("camera_image_feature"));
+ FeatureManager.addFeature(admin_in_person.getId(), admin_in_person.getBlob("camera_image_feature"));
}
//mainActivity().fragment_toolbar.login_photo.setImageBitmap(currentFacePosition.faceBitmap);
ToastUtil.show("淇敼鎴愬姛");
@@ -132,14 +132,10 @@
@Click
void save() {
- if (AccountManager.isBasic()) {
- ToastUtil.show("鍙湁绠＄悊鍛樻墠鑳戒慨鏀瑰瘑鐮�");
- return;
- }
oldPassword = old_password.getText().toString().trim();
newPassword = new_password.getText().toString().trim();
againPassword = again_password.getText().toString().trim();
- String adminPassword = AccountManager.getCurrentAdminPassword();
+ String adminPassword = UserManager.getCurrentAdminPassword();
if (TextUtils.isEmpty(oldPassword)) {
ToastUtil.show("鏃у瘑鐮佷笉鑳戒负绌猴紝璇锋鏌ュ悗閲嶆柊杈撳叆");
return;
@@ -163,14 +159,14 @@
return;
}
try {
- ModelAdapter user = AccountManager.getAdminAccount();
+ ModelAdapter user = UserManager.adminUser();
user.setString("table", "user");
user.setString("password", newPassword);
user.setString("device_id", DeviceManager.getDeviceId());
user.setString("company_id", CompanyManager.getCompanyId());
ModelAdapter admin_in_person = PersonManager.findPersonById(user.getString("person_id"));
PersonManager.savePerson(admin_in_person);
- AccountManager.saveAccount(user);
+ UserManager.saveAccount(user);
ToastUtil.show("淇敼瀵嗙爜鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0