From 2020f8a388a82b716f5956014c00b2d76a8a1a65 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 16:03:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 0747c0f..96fe076 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
@@ -23,6 +23,8 @@
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;
@@ -177,7 +179,7 @@
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.companyId, null);
params.addBodyParameter(Register.FieldNames.company, company);
params.addBodyParameter(Register.FieldNames.birthday, fragment_visitor_register_birthday.getValue());
params.addBodyParameter(Register.FieldNames.remark, fragment_visitor_register_remark.getValue());
@@ -221,7 +223,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);
@@ -231,7 +235,7 @@
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.setCompanyId(null);
offlineVisitorRegisterItem.setCompany(company);
offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
@@ -504,20 +508,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)
--
Gitblit v1.8.0