From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 43067ba..89a24c0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -36,6 +36,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Visit;
@@ -221,6 +222,7 @@
params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
} else {
+ offlineVisitItem.setVisitId(UUID.randomUUID().toString());
offlineVisitItem.setVisitReasonId(visitReasonId);
offlineVisitItem.setVisitReason(fragment_check_in_right_visitor_reason.getText().toString());
offlineVisitItem.setRemark(fragment_check_in_right_remark.getText().toString());
@@ -233,7 +235,9 @@
offlineVisitItem.setCurrentStateId(""+CommonVariables.VisitType.VISITOR_ENTERED);
offlineVisitItem.setWarning(visitor.getWarning());
offlineVisitItem.setCreateTime(sdf.format(new Date()));
- offlineVisitItem.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+ //offlineVisitItem.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+ offlineVisitItem.setDeviceCompanyId(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ offlineVisitItem.setIsSynchron("N");
}
CheckInMng.getInstance().add(params, visitReasonId, offlineVisitItem);
}
@@ -285,6 +289,7 @@
}
public void checkInFromHomePage(CheckInQueryItem item) {
+ getFragment_check_in_right_visitor_cell().setVisitorInfo(item);
fragment_check_in_left_interviewee_radio.performClick();
}
--
Gitblit v1.8.0