From 55e3f5761aae3dca19b0e417c05043d718891af0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 10:47:42 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 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 36303ea..bea90fc 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
@@ -15,17 +15,20 @@
import com.bsk.zhangbo.demoforbsk.R;
+import cn.com.basic.face.adapter.SurveillanceFragment;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.BaseFragment;
+import cn.com.basic.face.base.PictureTaker;
+import cn.com.basic.face.dialog.SurveillancePhotoDialog;
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;
import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.NativeImg;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.AppApi;
@@ -41,6 +44,7 @@
import org.xutils.http.RequestParams;
import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -112,6 +116,36 @@
@OnClick(R.id.fragment_register_add)
public void fragment_register_add_click(View view) {
+// byte[] b = new byte[100];
+//
+// List<NativeImg> faceImages = new ArrayList<>();
+// NativeImg test = new NativeImg();
+// test.height = 102;
+// test.width = 122;
+// test.image = new byte[49776];
+// test.size = 49776;
+// faceImages.add(test);
+//
+// List<SurveillanceQueryItem> bitmapList = new ArrayList();
+// for (int i = 0; i < faceImages.size(); i++) {
+// NativeImg item = faceImages.get(i);
+// SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
+// int offset = 0;
+// int size = item.size;
+// Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.ARGB_8888);
+// ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
+// bitmap.copyPixelsFromBuffer(byteBuffer);
+// String str = Base64.encodeToString(item.image, offset, size, Base64.DEFAULT);
+// System.out.println(str.length());
+// System.out.println(str);
+// byte[] b1 = Base64.decode(str, Base64.DEFAULT);
+// surveillanceQueryItem.setBase64Image(str);
+// surveillanceQueryItem.setBitmap(bitmap);
+// surveillanceQueryItem.setWidth(item.width+"");
+// surveillanceQueryItem.setHeight(item.height+"");
+// bitmapList.add(surveillanceQueryItem);
+// }
+// SurveillanceMng.getInstance().addBitmap(bitmapList, b, 100, 1+"");
resetForm();
}
@@ -205,7 +239,11 @@
params.addBodyParameter("width", surveillanceQueryItem.getWidth());
params.addBodyParameter("height", surveillanceQueryItem.getHeight());
fragment_register_surveillance_photo_img = surveillanceQueryItem.getBitmap();
- params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
+
+ NativeImg nativeImg = surveillanceQueryItem.getNativeImg();
+ String str = Base64.encodeToString(nativeImg.image, 0, nativeImg.size, Base64.DEFAULT);
+
+ params.addBodyParameter("base64Image", str);
}
if (fragment_register_surveillance_photo_img != null) {
@@ -233,6 +271,23 @@
}
RegisterMng.getInstance().add(params);
+ }
+
+ public void set_fragment_register_surveillance_photo(SurveillanceQueryItem item) {
+ surveillanceQueryItem = item;
+ fragment_register_surveillance_photo.setImageBitmap(item.getBitmap());
+ fragment_register_surveillance_photo_img = item.getBitmap();
+ fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
+ fragment_register_surveillance_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+ }
+
+ public void set_fragment_register_upload_custom_photo(SurveillanceQueryItem item) {
+ fragment_register_upload_custom_photo.setImageBitmap(item.getBitmap());
+ fragment_register_upload_custom_photo_img = item.getBitmap();
+
+ fragment_register_upload_custom_photo_placeholder_image.setVisibility(View.INVISIBLE);
+ fragment_register_upload_custom_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+
}
@Override
@@ -291,6 +346,7 @@
Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
fragment_register_id_card_photo.setImageBitmap(bitmap);
fragment_register_id_card_photo_img = bitmap;
+ MainActivity.getInstance().getContentResolver().delete(uri, null, null);
fragment_register_id_card_photo_placeholder_image.setVisibility(View.INVISIBLE);
fragment_register_id_card_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
@@ -380,26 +436,28 @@
@OnClick(R.id.fragment_register_surveillance_photo)
public void fragment_register_surveillance_photo_click(View view) {
- Intent intent = new Intent();
- intent.setType("image/*");
- intent.setAction(Intent.ACTION_GET_CONTENT);
- startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), fragment_register_surveillance_photo_);
+ SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.SELECT_PHOTO;
+ new SurveillancePhotoDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
+ public void onSelected(String value) {
+ }
+ });
}
@OnClick(R.id.fragment_register_upload_custom_photo)
public void fragment_register_upload_custom_photo_click(View view) {
- Intent intent = new Intent();
- intent.setType("image/*");
- intent.setAction(Intent.ACTION_GET_CONTENT);
- startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), fragment_register_upload_custom_photo_);
+ SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.UPLOAD_PHOTO;
+ new SurveillancePhotoDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
+ public void onSelected(String value) {
+ }
+ });
}
@OnClick(R.id.fragment_register_id_card_photo)
public void fragment_register_id_card_photo_click(View view) {
- Intent intent = new Intent();
- intent.setType("image/*");
- intent.setAction(Intent.ACTION_GET_CONTENT);
- startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), fragment_register_id_card_photo_);
+ Intent takePicture = new Intent(MainActivity.getInstance(), PictureTaker.class);
+ startActivityForResult(takePicture, fragment_register_id_card_photo_);
+// Intent takePicture = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+// startActivityForResult(takePicture, fragment_register_id_card_photo_);
}
@Override
@@ -427,4 +485,5 @@
protected void initData() {
resetForm();
}
+
}
--
Gitblit v1.8.0