xuxiuxi

2017-05-03 b7fd23fb1b9d04eb8fa0d97a5d9747e145605612

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

@@ -44,9 +44,12 @@
        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();

                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 newList = new ArrayList();

                List newVisitorList = new ArrayList();



                List newAttendanceList = new ArrayList();



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

                    SurveillanceQueryItem item = items.get(i);

@@ -54,21 +57,39 @@
                    if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE

                            || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE

                            ) {

                        newList.add(0, item);

                        newVisitorList.add(0, item);

                        if (i < bitmapList.size()) {

                            SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);

                            item.setBitmap(surveillanceQueryItem.getBitmap());

                            item.setBase64Image(surveillanceQueryItem.getBase64Image());

//                            item.setBase64Image(surveillanceQueryItem.getBase64Image());

                            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.setWidth(surveillanceQueryItem.getWidth());

                            item.setHeight(surveillanceQueryItem.getHeight());

                        }

                    }

                }



                if (newList.size() > 0) {

                    prevList.addAll(0, newList);

                    registerTopAndCheckInBottom(prevList);

                    SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(prevList);

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

                }



            }

@@ -80,8 +101,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) {