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 | 124 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 27 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 9cf2842..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
@@ -6,6 +6,7 @@
import android.net.Uri;
import android.provider.MediaStore;
import android.util.Base64;
+import android.util.DisplayMetrics;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -13,10 +14,16 @@
import android.widget.Toast;
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.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;
@@ -72,14 +79,12 @@
private ImageView fragment_register_id_card_photo;
@ViewInject(R.id.fragment_register_linear_layout)
private LinearLayout fragment_register_linear_layout;
-
@ViewInject(R.id.fragment_register_surveillance_photo_placeholder_image)
private ImageView fragment_register_surveillance_photo_placeholder_image;
@ViewInject(R.id.fragment_register_upload_custom_photo_placeholder_image)
private ImageView fragment_register_upload_custom_photo_placeholder_image;
@ViewInject(R.id.fragment_register_id_card_photo_placeholder_image)
private ImageView fragment_register_id_card_photo_placeholder_image;
-
@ViewInject(R.id.fragment_register_surveillance_photo_placeholder_text_view)
private TextView fragment_register_surveillance_photo_placeholder_text_view;
@ViewInject(R.id.fragment_register_upload_custom_photo_placeholder_text_view)
@@ -94,6 +99,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();
@@ -113,6 +120,19 @@
@OnClick(R.id.fragment_register_save)
public void fragment_register_save_click(View v) {
RequestParams params = new RequestParams();
+ DisplayMetrics metrics = getActivity().getResources().getDisplayMetrics();
+
+ int h1 = fragment_register_surveillance_photo.getHeight();
+ int h2 = fragment_register_upload_custom_photo.getHeight();
+ int h3 = fragment_register_id_card_photo.getHeight();
+
+ 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) {
@@ -183,6 +203,13 @@
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 (fragment_register_surveillance_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
fragment_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
@@ -210,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);
@@ -232,13 +275,27 @@
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<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()+"");
+ 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);
+ setSurveillanceQueryItem(item);
+ bitmapList.add(item);
+ bitmapList.add(item);
+ bitmapList.add(item);
SurveillanceMng.getInstance().addBitmap(bitmapList, null, 0, CommonVariables.Camera.IN);
@@ -252,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);
@@ -263,16 +321,16 @@
}
public void resetForm() {
- fragment_register_name.setValue("");
- fragment_register_phone.setValue("");
- fragment_register_gender.setValue("");
- fragment_register_id_class.setValue("");
- fragment_register_country.setValue("");
- fragment_register_id_num.setValue("");
- fragment_register_birthday.setValue("");
- fragment_register_company.setValue("");
- fragment_register_remark.setValue("");
- fragment_register_visitor_class.setValue("");
+ fragment_register_name.setValue("寰愪慨婧�"+Math.random());
+ fragment_register_phone.setValue("13691348767");
+ fragment_register_gender.setValue("鐢�");
+ fragment_register_id_class.setValue("韬唤璇�");
+ fragment_register_country.setValue("涓浗");
+ fragment_register_id_num.setValue("36041419292222222");
+ fragment_register_birthday.setValue("1985-08-12");
+ fragment_register_company.setValue("璐濇�濈");
+ fragment_register_remark.setValue("澶囨敞");
+ fragment_register_visitor_class.setValue("鏅�氳瀹�");
fragment_register_surveillance_photo_img = null;
fragment_register_upload_custom_photo_img = null;
fragment_register_id_card_photo_img = null;
@@ -285,6 +343,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)
@@ -340,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
@@ -379,4 +440,13 @@
fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
}
+ public void setSurveillanceQueryItem(SurveillanceQueryItem item) {
+ this.surveillanceQueryItem = item;
+ }
+
+ @Override
+ protected void initData() {
+ resetForm();
+ }
+
}
--
Gitblit v1.8.0