xuxiuxi

2017-04-21 86a135cc416c8582f5effbfc5a91ece236775100

git-svn-id: http://192.168.1.226/svn/proxy@526 454eff88-639b-444f-9e54-f578c98de674

 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;

@@ -71,7 +73,7 @@
        x.http().post(params, new BaseCommonCallBack() {

            public void success() {

                List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);

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

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



                List newList = new ArrayList();



@@ -92,9 +94,9 @@


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



                    list.addAll(0, newList);

                    prevList.addAll(0, newList);



                    fillBlank(list, doubleList);

                    fillBlank(prevList, doubleList);



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

                }

@@ -107,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);

@@ -141,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);