From e09e9f8a34cbc99a33dfa9ef1792b0025575c3a8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 11:41:19 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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 3c9d7cb..ff80b6e 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
@@ -13,20 +13,18 @@
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
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.dialog.VisitorRegisterSelectPhotoDialog;
+import cn.com.basic.face.dialog.VisitorRegisterUploadPhotoDialog;
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;
@@ -35,7 +33,7 @@
import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.util.IdCard;
-import cn.com.basic.face.util.IdCardReaderThread;
+import cn.com.basic.face.thread.IdCardReaderThread;
import cn.com.basic.face.util.NativeImg;
import cn.com.basic.face.util.OkClickedListener;
@@ -143,6 +141,11 @@
public void fragment_visitor_register_save_click(View v) {
RequestParams params = new RequestParams();
+ if (surveillanceQueryItem_selectPhoto == null) {
+ Toast.makeText(MainActivity.getInstance(), "璇烽�夋嫨鐓х墖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+
String name = fragment_visitor_register_name.getValue();
if (name.trim().length() <= 0) {
Toast.makeText(MainActivity.getInstance(), "濮撳悕涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
@@ -221,7 +224,9 @@
params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", new byte[]{}));
}
} else {
+ offlineVisitorRegisterItem.setRegisterId(UUID.randomUUID().toString());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ offlineVisitorRegisterItem.setDeviceCompanyId(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
offlineVisitorRegisterItem.setIsSynchron("N");
offlineVisitorRegisterItem.setCreateTime(sdf.format(new Date()));
offlineVisitorRegisterItem.setUsername(name);
@@ -236,7 +241,7 @@
offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
- String rawSurveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
+ String rawSurveillancePhotoPath = UUID.randomUUID().toString()+"";
byte[] rawSurveillancePhotoBytes = new byte[]{};
if (surveillanceQueryItem_selectPhoto != null) {
@@ -254,7 +259,7 @@
FileUtil.writeToFile(rawSurveillancePhotoPath, rawSurveillancePhotoBytes);
offlineVisitorRegisterItem.setRawSurveillancePhotoPath(rawSurveillancePhotoPath);
- String surveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
+ String surveillancePhotoPath = UUID.randomUUID().toString()+"";
byte[] surveillancePhotoBytes = new byte[]{};
if (fragment_visitor_register_surveillance_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -264,7 +269,7 @@
FileUtil.writeToFile(surveillancePhotoPath, surveillancePhotoBytes);
offlineVisitorRegisterItem.setSurveillancePhoto(surveillancePhotoPath);
- String uploadCustomPhotoPath = UUID.randomUUID().toString()+".bmp";
+ String uploadCustomPhotoPath = UUID.randomUUID().toString()+"";
byte[] uploadCustomPhotoBytes = new byte[]{};
if (fragment_visitor_register_upload_custom_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -274,7 +279,7 @@
FileUtil.writeToFile(uploadCustomPhotoPath, uploadCustomPhotoBytes);
offlineVisitorRegisterItem.setUploadCustomPhoto(uploadCustomPhotoPath);
- String idCardPhotoPath = UUID.randomUUID().toString()+".bmp";
+ String idCardPhotoPath = UUID.randomUUID().toString()+"";
byte[] idCardPhotoBytes = new byte[]{};
if (fragment_visitor_register_id_card_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -284,7 +289,7 @@
FileUtil.writeToFile(idCardPhotoPath, idCardPhotoBytes);
offlineVisitorRegisterItem.setIdCardPhoto(idCardPhotoPath);
}
- RegisterMng.getInstance().add(params, idCardHeadPath, offlineVisitorRegisterItem);
+ RegisterMng.getInstance().addVisitor(params, idCardHeadPath, offlineVisitorRegisterItem);
}
public void set_fragment_visitor_register_surveillance_photo(SurveillanceQueryItem item) {
@@ -504,20 +509,16 @@
@OnClick(R.id.fragment_visitor_register_surveillance_photo)
public void fragment_visitor_register_surveillance_photo_click(View view) {
- SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.SELECT_PHOTO;
- new SurveillancePhotoDialog(fragment_visitor_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedSurveillancePhotoId);
+ VisitorRegisterSelectPhotoDialog.getInstance().show();
+ }
+
+ public FrameLayout get_fragment_visitor_register_linear_layout() {
+ return fragment_visitor_register_linear_layout;
}
@OnClick(R.id.fragment_visitor_register_upload_custom_photo)
public void fragment_visitor_register_upload_custom_photo_click(View view) {
- SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.UPLOAD_PHOTO;
- new SurveillancePhotoDialog(fragment_visitor_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedCustomPhotoId);
+ VisitorRegisterUploadPhotoDialog.getInstance().show();
}
@OnClick(R.id.fragment_visitor_register_id_card_photo)
@@ -558,6 +559,7 @@
idCardReaderThread = new IdCardReaderThread();
idCardReaderThread.start();
}
+ setupUI(getView());
}
public void fillFormWithIdCard(IdCard idCard) {
--
Gitblit v1.8.0