xuxiuxi

2017-04-21 86a135cc416c8582f5effbfc5a91ece236775100

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java

@@ -8,7 +8,9 @@


import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;

import java.util.Set;



import cn.com.basic.face.base.BaseApplication;

import cn.com.basic.face.discern.common.BaseCommonCallBack;

@@ -28,6 +30,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");

@@ -57,27 +62,41 @@
    }



    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+"");

        params.addBodyParameter("InOrOutCamera", CommonVariables.Camera.IN+"");

        x.http().post(params, new BaseCommonCallBack() {

            public void success() {

                SurveillanceQueryItem item = getBean(SurveillanceQueryItem.class);

                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> items = getList(SurveillanceQueryItem.class);

                List prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();



                List newList = new ArrayList();



                for (int i = 0; items != null && i < items.size(); i++) {

                    SurveillanceQueryItem item = items.get(i);

                    int type = item.getType();

                    if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE

                            || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE

                            ) {

                        newList.add(0, item);

                        if (i < bitmapList.size()) {

                            item.setBitmap(bitmapList.get(i));

                        }

                    }

                }



                if (newList.size() > 0) {



                    List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();



                    List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();

                    list.add(0, item);

                    prevList.addAll(0, newList);



                    fillBlank(list, doubleList);

                    fillBlank(prevList, doubleList);



                    SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);

                }

@@ -90,6 +109,7 @@
        doubleList.clear();

        List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();

        List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();

        removeDuplicate(list);

        for (SurveillanceQueryItem item : list) {

            if (item.getType() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {

                registerList.add(item);

@@ -124,6 +144,22 @@


    }



    private void removeDuplicate(List<SurveillanceQueryItem> list) {

        List itemsToRemove = new ArrayList();

        Set<String> registerIds = new HashSet<>();

        for (SurveillanceQueryItem item : list) {

            if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {

                if (registerIds.contains(item.getRegisterId())) {

                    itemsToRemove.add(item);

                } else {

                    registerIds.add(item.getRegisterId());

                }



            }

        }

        list.removeAll(itemsToRemove);

    }



    private SurveillanceQueryItem getBlankItem() {

        SurveillanceQueryItem blankItem = new SurveillanceQueryItem();

        blankItem.setType(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);