From 8696a36fbb05d376e6cbaba5814419f2a250ba4f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 11:43:28 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java | 7 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 73 +++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java | 207 ++++++++++++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java | 14 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java | 2
9 files changed, 308 insertions(+), 7 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 7e81f63..b53445a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -84,7 +84,7 @@
public boolean networkNotAvailable() {
- boolean connected = false;
+ boolean connected = true;
// ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
// if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
// connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
@@ -97,7 +97,7 @@
}
public boolean networkAvailable() {
- boolean connected = false;
+ boolean connected = true;
// ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
// if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
// connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index 1d500a8..15eff04 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -113,7 +113,7 @@
public static boolean FACE_SERVER = false;
public static boolean ID_CARD = false;
- public static boolean EMULATOR = true;
+ public static boolean EMULATOR = false;
public static boolean androidOffline() {
return true;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java
new file mode 100644
index 0000000..6a49ca8
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java
@@ -0,0 +1,7 @@
+package cn.com.basic.face.discern.query.item;
+
+public class OfflineVisitItem {
+
+
+
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java
index 1e4b0c3..edb1d03 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java
@@ -2,4 +2,211 @@
public class OfflineVisitorRegisterItem {
+ private String visitorId;
+ private String username;
+ private String mobilePhone;
+ private String genderId;
+ private String identityTypeId;
+ private String countryId;
+ private String visitorTypeId;
+ private String identifyNum;
+ private String companyId;
+ private String birthday;
+ private String remark;
+ private String rawSurveillancePhotoPath;
+ private String rawSurveillancePhotoWidth;
+ private String rawSurveillancePhotoHeight;
+ private String surveillancePhotoPath;
+ private String surveillancePhotoWidth;
+ private String surveillancePhotoHeight;
+ private String uploadCustomPhotoPath;
+ private String uploadCustomPhotoWidth;
+ private String uploadCustomPhotoHeight;
+ private String idCardPhotoPath;
+ private String idCardPhotoWidth;
+ private String idCardPhotoHeight;
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getMobilePhone() {
+ return mobilePhone;
+ }
+
+ public void setMobilePhone(String mobilePhone) {
+ this.mobilePhone = mobilePhone;
+ }
+
+ public String getGenderId() {
+ return genderId;
+ }
+
+ public void setGenderId(String genderId) {
+ this.genderId = genderId;
+ }
+
+ public String getIdentityTypeId() {
+ return identityTypeId;
+ }
+
+ public void setIdentityTypeId(String identityTypeId) {
+ this.identityTypeId = identityTypeId;
+ }
+
+ public String getCountryId() {
+ return countryId;
+ }
+
+ public void setCountryId(String countryId) {
+ this.countryId = countryId;
+ }
+
+ public String getVisitorTypeId() {
+ return visitorTypeId;
+ }
+
+ public void setVisitorTypeId(String visitorTypeId) {
+ this.visitorTypeId = visitorTypeId;
+ }
+
+ public String getIdentifyNum() {
+ return identifyNum;
+ }
+
+ public void setIdentifyNum(String identifyNum) {
+ this.identifyNum = identifyNum;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getRawSurveillancePhotoPath() {
+ return rawSurveillancePhotoPath;
+ }
+
+ public void setRawSurveillancePhotoPath(String rawSurveillancePhotoPath) {
+ this.rawSurveillancePhotoPath = rawSurveillancePhotoPath;
+ }
+
+ public String getRawSurveillancePhotoWidth() {
+ return rawSurveillancePhotoWidth;
+ }
+
+ public void setRawSurveillancePhotoWidth(String rawSurveillancePhotoWidth) {
+ this.rawSurveillancePhotoWidth = rawSurveillancePhotoWidth;
+ }
+
+ public String getRawSurveillancePhotoHeight() {
+ return rawSurveillancePhotoHeight;
+ }
+
+ public void setRawSurveillancePhotoHeight(String rawSurveillancePhotoHeight) {
+ this.rawSurveillancePhotoHeight = rawSurveillancePhotoHeight;
+ }
+
+ public String getSurveillancePhotoPath() {
+ return surveillancePhotoPath;
+ }
+
+ public void setSurveillancePhotoPath(String surveillancePhotoPath) {
+ this.surveillancePhotoPath = surveillancePhotoPath;
+ }
+
+ public String getSurveillancePhotoWidth() {
+ return surveillancePhotoWidth;
+ }
+
+ public void setSurveillancePhotoWidth(String surveillancePhotoWidth) {
+ this.surveillancePhotoWidth = surveillancePhotoWidth;
+ }
+
+ public String getSurveillancePhotoHeight() {
+ return surveillancePhotoHeight;
+ }
+
+ public void setSurveillancePhotoHeight(String surveillancePhotoHeight) {
+ this.surveillancePhotoHeight = surveillancePhotoHeight;
+ }
+
+ public String getUploadCustomPhotoPath() {
+ return uploadCustomPhotoPath;
+ }
+
+ public void setUploadCustomPhotoPath(String uploadCustomPhotoPath) {
+ this.uploadCustomPhotoPath = uploadCustomPhotoPath;
+ }
+
+ public String getUploadCustomPhotoWidth() {
+ return uploadCustomPhotoWidth;
+ }
+
+ public void setUploadCustomPhotoWidth(String uploadCustomPhotoWidth) {
+ this.uploadCustomPhotoWidth = uploadCustomPhotoWidth;
+ }
+
+ public String getUploadCustomPhotoHeight() {
+ return uploadCustomPhotoHeight;
+ }
+
+ public void setUploadCustomPhotoHeight(String uploadCustomPhotoHeight) {
+ this.uploadCustomPhotoHeight = uploadCustomPhotoHeight;
+ }
+
+ public String getIdCardPhotoPath() {
+ return idCardPhotoPath;
+ }
+
+ public void setIdCardPhotoPath(String idCardPhotoPath) {
+ this.idCardPhotoPath = idCardPhotoPath;
+ }
+
+ public String getIdCardPhotoWidth() {
+ return idCardPhotoWidth;
+ }
+
+ public void setIdCardPhotoWidth(String idCardPhotoWidth) {
+ this.idCardPhotoWidth = idCardPhotoWidth;
+ }
+
+ public String getIdCardPhotoHeight() {
+ return idCardPhotoHeight;
+ }
+
+ public void setIdCardPhotoHeight(String idCardPhotoHeight) {
+ this.idCardPhotoHeight = idCardPhotoHeight;
+ }
+
+ public String getVisitorId() {
+ return visitorId;
+ }
+
+ public void setVisitorId(String visitorId) {
+ this.visitorId = visitorId;
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 36bb3d1..5ad2dde 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -37,7 +37,7 @@
public void run() {
try {
while (true) {
- AttendanceDao.getInstance().reloadLeftList(null, 0, false);
+ //AttendanceDao.getInstance().reloadLeftList(null, 0, false);
if (!BaseApplication.getInstance().deviceAvailable) {
load ();
} else {
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 75f0f10..426e767 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
@@ -1,9 +1,12 @@
package cn.com.basic.face.service;
+import android.graphics.Bitmap;
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
import cn.com.basic.face.fragment.AttenderRegisterFragment;
@@ -15,12 +18,15 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileWriter;
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
+import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.util.IdCard;
+import cn.com.basic.face.util.NativeImg;
public class RegisterMng {
@@ -214,9 +220,73 @@
}
public void sendOfflineVisitorRegisterToServer() {
- OfflineVisitorRegisterItem item = RegisterDao.getInstance().readOfflineVisitorRegister();
+ final OfflineVisitorRegisterItem item = RegisterDao.getInstance().readOfflineVisitorRegister();
+ RequestParams params = new RequestParams();
+ params.addBodyParameter(Register.FieldNames.username, item.getUsername());
+ params.addBodyParameter(Register.FieldNames.mobilePhone, item.getMobilePhone());
+ params.addBodyParameter(Register.FieldNames.genderId, item.getGenderId());
+ params.addBodyParameter(Register.FieldNames.identityTypeId, item.getIdentityTypeId());
+ params.addBodyParameter(Register.FieldNames.countryId, item.getCountryId());
+ params.addBodyParameter(Register.FieldNames.visitorTypeId, item.getVisitorTypeId());
+ params.addBodyParameter(Register.FieldNames.identifyNum, item.getIdentifyNum());
+ params.addBodyParameter(Register.FieldNames.companyId, item.getCompanyId());
+ params.addBodyParameter(Register.FieldNames.birthday, item.getBirthday());
+ params.addBodyParameter(Register.FieldNames.remark, item.getRemark());
+ params.addBodyParameter("width", item.getRawSurveillancePhotoWidth());
+ params.addBodyParameter("height", item.getRawSurveillancePhotoHeight());
+ File rawSurveillancePhoto= FileUtil.getFile(item.getRawSurveillancePhotoPath());
+ File surveillancePhoto= FileUtil.getFile(item.getSurveillancePhotoPath());
+ File uploadCustomPhoto= FileUtil.getFile(item.getUploadCustomPhotoPath());
+ File idCardPhoto= FileUtil.getFile(item.getIdCardPhotoPath());
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhoto);
+ params.addBodyParameter("surveillancePhoto", surveillancePhoto);
+ params.addBodyParameter("uploadCustomPhoto", uploadCustomPhoto);
+ params.addBodyParameter("idCardPhoto", idCardPhoto);
+ try {
+ File path = BaseApplication.getInstance().getFilesDir();
+ File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto");
+ if (!rawSurveillancePhotoFile.exists()) {
+ rawSurveillancePhotoFile.createNewFile();
+ }
+ File f0 = new File(path, "f0");
+ if (!f0.exists()) {
+ f0.createNewFile();
+ }
+ File surveillancePhotoFile = new File(path, "surveillancePhoto");
+ if (!surveillancePhotoFile.exists()) {
+ surveillancePhotoFile.createNewFile();
+ }
+ File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto");
+ if (!uploadCustomPhotoFile.exists()) {
+ uploadCustomPhotoFile.createNewFile();
+ }
+ File idCardPhotoFile = new File(path, "idCardPhoto");
+ if (!idCardPhotoFile.exists()) {
+ idCardPhotoFile.createNewFile();
+ }
+
+ FileWriter fw0 = new FileWriter(f0);
+ fw0.write("test1");
+ fw0.close();
+ params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD);
+ params.addBodyParameter("f0", f0);
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
+ params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
+ params.addBodyParameter("idCardPhoto", idCardPhotoFile);
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ VisitorRegisterFragment.getInstance().resetForm();
+ RegisterDao.getInstance().removeOfflineVisitorRegister(item);
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
}
public boolean hasOfflineVisitorRegisterData() {
@@ -225,7 +295,6 @@
public void sendOfflineAttenderRegisterToServer() {
OfflineAttenderRegisterItem item = RegisterDao.getInstance().readOfflineAttenderRegister();
-
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
index b9a32a5..4c4936e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -55,4 +55,8 @@
return null;
}
+ public void removeOfflineVisitorRegister(OfflineVisitorRegisterItem item) {
+
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java
new file mode 100644
index 0000000..1a5d958
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java
@@ -0,0 +1,14 @@
+package cn.com.basic.face.service.sqlite;
+
+public class TestDao {
+
+ public static TestDao instance = new TestDao();
+ public static TestDao getInstance() {
+ return instance;
+ }
+
+ public static void test() {
+
+ }
+
+}
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
index 0bf9b74..d2eb01d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
@@ -13,7 +13,7 @@
public static File writeToFile(String fileName, byte[] fileBytes) {
try {
- writeToFile(fileName, fileBytes, 0, fileBytes.length);
+ return writeToFile(fileName, fileBytes, 0, fileBytes.length);
}catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0