From f6fcbe3c965b4ad906ac8b327bb5b301c0ebd348 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 28 六月 2017 11:53:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 67 ++++++++++++++++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 6 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java | 9 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 67 ++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 4
5 files changed, 142 insertions(+), 11 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
index 403af37..4889f49 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -166,8 +166,8 @@
final SurveillanceQueryItem item = (SurveillanceQueryItem)data;
fragment_home_bottom_visitor_cell_name.setText(item.getUsername());
- if (item.getImagePath() != null && !item.getImagePath().equals("")) {
- fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
+ if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
+ fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
} else {
if (item.getBitmap() != null) {
fragment_home_bottom_visitor_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
index 6c8d4be..4b9ac90 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -53,6 +53,8 @@
private long idForSelect;
+ private String surveillancePhoto;
+
public SurveillanceQueryItem() {
if (initialSelectId > 10000) {
initialSelectId = 1;
@@ -261,4 +263,11 @@
this.idForSelect = idForSelect;
}
+ public String getSurveillancePhoto() {
+ return surveillancePhoto;
+ }
+
+ public void setSurveillancePhoto(String surveillancePhoto) {
+ this.surveillancePhoto = surveillancePhoto;
+ }
}
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 8ccebbd..2962278 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
@@ -53,10 +53,13 @@
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
+import org.xutils.common.util.FileUtil;
import org.xutils.http.RequestParams;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileOutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -138,9 +141,32 @@
resetForm();
}
+ private File writeToFile(String fileName, byte[] fileBytes) {
+ try {
+ String dir = MainActivity.getInstance().getFilesDir().getAbsolutePath();
+
+ File file = new File(dir, fileName);
+ if (file.exists()) {
+ file.delete();
+ }
+ file.createNewFile();
+ BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(new File(dir, fileName)));
+ bos.write(fileBytes);
+ bos.flush();
+ bos.close();
+ return new File(dir, fileName);
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
@OnClick(R.id.fragment_register_save)
public void fragment_register_save_click(View v) {
-
+// RegisterMng.getInstance().add(null);
+// if (1==1) {
+// return;
+// }
if (!BaseApplication.deviceAvailable) {
return;
@@ -226,6 +252,17 @@
pd.addValue(Register.FieldNames.birthday, birthday);
+ 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.visitorTypeId, DictionaryMng.getInstance().getId(visitor_class));
+ params.addBodyParameter(Register.FieldNames.identifyNum, id_num);
+ params.addBodyParameter(Register.FieldNames.companyId, company);
+ params.addBodyParameter(Register.FieldNames.birthday, birthday);
+
+
if (surveillanceQueryItem_selectPhoto != null) {
params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
@@ -237,6 +274,10 @@
imageBytes[i] = nativeImg.image[i];
}
pd.addData("rawSurveillancePhoto", "application/octet-stream", imageBytes);
+
+ params.addBodyParameter("rawSurveillancePhoto", writeToFile("rawSurveillancePhoto", imageBytes));
+ } else {
+ params.addBodyParameter("rawSurveillancePhoto", writeToFile("rawSurveillancePhoto", new byte[]{}));
}
if (fragment_register_surveillance_photo_img != null) {
@@ -244,6 +285,10 @@
fragment_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
pd.addData(Register.FieldNames.surveillancePhoto, "application/octet-stream", imageBytes);
+
+ params.addBodyParameter("surveillancePhoto", writeToFile("surveillancePhoto", imageBytes));
+ } else {
+ params.addBodyParameter("surveillancePhoto", writeToFile("surveillancePhoto", new byte[]{}));
}
if (fragment_register_upload_custom_photo_img != null) {
@@ -251,6 +296,10 @@
fragment_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
pd.addData(Register.FieldNames.uploadCustomPhoto, "application/octet-stream", imageBytes);
+
+ params.addBodyParameter("uploadCustomPhoto", writeToFile("uploadCustomPhoto", imageBytes));
+ } else {
+ params.addBodyParameter("uploadCustomPhoto", writeToFile("uploadCustomPhoto", new byte[]{}));
}
if (fragment_register_id_card_photo_img != null) {
@@ -258,6 +307,10 @@
fragment_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
pd.addData(Register.FieldNames.idCardPhoto, "application/octet-stream", imageBytes);
+
+ params.addBodyParameter("idCardPhoto", writeToFile("idCardPhoto", imageBytes));
+ } else {
+ params.addBodyParameter("idCardPhoto", writeToFile("idCardPhoto", new byte[]{}));
}
@@ -266,8 +319,8 @@
@Override
protected String doInBackground(String... urls) {
try {
- Uploader uploader = new Uploader("", AppApi.BASE_URL + AppApi.REGISTER_ADD);
- json = uploader.upload("", pd);
+// Uploader uploader = new Uploader("", AppApi.BASE_URL + AppApi.REGISTER_ADD);
+// json = uploader.upload("", pd);
return json;
} catch (Exception e) {
e.printStackTrace();
@@ -286,9 +339,11 @@
}
}
- ConnectionTask task = new ConnectionTask();
- String[] params1 = new String[2];
- task.execute(params1);
+// ConnectionTask task = new ConnectionTask();
+// String[] params1 = new String[2];
+// task.execute(params1);
+
+ RegisterMng.getInstance().add(params);
}
public void set_fragment_register_surveillance_photo(SurveillanceQueryItem item) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 01d7f4b..1d9df00 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -23,6 +23,73 @@
}
public void add(RequestParams params) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
+// params = new RequestParams();
+ try {
+// params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD);
+// x.http().post(params, new BaseCommonCallBack() {
+// @Override
+// public void success() {
+// Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+// //RegisterFragment.getInstance().resetForm();
+// }
+// });
+
+
+ try {
+ File path = BaseApplication.getInstance().getFilesDir();
+ File f1 = new File(path, "rawSurveillancePhoto");
+ if (!f1.exists()) {
+ f1.createNewFile();
+ }
+ File f0 = new File(path, "f0");
+ if (!f0.exists()) {
+ f0.createNewFile();
+ }
+ File f2 = new File(path, "surveillancePhoto");
+ if (!f2.exists()) {
+ f2.createNewFile();
+ }
+ File f3 = new File(path, "uploadCustomPhoto");
+ if (!f3.exists()) {
+ f3.createNewFile();
+ }
+ File f4 = new File(path, "idCardPhoto");
+ if (!f4.exists()) {
+ f4.createNewFile();
+ }
+ FileWriter fw0 = new FileWriter(f0);
+ fw0.write("test1");
+ fw0.close();
+// FileWriter fw1 = new FileWriter(f1);
+// fw1.write("test1");
+// fw1.close();
+// FileWriter fw2 = new FileWriter(f2);
+// fw2.write("test2");
+// fw2.close();
+ params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD);
+ params.addBodyParameter("f0", f0);
+ params.addBodyParameter("rawSurveillancePhoto", f1);
+ params.addBodyParameter("surveillancePhoto", f2);
+ params.addBodyParameter("uploadCustomPhoto", f3);
+ params.addBodyParameter("idCardPhoto", f4);
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ RegisterFragment.getInstance().resetForm();
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
+
+ }catch(Exception e) {
+ e.printStackTrace();
+
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index bf4b362..3dfb8d2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -4,9 +4,9 @@
//public final static String IMAGE_URL_BASE = "http://192.168.1.137:8333/face/img/";
//public final static String BASE_URL = "http://192.168.1.137:8333/face/";
- public final static String IMAGE_URL_BASE = "http://192.168.1.4:8888/";
- public final static String BASE_URL = "http://192.168.1.51/face/";
-// public final static String BASE_URL = "http://192.168.1.4:8333/face/";
+ public final static String IMAGE_URL_BASE = "http://192.168.1.49:8888/";
+// public final static String BASE_URL = "http://192.168.1.51/face/";
+ public final static String BASE_URL = "http://192.168.1.4:8333/face/";
public static final String REGISTER_ADD = "Register/o_add.do";
--
Gitblit v1.8.0