From 4cc6fd96f65f992f0a2071f044f97b3a43ff4e00 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 15:53:00 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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..1360449 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
@@ -20,10 +20,10 @@
return instance;
}
- public void findSupervisoryBottomList(final boolean isVisit) {
+ public void findSurveillanceBottomList(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);
@@ -31,9 +31,9 @@
int i = 0;
for (SurveillanceQueryItem item : list) {
if (i % 5 == 0) {
- item.setType(Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE);
+ item.setType(Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE);
} else {
- item.setType(Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE);
+ item.setType(Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
}
i++;
}
@@ -55,10 +55,10 @@
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
for (SurveillanceQueryItem item : list) {
- if (item.getType() == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
+ if (item.getType() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
registerList.add(item);
}
- if (item.getType() == Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
checkInList.add(item);
}
}
@@ -79,10 +79,10 @@
}
for (SurveillanceQueryItem item : blenderList) {
- if (doubleList.size() % 2 == 0 && item.getType() != Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
+ if (doubleList.size() % 2 == 0 && item.getType() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
doubleList.add(getBlankItem());
}
- if (doubleList.size() % 2 != 0 && item.getType() != Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (doubleList.size() % 2 != 0 && item.getType() != Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
doubleList.add(getBlankItem());
}
doubleList.add(item);
@@ -91,7 +91,7 @@
private SurveillanceQueryItem getBlankItem() {
SurveillanceQueryItem blankItem = new SurveillanceQueryItem();
- blankItem.setType(Constant.Supervisory.VISIT_BLANK_ITEM_TYPE);
+ blankItem.setType(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
return blankItem;
}
--
Gitblit v1.8.0