From 15d0c49e85159b9e27870aff5280c0cd95b103c4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 17:16:56 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 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 e28fbe6..331170e 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,11 +15,13 @@
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;
@@ -129,7 +131,7 @@
float dpWidth = displayMetrics.widthPixels / displayMetrics.density;
if (1==1) {
- return;
+ //return;
}
String name = fragment_register_name.getValue();
@@ -204,8 +206,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) {
@@ -235,6 +237,22 @@
RegisterMng.getInstance().add(params);
}
+ public void set_fragment_register_surveillance_photo(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
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
@@ -257,22 +275,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);
@@ -290,6 +309,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);
@@ -379,26 +399,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
@@ -426,4 +448,5 @@
protected void initData() {
resetForm();
}
+
}
--
Gitblit v1.8.0