xuxiuxi
2017-04-13 87aa0b038e5a81bf7052a4d69db7dcba97c33f2f


git-svn-id: http://192.168.1.226/svn/proxy@440 454eff88-639b-444f-9e54-f578c98de674
3个文件已修改
34 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -38,10 +38,10 @@
        @Override
        public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
            switch (((SurveillanceQueryItem)getList().get(position)).getType()){
                case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
                case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
                    RegisterCellViewFillData(viewHolder,position);
                    break;
                case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE:
                case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
                    checkInCellViewFillData(viewHolder,position);
                    break;
            }
@@ -50,14 +50,14 @@
        @Override
        public int getRecycleViewItemType(int position) {
            switch (((SurveillanceQueryItem)getList().get(position)).getType()) {
                case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
                    return Constant.Supervisory.REGISTER_CELL_VIEW_INDEX;
                case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE:
                    return Constant.Supervisory.CHECK_IN_CELL_VIEW_INDEX;
                case Constant.Supervisory.VISIT_BLANK_ITEM_TYPE:
                    return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX;
                case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
                    return Constant.Surveillance.REGISTER_CELL_VIEW_INDEX;
                case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
                    return Constant.Surveillance.CHECK_IN_CELL_VIEW_INDEX;
                case Constant.Surveillance.VISIT_BLANK_ITEM_TYPE:
                    return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX;
            }
            return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX;
            return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX;
        }
        /**
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -31,9 +31,9 @@
                    int i = 0;
                    for (SurveillanceQueryItem item : list) {
                        if (i % 5 == 0) {
                            item.setType(Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE);
                            item.setType(Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE);
                        } else {
                            item.setType(Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE);
                            item.setType(Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
                        }
                        i++;
                    }
@@ -55,10 +55,10 @@
        List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
        for (SurveillanceQueryItem item : list) {
            if (item.getType() == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
            if (item.getType() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
                registerList.add(item);
            }
            if (item.getType() == Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
            if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
                checkInList.add(item);
            }
        }
@@ -79,10 +79,10 @@
        }
        for (SurveillanceQueryItem item : blenderList) {
            if (doubleList.size() % 2 == 0 && item.getType() != Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
            if (doubleList.size() % 2 == 0 && item.getType() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
                doubleList.add(getBlankItem());
            }
            if (doubleList.size() % 2 != 0 && item.getType() != Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
            if (doubleList.size() % 2 != 0 && item.getType() != Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
                doubleList.add(getBlankItem());
            }
            doubleList.add(item);
@@ -91,7 +91,7 @@
    private SurveillanceQueryItem getBlankItem() {
        SurveillanceQueryItem blankItem = new SurveillanceQueryItem();
        blankItem.setType(Constant.Supervisory.VISIT_BLANK_ITEM_TYPE);
        blankItem.setType(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
        return blankItem;
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -13,7 +13,7 @@
        public static final int VISITOR_ROW = 2;
    }
    public static class Supervisory {
    public static class Surveillance {
        public static final int VISIT_REGISTER_ITEM_TYPE = 1;
        public static final int VISIT_CHECK_IN_ITEM_TYPE = 2;
        public static final int VISIT_BLANK_ITEM_TYPE = 3;