From 0e32d241f9ddd7e202879230585cb939dd3877b2 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 13:00:34 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 0e0ecbb..7cc5f6b 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
@@ -14,8 +14,11 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.BaseFragment;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Register;
+import cn.com.basic.face.discern.query.condition.SurveillanceQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
import cn.com.basic.face.service.SurveillanceMng;
@@ -93,6 +96,8 @@
private Bitmap fragment_register_surveillance_photo_img;
private Bitmap fragment_register_upload_custom_photo_img;
private Bitmap fragment_register_id_card_photo_img;
+
+ private SurveillanceQueryItem surveillanceQueryItem;
private static RegisterFragment instance = new RegisterFragment();
@@ -182,12 +187,18 @@
params.addBodyParameter(Register.FieldNames.companyId, company);
params.addBodyParameter(Register.FieldNames.birthday, birthday);
+ if (surveillanceQueryItem != null) {
+ params.addBodyParameter("width", surveillanceQueryItem.getWidth());
+ params.addBodyParameter("height", surveillanceQueryItem.getHeight());
+ params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
+ }
+
if (fragment_register_surveillance_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
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) {
@@ -195,7 +206,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) {
@@ -203,7 +214,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);
@@ -236,10 +247,20 @@
fragment_register_upload_custom_photo_placeholder_image.setVisibility(View.INVISIBLE);
fragment_register_upload_custom_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
- List<Bitmap> bitmapList = new ArrayList<>();
- bitmapList.add(0, bitmap);
+ List<SurveillanceQueryItem> bitmapList = new ArrayList<>();
+ SurveillanceQueryItem item = new SurveillanceQueryItem();
+ item.setBitmap(bitmap);
+ item.setWidth(bitmap.getWidth()+"");
+ item.setHeight(bitmap.getHeight()+"");
- SurveillanceMng.getInstance().addBitmap(bitmapList, null, 0);
+ 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);
+
+ SurveillanceMng.getInstance().addBitmap(bitmapList, null, 0, CommonVariables.Camera.IN);
} catch (Exception e) {
e.printStackTrace();
@@ -284,6 +305,7 @@
fragment_register_upload_custom_photo_placeholder_text_view.setVisibility(View.VISIBLE);
fragment_register_id_card_photo_placeholder_image.setVisibility(View.VISIBLE);
fragment_register_id_card_photo_placeholder_text_view.setVisibility(View.VISIBLE);
+ this.surveillanceQueryItem = null;
}
@OnClick(R.id.fragment_register_country)
@@ -378,4 +400,8 @@
fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
}
+ public void setSurveillanceQueryItem(SurveillanceQueryItem item) {
+ this.surveillanceQueryItem = item;
+ }
+
}
--
Gitblit v1.8.0