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 | 290 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 170 insertions(+), 120 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 028e838..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
@@ -2,7 +2,6 @@
import android.app.Activity;
import android.content.Intent;
-import android.database.Cursor;
import android.graphics.Bitmap;
import android.net.Uri;
import android.provider.MediaStore;
@@ -15,10 +14,14 @@
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;
@@ -29,16 +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.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import cn.com.basic.face.base.MainActivity;
@@ -64,36 +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 ImageView 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;
- @ViewInject(R.id.fragment_register_choose_photo_placeholder_image)
- private ImageView fragment_register_choose_photo_placeholder_image;
- @ViewInject(R.id.fragment_register_update_photo_placeholder_image)
- private ImageView fragment_register_update_photo_placeholder_image;
+ @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_choose_photo_placeholder_text_view)
- private TextView fragment_register_choose_photo_placeholder_text_view;
- @ViewInject(R.id.fragment_register_update_photo_placeholder_text_view)
- private TextView fragment_register_update_photo_placeholder_text_view;
+ @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_choose_photo_ = 1;
- private static final int fragment_register_update_photo_ = 2;
+ 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_choose_photo_img;
- private Bitmap fragment_register_update_photo_img;
+ 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();
@@ -105,96 +109,104 @@
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();
-// if (name.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "濮撳悕涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_name.requestFocus();
-// return;
-// }
-// String phone = fragment_register_phone.getValue();
-// if (phone.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "鐢佃瘽涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_phone.requestFocus();
-// return;
-// }
-// String gender = fragment_register_gender.getValue();
-// if (gender.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "鎬у埆涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_gender.callOnClick();
-// return;
-// }
-// String id_class = fragment_register_id_class.getValue();
-// if (id_class.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_id_class.callOnClick();
-// return;
-// }
-// String country = fragment_register_country.getValue();
-// if (country.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "鍥界睄涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_country.callOnClick();
-// return;
-// }
-// String id_num = fragment_register_id_num.getValue();
-// if (id_num.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "璇佷欢缂栧彿涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_id_num.requestFocus();
-// return;
-// }
-// String birthday = fragment_register_birthday.getValue();
-// if (birthday.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_birthday.callOnClick();
-// return;
-// }
-// String company = fragment_register_company.getValue();
-// if (company.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "鍏徃鍚嶇О涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_company.requestFocus();
-// return;
-// }
-// String remark = fragment_register_remark.getValue();
-// if (remark.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "澶囨敞涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_remark.requestFocus();
-// return;
-// }
-// String visitor_class = fragment_register_visitor_class.getValue();
-// if (visitor_class.trim().length() <= 0) {
-// Toast.makeText(MainActivity.getInstance(), "璁垮绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
-// fragment_register_visitor_class.callOnClick();
-// return;
-// }
-// params.addBodyParameter(Register.FieldNames.username, name);
-// params.addBodyParameter(Register.FieldNames.mobilePhone, phone);
-// params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(gender));
-// params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(id_class));
-// params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(country));
-// params.addBodyParameter(Register.FieldNames.identifyNum, id_num);
-// params.addBodyParameter(Register.FieldNames.companyId, company);
-// params.addBodyParameter(Register.FieldNames.birthday, birthday);
+ String name = fragment_register_name.getValue();
+ if (name.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "濮撳悕涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_name.requestFocus();
+ return;
+ }
+ String phone = fragment_register_phone.getValue();
+ if (phone.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "鐢佃瘽涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_phone.requestFocus();
+ return;
+ }
+ String gender = fragment_register_gender.getValue();
+ if (gender.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "鎬у埆涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_gender.callOnClick();
+ return;
+ }
+ String id_class = fragment_register_id_class.getValue();
+ if (id_class.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_id_class.callOnClick();
+ return;
+ }
+ String country = fragment_register_country.getValue();
+ if (country.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "鍥界睄涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_country.callOnClick();
+ return;
+ }
+ String id_num = fragment_register_id_num.getValue();
+ if (id_num.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢缂栧彿涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_id_num.requestFocus();
+ return;
+ }
+ String birthday = fragment_register_birthday.getValue();
+ if (birthday.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_birthday.callOnClick();
+ return;
+ }
+ String company = fragment_register_company.getValue();
+ if (company.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "鍏徃鍚嶇О涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_company.requestFocus();
+ return;
+ }
+ String remark = fragment_register_remark.getValue();
+ if (remark.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "澶囨敞涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_remark.requestFocus();
+ return;
+ }
+ String visitor_class = fragment_register_visitor_class.getValue();
+ if (visitor_class.trim().length() <= 0) {
+ Toast.makeText(MainActivity.getInstance(), "璁垮绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ fragment_register_visitor_class.callOnClick();
+ return;
+ }
+ params.addBodyParameter(Register.FieldNames.username, name);
+ params.addBodyParameter(Register.FieldNames.mobilePhone, phone);
+ params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(gender));
+ params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(id_class));
+ params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(country));
+ params.addBodyParameter(Register.FieldNames.identifyNum, id_num);
+ params.addBodyParameter(Register.FieldNames.companyId, company);
+ params.addBodyParameter(Register.FieldNames.birthday, birthday);
- if (fragment_register_choose_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_register_choose_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
- String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
- params.addBodyParameter("choosePhoto", encodedImage);
+ if (surveillanceQueryItem != null) {
+ params.addBodyParameter("width", surveillanceQueryItem.getWidth());
+ params.addBodyParameter("height", surveillanceQueryItem.getHeight());
+ params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
}
- if (fragment_register_update_photo_img != null) {
+ if (fragment_register_surveillance_photo_img != null) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_register_update_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, 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("uploadPhoto", encodedImage);
+ 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) {
@@ -202,7 +214,7 @@
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("idPhoto", encodedImage);
+ params.addBodyParameter(Register.FieldNames.idCardPhoto, encodedImage);
}
RegisterMng.getInstance().add(params);
@@ -211,29 +223,44 @@
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == fragment_register_choose_photo_ && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
+ 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_choose_photo.setImageBitmap(bitmap);
- fragment_register_choose_photo_img = bitmap;
+ fragment_register_surveillance_photo.setImageBitmap(bitmap);
+ fragment_register_surveillance_photo_img = bitmap;
- fragment_register_choose_photo_placeholder_image.setVisibility(View.INVISIBLE);
- fragment_register_choose_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+ 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_update_photo_ && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
+ 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_update_photo.setImageBitmap(bitmap);
- fragment_register_update_photo_img = bitmap;
+ fragment_register_upload_custom_photo.setImageBitmap(bitmap);
+ fragment_register_upload_custom_photo_img = bitmap;
- fragment_register_update_photo_placeholder_image.setVisibility(View.INVISIBLE);
- fragment_register_update_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+ 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();
@@ -266,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)
@@ -319,20 +359,20 @@
MainActivity.selectPage(0);
}
- @OnClick(R.id.fragment_register_choose_photo)
- public void fragment_register_choose_photo_click(View view) {
+ @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_choose_photo_);
+ startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), fragment_register_surveillance_photo_);
}
- @OnClick(R.id.fragment_register_update_photo)
- public void fragment_register_update__photo_click(View view) {
+ @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_update_photo_);
+ startActivityForResult(Intent.createChooser(intent, "閫夋嫨鍥剧墖"), fragment_register_upload_custom_photo_);
}
@OnClick(R.id.fragment_register_id_card_photo)
@@ -347,11 +387,21 @@
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_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