From 26747cce33adb1302e94b443de3e1419ab65a676 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 七月 2017 11:22:27 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 6 +++---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 4 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java | 18 ++++++++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
index e8e6f36..be97ea1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
@@ -147,6 +147,8 @@
private String surveillancePhotoId;
// 璁垮绫诲瀷
private String visitorTypeId;
+ private String authentication;
+ private String idCardHeadPhoto;
/**
* Get 浜哄憳涓婚敭
@@ -450,6 +452,22 @@
this.visitorTypeId = visitorTypeId;
}
+ public String getAuthentication() {
+ return authentication;
+ }
+
+ public void setAuthentication(String authentication) {
+ this.authentication = authentication;
+ }
+
+ public String getIdCardHeadPhoto() {
+ return idCardHeadPhoto;
+ }
+
+ public void setIdCardHeadPhoto(String idCardHeadPhoto) {
+ this.idCardHeadPhoto = idCardHeadPhoto;
+ }
+
public String toString() {
return
",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameEn +
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 5a6a0bd..a267a48 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -615,7 +615,7 @@
public void run() {
while(true) {
try{
- Thread.sleep(1000);
+ Thread.sleep(2000);
readIdCard();
} catch (Exception e) {
e.printStackTrace();
@@ -626,12 +626,12 @@
public void readIdCard() {
try {
- if (!registerFragmentVisible) {
+ if (!registerFragmentVisible || !RegisterFragment.getInstance().isVisible()) {
return;
}
RFIDReader idCardReader = RFIDReader.getInstance(BaseApplication.getInstance(), "uart");
- idCardReader.setUartDeviceName("/dev/ttyS1");
+ idCardReader.setUartDeviceName("/dev/ttyS4");
ByteArrayInputStream type = new ByteArrayInputStream("uart".getBytes());
idCardReader.control(ReaderExtra.CONNECT, type);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 90e48bf..b9dc589 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -132,6 +132,9 @@
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
+ if (!RegisterFragment.getInstance().isVisible()) {
+ return;
+ }
List<Double> percents = resultBean.getListBeanOfType(Double.class);
if (percents != null && percents.size() > 0) {
double percent = percents.get(0);
@@ -140,6 +143,7 @@
RegisterFragment.getInstance().fillFormWithIdCard();
return;
}
+ System.out.println("percent="+percent);
}
Toast.makeText(BaseApplication.getInstance(),"璁よ瘉澶辫触", Toast.LENGTH_SHORT).show();
}
--
Gitblit v1.8.0