development-history/proxy.git

			@@ -1,22 +1,32 @@
			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;
			import java.util.List;
			import java.util.Set;

			import cn.com.basic.face.base.BaseApplication;
			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 {

			@@ -26,53 +36,186 @@
			return instance;
			}

			public void findSurveillanceBottomList(final boolean isVisit) {
			if (!BaseApplication.deviceAvailable) {
			return;
			public static class SurveillanceListThread extends Thread {
			@Override
			public void run() {
			try {
			while (true) {
			MainActivity.getInstance().runOnUiThread(new Runnable() {
			@Override
			public void run() {
			List prevList = SurveillanceMng.getInstance().removeTimeoutItem(null);
			SurveillanceMng.getInstance().registerTopAndCheckInBottom(prevList);
			SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevList);
			}
			});
			Thread.sleep(1000605);
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}

			public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
			private List<SurveillanceQueryItem> removeTimeoutItem(List<SurveillanceQueryItem> prevList) {
			if (prevList == null) {
			prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
			}
			List<SurveillanceQueryItem> newPrevList = new ArrayList();
			for (SurveillanceQueryItem item : prevList) {
			if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
			Date now = new Date();
			Date createTime = item.getCreateTime();
			double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
			if (minutes >= 5) {
			continue;
			}
			newPrevList.add(item);
			}
			}
			return newPrevList;
			}

			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().getDevice().getDeviceCompanyId());
			params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
			params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
			x.http().post(params, new BaseCommonCallBack() {
			public void success() {
			List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
			List prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
			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();
			}
			return null;
			}

			List newList = new ArrayList();
			@Override
			protected void onPostExecute(String result) {
			try {

			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
			) {
			newList.add(0, item);
			if (i < bitmapList.size()) {
			SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
			item.setBitmap(surveillanceQueryItem.getBitmap());
			item.setBase64Image(surveillanceQueryItem.getBase64Image());
			item.setWidth(surveillanceQueryItem.getWidth());
			item.setHeight(surveillanceQueryItem.getHeight());
			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();
			}

			if (newList.size() > 0) {
			prevList.addAll(0, newList);
			registerTopAndCheckInBottom(prevList);
			SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(prevList);
			}

			}
			});

			}
			ConnectionTask task = new ConnectionTask();
			String[] params = new String[2];
			task.execute(params);
			}

			public List getSurveillancePhotoList(long selectedId) {
			List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
			List<SurveillanceQueryItem> registerList = new ArrayList();
			int countPerRow = 9;
			for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
			if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
			if (registerList.size() > countPerRow*2) {
			break;
			}
			if (surveillanceQueryItem.getIdForSelect() == selectedId) {
			surveillanceQueryItem.setSurveillancePhotoSelected(true);
			} else {
			surveillanceQueryItem.setSurveillancePhotoSelected(false);
			}
			registerList.add(surveillanceQueryItem);
			}
			}
			SurveillanceQueryItem item;
			List items = new ArrayList();
			int m = 0, n = 0;
			for (int i = 0; i < countPerRow*2; i++) {
			if (i % 2 == 0) {
			if (m < registerList.size()) {
			item = registerList.get(m);
			m++;
			} else {
			item = getBlankItem();
			}
			} else {
			if (n < registerList.size() - countPerRow) {
			item = registerList.get(countPerRow+n);
			n++;
			} else {
			item = getBlankItem();
			}
			}
			items.add(item);
			}
			return items;
			}

			private void registerTopAndCheckInBottom(List<SurveillanceQueryItem> list) {
			@@ -80,8 +223,8 @@
			List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
			removeDuplicateCheckIn(list);
			int i1 = 0, j = 0;
			int maxRegister = 20;
			int maxCheckIn = 20;
			int maxRegister = 50;
			int maxCheckIn = 50;
			for (SurveillanceQueryItem item : list) {
			if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
			if (i1 < maxRegister) {