From 87aa0b038e5a81bf7052a4d69db7dcba97c33f2f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 14:14:19 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 14 +++++++-------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 18 +++++++++---------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
index 4bbe593..9d8b6ef 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -38,10 +38,10 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
switch (((SurveillanceQueryItem)getList().get(position)).getType()){
- case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
+ case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
RegisterCellViewFillData(viewHolder,position);
break;
- case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE:
+ case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
checkInCellViewFillData(viewHolder,position);
break;
}
@@ -50,14 +50,14 @@
@Override
public int getRecycleViewItemType(int position) {
switch (((SurveillanceQueryItem)getList().get(position)).getType()) {
- case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
- return Constant.Supervisory.REGISTER_CELL_VIEW_INDEX;
- case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE:
- return Constant.Supervisory.CHECK_IN_CELL_VIEW_INDEX;
- case Constant.Supervisory.VISIT_BLANK_ITEM_TYPE:
- return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX;
+ case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
+ return Constant.Surveillance.REGISTER_CELL_VIEW_INDEX;
+ case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
+ return Constant.Surveillance.CHECK_IN_CELL_VIEW_INDEX;
+ case Constant.Surveillance.VISIT_BLANK_ITEM_TYPE:
+ return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX;
}
- return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX;
+ return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX;
}
/**
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 c6b3a1f..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
@@ -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;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
index 1448c9e..0f70cc3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -13,7 +13,7 @@
public static final int VISITOR_ROW = 2;
}
- public static class Supervisory {
+ public static class Surveillance {
public static final int VISIT_REGISTER_ITEM_TYPE = 1;
public static final int VISIT_CHECK_IN_ITEM_TYPE = 2;
public static final int VISIT_BLANK_ITEM_TYPE = 3;
--
Gitblit v1.8.0