From a6edd55e6ea7d7246ebbef49d58bce72d500cd85 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 15:32:13 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 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 331170e..1059533 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
@@ -7,6 +7,7 @@
import android.provider.MediaStore;
import android.util.Base64;
import android.util.DisplayMetrics;
+import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -28,6 +29,7 @@
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;
@@ -100,7 +102,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();
@@ -129,10 +132,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) {
@@ -203,11 +202,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) {
@@ -238,6 +252,7 @@
}
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);
@@ -245,12 +260,12 @@
}
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
@@ -292,7 +307,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);
@@ -343,10 +358,11 @@
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)
+ //@OnClick(R.id.fragment_register_country)
public void fragment_register_country_click(View view) {
new CountryDialog(fragment_register_linear_layout, new OkClickedListener() {
public void onSelected(String value) {
@@ -355,7 +371,7 @@
});
}
- @OnClick(R.id.fragment_register_gender)
+ //@OnClick(R.id.fragment_register_gender)
public void fragment_register_gender_click(View view) {
new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.GENDER, new OkClickedListener() {
public void onSelected(String value) {
@@ -364,7 +380,7 @@
});
}
- @OnClick(R.id.fragment_register_birthday)
+ //@OnClick(R.id.fragment_register_birthday)
public void fragment_register_birthday_click(View view) {
new DateSelectDialog(
new OkClickedListener(){
@@ -374,7 +390,7 @@
},new Date());
}
- @OnClick(R.id.fragment_register_visitor_class)
+ //@OnClick(R.id.fragment_register_visitor_class)
public void fragment_register_visitor_class_click(View view) {
new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.VISITOR_TYPE, new OkClickedListener() {
public void onSelected(String value) {
@@ -383,7 +399,7 @@
});
}
- @OnClick(R.id.fragment_register_id_class)
+ //@OnClick(R.id.fragment_register_id_class)
public void fragment_register_id_class_click(View view) {
new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
public void onSelected(String value) {
@@ -440,8 +456,8 @@
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
--
Gitblit v1.8.0