From d2f697fa887e28b86d38332e2fbde930c54fb43f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 四月 2017 10:16:49 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 66 +++++++++++++-------------------
1 files changed, 27 insertions(+), 39 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 96c2fad..a33156f 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
@@ -28,6 +28,9 @@
}
public void findSurveillanceBottomList(final boolean isVisit) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1");
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10");
@@ -56,29 +59,13 @@
});
}
- public List getRegisterList() {
- return new ArrayList();
- }
-
- public List getCheckInList() {
- return new ArrayList();
- }
-
- public void getList() {
- List registerList = new ArrayList();
- List checkInList = new ArrayList();
- List blendInList = blendIn(registerList, checkInList);
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(null, true);
- }
-
- public List blendIn(List registerList, List checkInList) {
- return null;
- }
-
public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
params.addBodyParameter("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");
x.http().post(params, new BaseCommonCallBack() {
@@ -87,6 +74,10 @@
if (item.getType() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| item.getType() == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
+ if (bitmapList != null && bitmapList.size() > 0) {
+ item.setBitmap(bitmapList.get(0));
+ }
+
List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
@@ -99,12 +90,10 @@
}
});
- if (bitmapList != null && bitmapList.size() > 0) {
- //RegisterFragment.getInstance().get_fragment_register_choose_photo().setImageBitmap(bitmapList.get(0));
- }
}
private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
+ doubleList.clear();
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
for (SurveillanceQueryItem item : list) {
@@ -116,30 +105,29 @@
}
}
- List<SurveillanceQueryItem> blenderList = new ArrayList<SurveillanceQueryItem>();
+ int max = registerList.size() > checkInList.size() ? registerList.size() : checkInList.size();
- int i = 0, m = 0, n = 0;
- for (i = 0; i < registerList.size() + checkInList.size(); i++) {
+ int m = 0, n = 0;
+ for (int i = 0; i < max * 2; i++) {
SurveillanceQueryItem item;
- if (i % 2 == 0 && m < registerList.size()) {
- item = registerList.get(m);
+ if (i % 2 == 0) {
+ if (m < registerList.size()) {
+ item = registerList.get(m);
+ } else {
+ item = getBlankItem();
+ }
m++;
} else {
- item = checkInList.get(n);
+ if (n < checkInList.size()) {
+ item = checkInList.get(n);
+ } else {
+ item = getBlankItem();
+ }
n++;
- }
- blenderList.add(item);
- }
-
- for (SurveillanceQueryItem item : blenderList) {
- if (doubleList.size() % 2 == 0 && item.getType() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- doubleList.add(getBlankItem());
- }
- if (doubleList.size() % 2 != 0 && item.getType() != Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
- doubleList.add(getBlankItem());
}
doubleList.add(item);
}
+
}
private SurveillanceQueryItem getBlankItem() {
--
Gitblit v1.8.0