From 3e3ef29b3327a0acfee4da9ba5273db5388a1acb Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 11:41:43 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 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 d697830..4fcd24c 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,18 +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;
@@ -99,7 +101,8 @@
private Bitmap fragment_register_upload_custom_photo_img;
private Bitmap fragment_register_id_card_photo_img;
- private SurveillanceQueryItem surveillanceQueryItem;
+ private SurveillanceQueryItem surveillanceQueryItem_selectPhoto;
+ private SurveillanceQueryItem surveillanceQueryItem_uploadPhoto;
private static RegisterFragment instance = new RegisterFragment();
@@ -128,10 +131,6 @@
DisplayMetrics displayMetrics = BaseApplication.getInstance().getResources().getDisplayMetrics();
float dpHeight = displayMetrics.heightPixels / displayMetrics.density;
float dpWidth = displayMetrics.widthPixels / displayMetrics.density;
-
- if (1==1) {
- //return;
- }
String name = fragment_register_name.getValue();
if (name.trim().length() <= 0) {
@@ -202,11 +201,26 @@
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());
- fragment_register_surveillance_photo_img = surveillanceQueryItem.getBitmap();
- params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
+ if (surveillanceQueryItem_selectPhoto != null) {
+ params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
+ params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
+ fragment_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
+
+ NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
+ String str = Base64.encodeToString(nativeImg.image, 0, nativeImg.size, Base64.DEFAULT);
+
+ params.addBodyParameter("base64Image", str);
+ }
+
+ if (surveillanceQueryItem_uploadPhoto != null) {
+// params.addBodyParameter("width", surveillanceQueryItem_uploadPhoto.getWidth());
+// params.addBodyParameter("height", surveillanceQueryItem_uploadPhoto.getHeight());
+// fragment_register_surveillance_photo_img = surveillanceQueryItem_uploadPhoto.getBitmap();
+//
+// NativeImg nativeImg = surveillanceQueryItem_uploadPhoto.getNativeImg();
+// String str = Base64.encodeToString(nativeImg.image, 0, nativeImg.size, Base64.DEFAULT);
+//
+// params.addBodyParameter("base64Image", str);
}
if (fragment_register_surveillance_photo_img != null) {
@@ -234,6 +248,23 @@
}
RegisterMng.getInstance().add(params);
+ }
+
+ public void set_fragment_register_surveillance_photo(SurveillanceQueryItem item) {
+ surveillanceQueryItem_selectPhoto = 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) {
+ surveillanceQueryItem_uploadPhoto = 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
@@ -275,7 +306,7 @@
// byte[] imageBytes = byteArrayOutputStream.toByteArray();
// String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
// item.setBase64Image(encodedImage);
- setSurveillanceQueryItem(item);
+ setSurveillanceQueryItem_selectPhoto(item);
bitmapList.add(item);
bitmapList.add(item);
bitmapList.add(item);
@@ -292,6 +323,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);
@@ -325,7 +357,8 @@
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;
+ this.surveillanceQueryItem_selectPhoto = null;
+ this.surveillanceQueryItem_uploadPhoto = null;
}
@OnClick(R.id.fragment_register_country)
@@ -381,31 +414,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) {
- fragment_register_id_class.setValue(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
@@ -425,12 +455,13 @@
fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
}
- public void setSurveillanceQueryItem(SurveillanceQueryItem item) {
- this.surveillanceQueryItem = item;
+ public void setSurveillanceQueryItem_selectPhoto(SurveillanceQueryItem item) {
+ this.surveillanceQueryItem_selectPhoto = item;
}
@Override
protected void initData() {
resetForm();
}
+
}
--
Gitblit v1.8.0