From fb151d762312a93fd33a44b9e14e1bdfa31e331e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 14:21:09 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index a83e7c3..36303ea 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -204,8 +204,8 @@
         if (surveillanceQueryItem != null) {
             params.addBodyParameter("width", surveillanceQueryItem.getWidth());
             params.addBodyParameter("height", surveillanceQueryItem.getHeight());
-            params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
             fragment_register_surveillance_photo_img = surveillanceQueryItem.getBitmap();
+            params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
         }
 
         if (fragment_register_surveillance_photo_img != null) {
@@ -257,22 +257,23 @@
             try {
                 Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
                 fragment_register_upload_custom_photo.setImageBitmap(bitmap);
-                fragment_register_upload_custom_photo_img = bitmap;
+                //fragment_register_upload_custom_photo_img = bitmap;
 
                 fragment_register_upload_custom_photo_placeholder_image.setVisibility(View.INVISIBLE);
                 fragment_register_upload_custom_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
 
                 List<SurveillanceQueryItem> bitmapList = new ArrayList<>();
                 SurveillanceQueryItem item = new SurveillanceQueryItem();
-                item.setBitmap(bitmap);
+//                item.setBitmap(bitmap);
                 item.setWidth(bitmap.getWidth()+"");
                 item.setHeight(bitmap.getHeight()+"");
+                item.setLocalUri(uri);
 
-                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
-                byte[] imageBytes = byteArrayOutputStream.toByteArray();
-                String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
-                item.setBase64Image(encodedImage);
+//                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+//                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+//                byte[] imageBytes = byteArrayOutputStream.toByteArray();
+//                String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
+//                item.setBase64Image(encodedImage);
                 setSurveillanceQueryItem(item);
                 bitmapList.add(item);
                 bitmapList.add(item);

--
Gitblit v1.8.0