From 5838c9545e775d9f0586e2b654ed538d9a85ee51 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 20 六月 2017 09:57:31 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 170 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 66 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 dfed82e..d4af223 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
@@ -1,10 +1,15 @@
package cn.com.basic.face.service;
+import android.os.AsyncTask;
import android.util.Base64;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -15,10 +20,13 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.ResultBean;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.SurveillanceFragment;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.PostData;
+import cn.com.basic.face.util.Uploader;
public class SurveillanceMng {
@@ -58,8 +66,8 @@
if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
Date now = new Date();
Date createTime = item.getCreateTime();
- long secs = (now.getTime() - createTime.getTime()) / 1000 ;
- if (secs*1.0 / 60*5 >= 1) {
+ double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
+ if (minutes >= 5) {
continue;
}
newPrevList.add(item);
@@ -68,75 +76,105 @@
return newPrevList;
}
- public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
+ public void addBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] byteArray, int len, final String cameraInOrOut) {
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().getAndroidDevice().getCompanyId());
- params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
- params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
- List prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
- List prevAttendanceList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().getPrevList();
-
- List newVisitorList = new ArrayList();
-
- List newAttendanceList = new ArrayList();
-
- for (int i = 0; items != null && i < items.size(); i++) {
- SurveillanceQueryItem item = items.get(i);
- int type = item.getRegisterOrCheckIn();
- if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
- || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
- ) {
- //item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
- if (prevVisitorList.size() > 3 ) {
-
- }
- item.setCreateTime(new Date());
- newVisitorList.add(0, item);
- if (i < bitmapList.size()) {
- SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
- item.setBitmap(surveillanceQueryItem.getBitmap());
- item.setBase64Image(surveillanceQueryItem.getBase64Image());
- item.setNativeImg(surveillanceQueryItem.getNativeImg());
- item.setWidth(surveillanceQueryItem.getWidth());
- item.setHeight(surveillanceQueryItem.getHeight());
- }
- }
- if (type == CommonVariables.Surveillance.VISIT_ATTENDANCE_ITEM_TYPE) {
- newAttendanceList.add(item);
- if (i < bitmapList.size()) {
- SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
- item.setBitmap(surveillanceQueryItem.getBitmap());
- item.setBase64Image(surveillanceQueryItem.getBase64Image());
- item.setNativeImg(surveillanceQueryItem.getNativeImg());
- item.setWidth(surveillanceQueryItem.getWidth());
- item.setHeight(surveillanceQueryItem.getHeight());
- }
- }
+ class ConnectionTask extends AsyncTask<String, Void, String> {
+ private String json = "";
+ @Override
+ protected String doInBackground(String... urls) {
+ try {
+ PostData pd = new PostData();
+ pd.addValue("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ pd.addValue("InOrOutCamera", cameraInOrOut + "");
+ pd.addValue("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+ pd.addData("surveillancePhoto", "application/octet-stream", byteArray);
+ Uploader uploader = new Uploader("", AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD);
+ json = uploader.upload("face/Surveillance/o_upload.do", pd);
+ return json;
+ } catch (Exception e) {
+ e.printStackTrace();
}
-
- if (newVisitorList.size() > 0) {
- prevVisitorList.addAll(0, newVisitorList);
- registerTopAndCheckInBottom(prevVisitorList);
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevVisitorList);
- }
-
- if (newAttendanceList.size() > 0) {
- prevAttendanceList.addAll(0, newAttendanceList);
- if (prevAttendanceList.size() > 20) {
- prevAttendanceList = prevAttendanceList.subList(0, 20);
- }
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(prevAttendanceList);
- }
-
+ return null;
}
- });
+
+ @Override
+ protected void onPostExecute(String result) {
+ try {
+
+ System.out.println("json="+result);
+ ResultBean resultBean = JSON.parseObject(result, ResultBean.class);
+ if (resultBean == null) {
+ System.out.println("resultBean="+resultBean);
+ return;
+ }
+ Object data = resultBean.getData();
+ if (data instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) data;
+ List<SurveillanceQueryItem> items = JSON.parseArray(jsonArray.toJSONString(), SurveillanceQueryItem.class);
+
+ List prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
+ List prevAttendanceList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().getPrevList();
+
+ List newVisitorList = new ArrayList();
+
+ List newAttendanceList = new ArrayList();
+
+ for (int i = 0; items != null && i < items.size(); i++) {
+ SurveillanceQueryItem item = items.get(i);
+ int type = item.getRegisterOrCheckIn();
+ if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
+ || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
+ ) {
+ item.setCreateTime(new Date());
+ newVisitorList.add(0, item);
+ if (i < bitmapList.size()) {
+ SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
+ item.setBitmap(surveillanceQueryItem.getBitmap());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setNativeImg(surveillanceQueryItem.getNativeImg());
+ item.setWidth(surveillanceQueryItem.getWidth());
+ item.setHeight(surveillanceQueryItem.getHeight());
+ }
+ }
+ if (type == CommonVariables.Surveillance.VISIT_ATTENDANCE_ITEM_TYPE) {
+ newAttendanceList.add(item);
+ if (i < bitmapList.size()) {
+ SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
+ item.setBitmap(surveillanceQueryItem.getBitmap());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setNativeImg(surveillanceQueryItem.getNativeImg());
+ item.setWidth(surveillanceQueryItem.getWidth());
+ item.setHeight(surveillanceQueryItem.getHeight());
+ }
+ }
+ System.out.println("inOutCamera="+item.getInOrOutCamera());
+ }
+
+ if (newVisitorList.size() > 0) {
+ prevVisitorList.addAll(0, newVisitorList);
+ registerTopAndCheckInBottom(prevVisitorList);
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevVisitorList);
+ }
+
+ if (newAttendanceList.size() > 0) {
+ prevAttendanceList.addAll(0, newAttendanceList);
+ if (prevAttendanceList.size() > 20) {
+ prevAttendanceList = prevAttendanceList.subList(0, 20);
+ }
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(prevAttendanceList);
+ }
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ ConnectionTask task = new ConnectionTask();
+ String[] params = new String[2];
+ task.execute(params);
}
public List getSurveillancePhotoList(long selectedId) {
--
Gitblit v1.8.0