From af0628ca822cf2473fb3c119732474fa1fe89214 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 13:06:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 173 ++++++++++++++++++++++++++++++------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 5 -
3 files changed, 126 insertions(+), 58 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index a37f4ef..c4186bd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -20,11 +20,13 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.SurveillanceFragment;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.BaseFragment;
import cn.com.basic.face.dialog.SurveillancePhotoDialog;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
@@ -55,6 +57,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import cn.com.basic.face.base.MainActivity;
@@ -165,62 +168,130 @@
return;
}
- params.addBodyParameter(Register.FieldNames.username, name);
- params.addBodyParameter(Register.FieldNames.mobilePhone, phone);
- params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(fragment_visitor_register_gender.getValue()));
- params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(fragment_visitor_register_id_class.getValue()));
- params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
- params.addBodyParameter(Register.FieldNames.visitorTypeId, DictionaryMng.getInstance().getId(visitor_type));
- params.addBodyParameter(Register.FieldNames.identifyNum, fragment_visitor_register_id_num.getValue());
- params.addBodyParameter(Register.FieldNames.companyId, company);
- params.addBodyParameter(Register.FieldNames.birthday, fragment_visitor_register_birthday.getValue());
- params.addBodyParameter(Register.FieldNames.remark, fragment_visitor_register_remark.getValue());
+ OfflineVisitorRegisterItem offlineVisitorRegisterItem = new OfflineVisitorRegisterItem();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.addBodyParameter(Register.FieldNames.username, name);
+ params.addBodyParameter(Register.FieldNames.mobilePhone, phone);
+ params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(fragment_visitor_register_gender.getValue()));
+ params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(fragment_visitor_register_id_class.getValue()));
+ params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
+ params.addBodyParameter(Register.FieldNames.visitorTypeId, DictionaryMng.getInstance().getId(visitor_type));
+ params.addBodyParameter(Register.FieldNames.identifyNum, fragment_visitor_register_id_num.getValue());
+ params.addBodyParameter(Register.FieldNames.companyId, company);
+ params.addBodyParameter(Register.FieldNames.birthday, fragment_visitor_register_birthday.getValue());
+ params.addBodyParameter(Register.FieldNames.remark, fragment_visitor_register_remark.getValue());
- if (surveillanceQueryItem_selectPhoto != null) {
- params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
- params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
- fragment_visitor_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
+ if (surveillanceQueryItem_selectPhoto != null) {
+ params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
+ params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
+ fragment_visitor_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
- NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
- byte[] imageBytes = new byte[nativeImg.size];
- for (int i = 0; i < nativeImg.size; i++) {
- imageBytes[i] = nativeImg.image[i];
+ NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
+ byte[] imageBytes = new byte[nativeImg.size];
+ for (int i = 0; i < nativeImg.size; i++) {
+ imageBytes[i] = nativeImg.image[i];
+ }
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", imageBytes));
+ } else {
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", new byte[]{}));
}
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", imageBytes));
+
+ if (fragment_visitor_register_surveillance_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", imageBytes));
+ } else {
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", new byte[]{}));
+ }
+
+ if (fragment_visitor_register_upload_custom_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", imageBytes));
+ } else {
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", new byte[]{}));
+ }
+
+ if (fragment_visitor_register_id_card_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", imageBytes));
+ } else {
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", new byte[]{}));
+ }
} else {
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", new byte[]{}));
+ offlineVisitorRegisterItem.setUsername(name);
+ offlineVisitorRegisterItem.setMobilePhone(phone);
+ offlineVisitorRegisterItem.setGenderId(DictionaryMng.getInstance().getId(fragment_visitor_register_gender.getValue()));
+ offlineVisitorRegisterItem.setIdentityTypeId(DictionaryMng.getInstance().getId(fragment_visitor_register_id_class.getValue()));
+ offlineVisitorRegisterItem.setCountryId(DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
+ offlineVisitorRegisterItem.setVisitorTypeId(DictionaryMng.getInstance().getId(visitor_type));
+ offlineVisitorRegisterItem.setIdentifyNum(fragment_visitor_register_id_num.getValue());
+ offlineVisitorRegisterItem.setCompanyId(company);
+ offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
+ offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
+
+ String rawSurveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
+ byte[] rawSurveillancePhotoBytes = new byte[]{};
+
+ if (surveillanceQueryItem_selectPhoto != null) {
+ offlineVisitorRegisterItem.setRawSurveillancePhotoWidth(surveillanceQueryItem_selectPhoto.getWidth());
+ offlineVisitorRegisterItem.setRawSurveillancePhotoHeight(surveillanceQueryItem_selectPhoto.getHeight());
+ fragment_visitor_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
+
+ NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
+ byte[] imageBytes = new byte[nativeImg.size];
+ for (int i = 0; i < nativeImg.size; i++) {
+ imageBytes[i] = nativeImg.image[i];
+ }
+ rawSurveillancePhotoBytes = imageBytes;
+ }
+ FileUtil.writeToFile(rawSurveillancePhotoPath, rawSurveillancePhotoBytes);
+ offlineVisitorRegisterItem.setRawSurveillancePhotoPath(rawSurveillancePhotoPath);
+
+ String surveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
+ byte[] surveillancePhotoBytes = new byte[]{};
+ if (fragment_visitor_register_surveillance_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ surveillancePhotoBytes = imageBytes;
+ }
+ FileUtil.writeToFile(surveillancePhotoPath, surveillancePhotoBytes);
+ offlineVisitorRegisterItem.setSurveillancePhotoPath(surveillancePhotoPath);
+
+ String uploadCustomPhotoPath = UUID.randomUUID().toString()+".bmp";
+ byte[] uploadCustomPhotoBytes = new byte[]{};
+ if (fragment_visitor_register_upload_custom_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ uploadCustomPhotoBytes = imageBytes;
+ }
+ FileUtil.writeToFile(uploadCustomPhotoPath, uploadCustomPhotoBytes);
+ offlineVisitorRegisterItem.setUploadCustomPhotoPath(uploadCustomPhotoPath);
+
+ String idCardPhotoPath = UUID.randomUUID().toString()+".bmp";
+ byte[] idCardPhotoBytes = new byte[]{};
+ if (fragment_visitor_register_id_card_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_visitor_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ idCardPhotoBytes = imageBytes;
+ }
+ FileUtil.writeToFile(idCardPhotoPath, idCardPhotoBytes);
+ offlineVisitorRegisterItem.setIdCardPhotoPath(idCardPhotoPath);
}
-
- if (fragment_visitor_register_surveillance_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_visitor_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", imageBytes));
- } else {
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", new byte[]{}));
- }
-
- if (fragment_visitor_register_upload_custom_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_visitor_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", imageBytes));
- } else {
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", new byte[]{}));
- }
-
- if (fragment_visitor_register_id_card_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_visitor_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", imageBytes));
- } else {
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", new byte[]{}));
- }
- RegisterMng.getInstance().add(params, idCardHeadPath);
+ RegisterMng.getInstance().add(params, idCardHeadPath, offlineVisitorRegisterItem);
}
public void set_fragment_visitor_register_surveillance_photo(SurveillanceQueryItem item) {
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 4cb677e..ea03896 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
@@ -36,7 +36,7 @@
return instance;
}
- public void add(RequestParams params, String idCardHeadPhoto) {
+ public void add(RequestParams params, String idCardHeadPhoto, OfflineVisitorRegisterItem offlineVisitorRegisterItem) {
if (!BaseApplication.deviceAvailable) {
return;
}
@@ -91,7 +91,7 @@
e.printStackTrace();
}
} else {
- RegisterDao.getInstance().add(params, idCardHeadPhoto);
+ RegisterDao.getInstance().add(offlineVisitorRegisterItem);
VisitDao.getInstance().findLeftVisitorList("", 1);
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
VisitorRegisterFragment.getInstance().resetForm();
@@ -213,7 +213,7 @@
e.printStackTrace();
}
} else {
- RegisterDao.getInstance().add(params, idCardHeadPhoto);
+ RegisterDao.getInstance().addAttender(params, idCardHeadPhoto);
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
}
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 53ea98e..a3be79e 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
@@ -22,12 +22,9 @@
/**
* 璁垮娉ㄥ唽
- * @param params
- * @param idCardHeadPhoto
* @return
*/
- public boolean add(RequestParams params, String idCardHeadPhoto) {
- OfflineVisitorRegisterItem item = null;
+ public boolean add(OfflineVisitorRegisterItem item) {
String sql =
"INSERT INTO offline_visitor_register (\n" +
" visitor_id,\n" +
--
Gitblit v1.8.0