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/GuestModeFragment.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/GuestModeFragment.java b/app/src/main/java/com/basic/security/fragment/GuestModeFragment.java
index 8fd0e53..17dcf8a 100644
--- a/app/src/main/java/com/basic/security/fragment/GuestModeFragment.java
+++ b/app/src/main/java/com/basic/security/fragment/GuestModeFragment.java
@@ -26,6 +26,7 @@
import com.basic.security.base.BaseApplication;
import com.basic.security.base.BaseFragment;
import com.basic.security.manager.DeviceManager;
+import com.basic.security.manager.FeatureManager;
import com.basic.security.manager.GuestManager;
import com.basic.security.manager.IdentityManager;
import com.basic.security.manager.OrgManager;
@@ -197,7 +198,7 @@
guestListLock.unlock();
}
if (!TextUtils.isEmpty(personId)) {
- FaceId.instance.removeFeatureFromDb(personId);
+ FeatureManager.removeFeature(personId);
ModelAdapter dbPerson = PersonManager.findPersonById(personId);
if (dbPerson != null) {
PersonManager.deletePerson(dbPerson);
@@ -409,7 +410,7 @@
guest_id_card_text.setText(idCardNumber);
}
}
- if (Constants.TRUE.equals(newCheckedGuest.getString(Guest.verified_id_card))) {
+ if (newCheckedGuest != null && Constants.TRUE.equals(newCheckedGuest.getString(Guest.verified_id_card))) {
String name = newCheckedGuest.getString(Guest.name);
String idCardNumber = newCheckedGuest.getString(Guest.id_card_number);
if (!TextUtils.isEmpty(name)) {
@@ -514,7 +515,7 @@
guest_picture.setImageBitmap(guestFaceBitmap);
}
checkedIdentityMapByPerson.clear();
- checkTemporaryGuest();
+// checkTemporaryGuest();
guest_name.setText(person.getString("name"));
guest_id_card.setText(person.getString("id_card_number"));
guest_phone.setText(person.getString("phone"));
@@ -665,7 +666,12 @@
public void initGuestIdentity(ModelAdapter guest) {
if (guest != null) {
- setIdentityWithPersonInThread(guest.getString(Guest.person_id));
+ String table = guest.getString(Constants.TABLE);
+ if ("person".equals(table)) {
+ setIdentityWithPersonInThread(guest.getString(Person.id));
+ } else {
+ setIdentityWithPersonInThread(guest.getString(Guest.person_id));
+ }
}
allIdentityListLock.lock();
allIdentityList.clear();
@@ -713,7 +719,6 @@
public void setIdentityWithPersonInThread(String personId) {
BaseApplication.getApplication().executorService.execute(() -> {
if (!TextUtils.isEmpty(personId)) {
- System.out.println("GMGuest.setIdentityWithPersonInThread personId=" + personId);
checkedIdentityMapByPerson.clear();
checkedIdentityMapByPerson.putAll(PersonIdentityManager.findIdentityMapByPersonId(personId));
} else {
@@ -757,7 +762,7 @@
try {
List<ModelAdapter> personList = PersonManager.findPersonList("select * from person where "
+ Person.sign_up_status + "='宸叉敞鍐�' " +
- " and " + Person.sign_up_method + "!='璁垮娉ㄥ唽' and name!='绯荤粺绠＄悊鍛�'");
+ " and " + Person.sign_up_method + "!='璁垮娉ㄥ唽' and name!='绯荤粺绠＄悊鍛�' and " + Person.del_flag + "='0'");
if (selectedRespondentOrg != null) {
personList = PersonManager.filterByOrgId(personList, selectedRespondentOrg.getString(Org.id));
}
@@ -902,7 +907,7 @@
} else {
newPerson = true;
}
- ModelAdapter newPersonAsGuest = new ModelAdapter(BasicIdUtil.getPersonId());
+ ModelAdapter newPersonAsGuest = new ModelAdapter(BasicIdUtil.getPersonId(guestFaceFeature));
if (checkedPerson != null) {
newPersonAsGuest = checkedPerson;
}
@@ -962,7 +967,7 @@
cameraImageFeature = FaceId.instance.extractFeature(ModelAdapter.getAttachmentPath(newPersonAsGuest.getId(), Guest.camera_image_path, Person.tableName));
}
if (cameraImageFeature != null) {
- String compareResultStr = FaceId.instance.compareFeatureInDb(cameraImageFeature, 80);
+ String compareResultStr = FeatureManager.compareFeature(cameraImageFeature, 80);
String dbPersonId = compareResultStr.split(",", -1)[0];
if (!TextUtils.isEmpty(dbPersonId)) {
ModelAdapter dbPerson = PersonManager.findPersonById(dbPersonId);
@@ -1025,7 +1030,7 @@
newPersonAsGuest.setString(Person.sign_up_time, new Date().getTime() + "");
newPersonAsGuest.setString(Person.del_flag, "0");
if (cameraImageFeature != null) {
- FaceId.instance.addFeatureToDb(newPersonAsGuest.getId(), cameraImageFeature);
+ FeatureManager.addFeature(newPersonAsGuest.getId(), cameraImageFeature);
}
}
newPersonAsGuest.setString(Person.guest_remark, remark);
@@ -1189,7 +1194,9 @@
if (GuestManager.twoCameras()) {
((View) guest_list_two.getParent()).setVisibility(View.VISIBLE);
} else {
- ((View) guest_list_two.getParent()).setVisibility(View.GONE);
+ if (Constants.indoorOutdoorInOne) {
+ ((View) guest_list_two.getParent()).setVisibility(View.GONE);
+ }
}
respondent_face_CheckedId = "";
respondentCheckedPosition = -1;
@@ -1254,7 +1261,7 @@
int savedCount = 0;
for (Map<String, String> face : faces) {
try {
- ModelAdapter lastGuest = GuestManager.findGuestListRecentOne();
+ ModelAdapter lastGuest = GuestManager.findGuestListRecentOne(guestListCameraType);
String personId = face.get(FaceMessage.personId);
ModelAdapter guest = new ModelAdapter();
guest.setIdWithUuid();
@@ -1347,7 +1354,7 @@
}
guest.setBlob(Guest.camera_image_path, faceByteArray);
} catch (Exception e) {
- System.out.println("GuestModeFragment.addGuestList " + e.getMessage());
+ System1.out.println("GuestModeFragment.addGuestList " + e.getMessage());
continue;
}
savedCount++;
--
Gitblit v1.8.0