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 | 224 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 183 insertions(+), 41 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 1e8ef01..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
@@ -5,17 +5,23 @@
import android.graphics.Bitmap;
import android.net.Uri;
import android.provider.MediaStore;
+import android.util.Base64;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.TextView;
import android.widget.Toast;
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;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
@@ -26,14 +32,15 @@
import cn.com.basic.face.widget.register.RegisterRightFieldTextView;
import cn.com.basic.face.dialog.SelectDialog;
-import com.facebook.drawee.view.SimpleDraweeView;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
import org.xutils.http.RequestParams;
-import java.io.IOException;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import cn.com.basic.face.base.MainActivity;
@@ -59,14 +66,38 @@
private RegisterRightFieldTextView fragment_register_company;
@ViewInject(R.id.fragment_register_remark)
private RegisterRightFieldTextView fragment_register_remark;
- @ViewInject(R.id.fragment_register_choose_photo)
- private SimpleDraweeView fragment_register_choose_photo;
- @ViewInject(R.id.fragment_register_update_photo)
- private ImageView fragment_register_update__photo;
+ @ViewInject(R.id.fragment_register_surveillance_photo)
+ private ImageView fragment_register_surveillance_photo;
+ @ViewInject(R.id.fragment_register_upload_custom_photo)
+ private ImageView fragment_register_upload_custom_photo;
+ @ViewInject(R.id.fragment_register_id_card_photo)
+ private ImageView fragment_register_id_card_photo;
@ViewInject(R.id.fragment_register_linear_layout)
private LinearLayout fragment_register_linear_layout;
- private static final int PICK_IMAGE_REQUEST = 1;
+ @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)
+ private TextView fragment_register_upload_custom_photo_placeholder_text_view;
+ @ViewInject(R.id.fragment_register_id_card_photo_placeholder_text_view)
+ private TextView fragment_register_id_card_photo_placeholder_text_view;
+
+ private static final int fragment_register_surveillance_photo_ = 1;
+ private static final int fragment_register_upload_custom_photo_ = 2;
+ private static final int fragment_register_id_card_photo_ = 3;
+
+ 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();
@@ -78,11 +109,13 @@
return R.layout.fragment_register;
}
- @OnClick(R.id.fragment_register_save)
- public void fragment_register_save_click(View view) { }
-
@OnClick(R.id.fragment_register_add)
- public void fragment_register_add_click(View v) {
+ public void fragment_register_add_click(View view) {
+ resetForm();
+ }
+
+ @OnClick(R.id.fragment_register_save)
+ public void fragment_register_save_click(View v) {
RequestParams params = new RequestParams();
String name = fragment_register_name.getValue();
@@ -153,9 +186,100 @@
params.addBodyParameter(Register.FieldNames.identifyNum, id_num);
params.addBodyParameter(Register.FieldNames.companyId, company);
params.addBodyParameter(Register.FieldNames.birthday, birthday);
- params.addBodyParameter("companyName", fragment_register_company.getValue());
+
+ 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(Register.FieldNames.surveillancePhoto, encodedImage);
+ }
+
+ if (fragment_register_upload_custom_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ 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(Register.FieldNames.uploadCustomPhoto, encodedImage);
+ }
+
+ if (fragment_register_id_card_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ 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(Register.FieldNames.idCardPhoto, encodedImage);
+ }
RegisterMng.getInstance().add(params);
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == fragment_register_surveillance_photo_ && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
+ Uri uri = data.getData();
+ try {
+ Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
+ fragment_register_surveillance_photo.setImageBitmap(bitmap);
+ fragment_register_surveillance_photo_img = bitmap;
+
+ fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
+ fragment_register_surveillance_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if (requestCode == fragment_register_upload_custom_photo_ && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
+ Uri uri = data.getData();
+ 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_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.setWidth(bitmap.getWidth()+"");
+ item.setHeight(bitmap.getHeight()+"");
+
+ 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();
+ }
+ }
+ if (requestCode == fragment_register_id_card_photo_ && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
+ Uri uri = data.getData();
+ try {
+ Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
+ fragment_register_id_card_photo.setImageBitmap(bitmap);
+ fragment_register_id_card_photo_img = bitmap;
+
+ fragment_register_id_card_photo_placeholder_image.setVisibility(View.INVISIBLE);
+ fragment_register_id_card_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
public void resetForm() {
@@ -169,6 +293,19 @@
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;
+ fragment_register_surveillance_photo.setImageBitmap(null);
+ fragment_register_upload_custom_photo.setImageBitmap(null);
+ fragment_register_id_card_photo.setImageBitmap(null);
+ fragment_register_surveillance_photo_placeholder_image.setVisibility(View.VISIBLE);
+ fragment_register_surveillance_photo_placeholder_text_view.setVisibility(View.VISIBLE);
+ fragment_register_upload_custom_photo_placeholder_image.setVisibility(View.VISIBLE);
+ 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)
@@ -217,49 +354,54 @@
});
}
- @OnClick(R.id.fragment_register_choose_photo)
- public void fragment_register_choose_photo_click(View view) {
- Toast.makeText(getActivity(), "閫夋嫨浜虹墿蹇収", Toast.LENGTH_SHORT).show();
- }
-
- @OnClick(R.id.fragment_register_update_photo)
- public void fragment_register_update__photo_click(View view) {
- Intent intent = new Intent();
- intent.setType("image/*");
- intent.setAction(Intent.ACTION_GET_CONTENT);
- startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), PICK_IMAGE_REQUEST);
- }
-
@OnClick(R.id.fragment_register_back)
public void fragment_register_back_click(View view) {
MainActivity.selectPage(0);
}
- @OnClick(R.id.fragment_register_id_card_photo)
- public void fragment_register_id_card_photo_click(View view) {
- Toast.makeText(getActivity(), "璇佷欢蹇収", Toast.LENGTH_SHORT).show();
+ @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_);
}
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
+ @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_);
+ }
- if (requestCode == PICK_IMAGE_REQUEST && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
- Uri uri = data.getData();
- try {
- Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
- fragment_register_update__photo.setImageBitmap(bitmap);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
+ @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_);
}
@Override
public void onClick(View v) {}
public void setRegisterInfo(CheckInQueryItem item) {
- fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));
+ fragment_register_surveillance_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
+ }
+
+ public ImageView get_fragment_register_choose_photo() {
+ return fragment_register_surveillance_photo;
+ }
+
+ public void setChoosePhoto(Bitmap bitmap) {
+ fragment_register_surveillance_photo.setImageBitmap(bitmap);
+ fragment_register_surveillance_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+ fragment_register_surveillance_photo_placeholder_image.setVisibility(View.INVISIBLE);
+ }
+
+ public void setSurveillanceQueryItem(SurveillanceQueryItem item) {
+ this.surveillanceQueryItem = item;
}
}
--
Gitblit v1.8.0