xuxiuxi

2017-04-25 d4445e538a4fe99f21b4030f96852a51ce4fca8a

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

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java

@@ -188,7 +188,7 @@
            fragment_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);

            byte[] imageBytes = byteArrayOutputStream.toByteArray();

            String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);

            params.addBodyParameter("choosePhoto", encodedImage);

            params.addBodyParameter(Register.FieldNames.surveillancePhoto, encodedImage);

        }



        if (fragment_register_upload_custom_photo_img != null) {

@@ -196,7 +196,7 @@
            fragment_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);

            byte[] imageBytes = byteArrayOutputStream.toByteArray();

            String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);

            params.addBodyParameter("uploadPhoto", encodedImage);

            params.addBodyParameter(Register.FieldNames.uploadCustomPhoto, encodedImage);

        }



        if (fragment_register_id_card_photo_img != null) {

@@ -204,7 +204,7 @@
            fragment_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);

            byte[] imageBytes = byteArrayOutputStream.toByteArray();

            String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);

            params.addBodyParameter("idPhoto", encodedImage);

            params.addBodyParameter(Register.FieldNames.idCardPhoto, encodedImage);

        }



        RegisterMng.getInstance().add(params);


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

@@ -109,12 +109,21 @@
        List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();

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

        removeDuplicate(list);

        int maxRegister = 20;

        int i1 = 0, j = 0;

        int maxCheckIn = 20;

        for (SurveillanceQueryItem item : list) {

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

                registerList.add(item);

                if (i1 < maxRegister) {

                    registerList.add(item);

                    i1++;

                }

            }

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

                checkInList.add(item);

                if (j < maxCheckIn) {

                    checkInList.add(item);

                    j++;

                }

            }

        }