From 79e9fbb72e492fd591e54ae8104b32eb29d63e78 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 10:55:11 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 16 +++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 49 ++++++++++++------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 17 ++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 4 +-
6 files changed, 52 insertions(+), 38 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 224269d..6b54d6b 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
@@ -13,8 +13,6 @@
import org.xutils.x;
-import cn.com.basic.face.discern.entity.Device;
-
/**
* Created by zhangbo on 2017/2/15.
*/
@@ -27,17 +25,17 @@
return application;
}
- private Device place;
+ private Device device;
- public void setPlace(Device place) {
- this.place = place;
+ public void setDevice(Device device) {
+ this.device = device;
}
- public Device getPlace() {
- if (place == null) {
- place = new Device();
+ public Device getDevice() {
+ if (device == null) {
+ device = new Device();
}
- return place;
+ return device;
}
@Override
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 163be82..e50cc31 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
@@ -3,40 +3,39 @@
public class CommonVariables {
public static class ImageType {
- private static final int FACE1 = 1; //姝ｉ潰鐓х墖1锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- private static final int FACE2 = 2; //姝ｉ潰鐓х墖2锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- private static final int FACE_L_SIDE = 3; //锛堜富浣撹瀵燂紝<=45搴︼級宸︿晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- private static final int FACE_R_SIDE = 4; //锛堜富浣撹瀵燂紝<=45搴︼級鍙充晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- private static final int FACE_T_SIDE = 5; //锛堜富浣撹瀵燂紝<=45搴︼級椤朵晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- private static final int FACE_B_SIDE = 6; //锛堜富浣撹瀵燂紝<=45搴︼級搴曚晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- private static final int FACE_UPLOADED = 7; //涓婁紶鐓х墖锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- private static final int ICON = 8; // 鍥炬爣锛堝瓨鏀惧埌Image琛級
- private static final int IDENTIFICATION_CARD = 9; //韬唤璇佺収鐗囷紙瀛樻斁鍒癐mage琛級
- private static final int BUSINESS_CARD = 10; //鍚嶇墖鐓х墖锛堝瓨鏀惧埌Image琛級
- private static final int OTHER_CARD = 11; //鍏朵粬璇佷欢锛堝瓨鏀惧埌Image琛級
+ public static final int FACE1 = 101; //姝ｉ潰鐓х墖1锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int FACE2 = 102; //姝ｉ潰鐓х墖2锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int FACE_L_SIDE = 103; //锛堜富浣撹瀵燂紝<=45搴︼級宸︿晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_R_SIDE = 104; //锛堜富浣撹瀵燂紝<=45搴︼級鍙充晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_T_SIDE = 105; //锛堜富浣撹瀵燂紝<=45搴︼級椤朵晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_B_SIDE = 106; //锛堜富浣撹瀵燂紝<=45搴︼級搴曚晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_UPLOADED = 107; //涓婁紶鐓х墖锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int ICON = 108; // 鍥炬爣锛堝瓨鏀惧埌Image琛級
+ public static final int IDENTIFICATION_CARD = 109; //韬唤璇佺収鐗囷紙瀛樻斁鍒癐mage琛級
+ public static final int BUSINESS_CARD = 110; //鍚嶇墖鐓х墖锛堝瓨鏀惧埌Image琛級
+ public static final int OTHER_CARD = 111; //鍏朵粬璇佷欢锛堝瓨鏀惧埌Image琛級
}
public static class Type {
- private static final int NORMAL_VISITOR = 1; //鏅�氳瀹�
- private static final int BLACK_LIST = 2; //榛戝悕鍗�
- private static final int TEACHER = 3; //鏁欏笀
- private static final int STUDENT = 4; //瀛︾敓
- private static final int LEADER = 5; //棰嗗骞查儴
+ public static final int NORMAL_VISITOR = 201; //鏅�氳瀹�
+ public static final int BLACK_LIST = 202; //榛戝悕鍗�
+ public static final int TEACHER = 203; //鏁欏笀
+ public static final int STUDENT = 204; //瀛︾敓
+ public static final int LEADER = 205; //棰嗗骞查儴
}
-
public static class StatusID {
- private static final int NO_REGISTER = 1; //鏈敞鍐�
- private static final int REGISTERED = 2; //宸叉敞鍐岋紙璁垮锛�
- private static final int VISITOR_ENTERED = 3; //鏉ヨ鐧昏锛堣瀹級
- private static final int VISITOR_EXITED = 4; //绛剧锛堣瀹級
- private static final int EMP_ENTERED = 5; //绛惧埌锛堝憳宸ワ級
- private static final int EMP_EXITED = 6; //绛鹃��锛堝憳宸ワ級
+ public static final int NO_REGISTER = 301; //鏈敞鍐�
+ public static final int REGISTERED = 302; //宸叉敞鍐岋紙璁垮锛�
+ public static final int VISITOR_ENTERED = 303; //鏉ヨ鐧昏锛堣瀹級
+ public static final int VISITOR_EXITED = 304; //绛剧锛堣瀹級
+ public static final int EMP_ENTERED = 305; //绛惧埌锛堝憳宸ワ級
+ public static final int EMP_EXITED = 306; //绛鹃��锛堝憳宸ワ級
}
public static class EnterOrExit {
- private static final int ENTER = 1; //杩�
- private static final int EXIT = 2; //鍑�
+ public static final int ENTER = 401; //杩�
+ public static final int EXIT = 402; //鍑�
}
public class DictionaryType {
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 4b19ae4..fc43820 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
@@ -12,8 +12,10 @@
import com.bsk.zhangbo.demoforbsk.R;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.dialog.SelectDialog;
+import cn.com.basic.face.discern.entity.VisitDetail;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.service.DictionaryMng;
@@ -29,7 +31,9 @@
import org.xutils.http.RequestParams;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import cn.com.basic.face.discern.common.CommonVariables;
@@ -141,6 +145,11 @@
Toast.makeText(MainActivity.getInstance(), "璇烽�夋嫨琚浜哄憳", Toast.LENGTH_SHORT).show();
return;
}
+ String right_visitor_reason = fragment_check_in_right_visitor_reason.getText().toString().trim();
+ if (right_visitor_reason.length() == 0) {
+ Toast.makeText(MainActivity.getInstance(), "鎷滆浜嬬敱涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
RequestParams params = new RequestParams();
params.addBodyParameter(Visit.FieldNames.visitReasonId, DictionaryMng.getInstance().getId(fragment_check_in_right_visitor_reason.getText().toString()));
params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());
@@ -148,6 +157,14 @@
params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId());
params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId());
params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date()));
+ params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.StatusID.VISITOR_ENTERED);
+
+ //visit detail
+ params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.StatusID.VISITOR_ENTERED);
+ params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
+ params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
CheckInMng.getInstance().add(params);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 8bb3875..83b64d3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -40,9 +40,9 @@
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.REGISTER_QUERY);
if (isVisitorList) {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
+ params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
} else {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId());
+ params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId());
}
params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
x.http().post(params, new BaseCommonCallBack() {
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 43af7c8..8af3387 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
@@ -30,7 +30,7 @@
public void success() {
List<Device> places = resultBean.getListBeanOfType(Device.class);
if (places.size() > 0) {
- BaseApplication.getInstance().setPlace(places.get(0));
+ BaseApplication.getInstance().setDevice(places.get(0));
} else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 1594897..87f08fc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -23,7 +23,7 @@
public void findSupervisoryBottomList(final boolean isVisit) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
-// params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
+// params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class);
--
Gitblit v1.8.0