From 4f40d5eea0b9ecefa80632c53d2c6e7f5cc6c35a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 13:25:47 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 6 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 4 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java | 20 +++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 14 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java | 125 ++++++++++++++++---------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java | 5 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java | 20 +++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java | 8 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 6 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java | 4
14 files changed, 147 insertions(+), 73 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index dd920df..7be8068 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -87,7 +87,7 @@
}
public boolean networkAvailable() {
- boolean connected = false;
+ boolean connected = true;
// ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
// if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
// connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
index a03a102..aec9e40 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
@@ -35,6 +35,9 @@
this.message = message;
}
public Object getData() {
+ if (data == null) {
+ data = new ArrayList<>();
+ }
return data;
}
public void setData(Object data) {
@@ -66,7 +69,7 @@
}
return list;
}
- return null;
+ return new ArrayList<>();
}
public boolean isSuccess() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
index 32eed25..0d35b74 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
@@ -32,7 +32,9 @@
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
+import cn.com.basic.face.service.DepartmentMng;
import cn.com.basic.face.service.DictionaryMng;
+import cn.com.basic.face.service.PostMng;
import cn.com.basic.face.service.RegisterMng;
import cn.com.basic.face.util.BitmapUtil;
import cn.com.basic.face.util.Constant;
@@ -155,16 +157,75 @@
}
OfflineAttenderRegisterItem offlineAttenderRegisterItem = new OfflineAttenderRegisterItem();
if(BaseApplication.getInstance().networkAvailable()) {
+ params.addBodyParameter(Register.FieldNames.username, name);
+ params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(fragment_attender_register_gender.getValue()));
+ params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(fragment_attender_register_id_class.getValue()));
+ params.addBodyParameter(Register.FieldNames.postId, DictionaryMng.getInstance().getId(fragment_attender_register_post.getValue()));
+ params.addBodyParameter(Register.FieldNames.post, fragment_attender_register_post.getValue());
+ params.addBodyParameter(Register.FieldNames.identifyNum, fragment_attender_register_id_num.getValue());
+ params.addBodyParameter(Register.FieldNames.departmentId, DictionaryMng.getInstance().getId(fragment_attender_register_department.getValue()));
+ params.addBodyParameter(Register.FieldNames.department, fragment_attender_register_department.getValue());
+ params.addBodyParameter(Register.FieldNames.remark, fragment_attender_register_remark.getValue());
+
+ if (surveillanceQueryItem_selectPhoto != null) {
+ params.addBodyParameter("rawSurveillancePhotoWidth", surveillanceQueryItem_selectPhoto.getWidth());
+ params.addBodyParameter("rawSurveillancePhotoHeight", surveillanceQueryItem_selectPhoto.getHeight());
+ params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
+ params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
+ fragment_attender_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
+
+ NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
+ byte[] imageBytes = new byte[nativeImg.size];
+ for (int i = 0; i < nativeImg.size; i++) {
+ imageBytes[i] = nativeImg.image[i];
+ }
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", imageBytes));
+ } else {
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", new byte[]{}));
+ }
+
+ if (fragment_attender_register_surveillance_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_attender_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", imageBytes));
+ } else {
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", new byte[]{}));
+ }
+
+ if (fragment_attender_register_upload_custom_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_attender_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", imageBytes));
+ } else {
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", new byte[]{}));
+ }
+
+ if (fragment_attender_register_id_card_photo_img != null) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ fragment_attender_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", imageBytes));
+ } else {
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", new byte[]{}));
+ }
+ } else {
+ offlineAttenderRegisterItem.setRegisterId(UUID.randomUUID().toString());
offlineAttenderRegisterItem.setUsername(name);
offlineAttenderRegisterItem.setGenderId(DictionaryMng.getInstance().getId(fragment_attender_register_gender.getValue()));
offlineAttenderRegisterItem.setIdentityTypeId(DictionaryMng.getInstance().getId(fragment_attender_register_id_class.getValue()));
- offlineAttenderRegisterItem.setPostId(DictionaryMng.getInstance().getId(fragment_attender_register_post.getValue()));
- offlineAttenderRegisterItem.setPostId(fragment_attender_register_post.getValue());
+ offlineAttenderRegisterItem.setPostId(PostMng.getInstance().getId(fragment_attender_register_post.getValue()));
offlineAttenderRegisterItem.setIdentifyNum(fragment_attender_register_id_num.getValue());
- offlineAttenderRegisterItem.setDepartmentId(DictionaryMng.getInstance().getId(fragment_attender_register_department.getValue()));
- offlineAttenderRegisterItem.setDepartmentId(fragment_attender_register_department.getValue());
+ offlineAttenderRegisterItem.setDepartmentId(DepartmentMng.getInstance().getId(fragment_attender_register_department.getValue()));
offlineAttenderRegisterItem.setRemark(fragment_attender_register_remark.getValue());
offlineAttenderRegisterItem.setDeviceCompanyId(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ offlineAttenderRegisterItem.setIsSynchron("N");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ offlineAttenderRegisterItem.setCreateTime(sdf.format(new Date()));
String rawSurveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
byte[] rawSurveillancePhotoBytes = new byte[]{};
@@ -213,62 +274,6 @@
}
FileUtil.writeToFile(idCardPhotoPath, idCardPhotoBytes);
offlineAttenderRegisterItem.setIdCardPhoto(idCardPhotoPath);
- } else {
- params.addBodyParameter(Register.FieldNames.username, name);
- params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(fragment_attender_register_gender.getValue()));
- params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(fragment_attender_register_id_class.getValue()));
- params.addBodyParameter(Register.FieldNames.postId, DictionaryMng.getInstance().getId(fragment_attender_register_post.getValue()));
- params.addBodyParameter(Register.FieldNames.post, fragment_attender_register_post.getValue());
- params.addBodyParameter(Register.FieldNames.identifyNum, fragment_attender_register_id_num.getValue());
- params.addBodyParameter(Register.FieldNames.departmentId, DictionaryMng.getInstance().getId(fragment_attender_register_department.getValue()));
- params.addBodyParameter(Register.FieldNames.department, fragment_attender_register_department.getValue());
- params.addBodyParameter(Register.FieldNames.remark, fragment_attender_register_remark.getValue());
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
-
- if (surveillanceQueryItem_selectPhoto != null) {
- params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth());
- params.addBodyParameter("height", surveillanceQueryItem_selectPhoto.getHeight());
- fragment_attender_register_surveillance_photo_img = surveillanceQueryItem_selectPhoto.getBitmap();
-
- NativeImg nativeImg = surveillanceQueryItem_selectPhoto.getNativeImg();
- byte[] imageBytes = new byte[nativeImg.size];
- for (int i = 0; i < nativeImg.size; i++) {
- imageBytes[i] = nativeImg.image[i];
- }
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", imageBytes));
- } else {
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", new byte[]{}));
- }
-
- if (fragment_attender_register_surveillance_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_attender_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", imageBytes));
- } else {
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", new byte[]{}));
- }
-
- if (fragment_attender_register_upload_custom_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_attender_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", imageBytes));
- } else {
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", new byte[]{}));
- }
-
- if (fragment_attender_register_id_card_photo_img != null) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- fragment_attender_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
-
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", imageBytes));
- } else {
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", new byte[]{}));
- }
}
RegisterMng.getInstance().addAttender(params, idCardHeadPath, offlineAttenderRegisterItem);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 66c188e..333b393 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -149,6 +149,10 @@
e.printStackTrace();
}
// outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n");
+ /*
+sysctl kernel.sched_is_big_little=1
+sysctl net.core.rmem_max=40000000
+ */
RtspFaceNative.setLocalIP(ipAddress);
System.out.println("ipaddr="+ipAddress);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index 3180abd..96fe076 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -223,7 +223,9 @@
params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", new byte[]{}));
}
} else {
+ offlineVisitorRegisterItem.setRegisterId(UUID.randomUUID().toString());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ offlineVisitorRegisterItem.setDeviceCompanyId(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
offlineVisitorRegisterItem.setIsSynchron("N");
offlineVisitorRegisterItem.setCreateTime(sdf.format(new Date()));
offlineVisitorRegisterItem.setUsername(name);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 1a83671..f37ac81 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -96,6 +96,9 @@
public void findCheckInLeftListAfterReturn(ResultBean resultBean, final boolean isVisitorList, final boolean isSortByDept, final boolean append) {
List<CheckInQueryItem> list = resultBean.getList(CheckInQueryItem.class);
+ if (list == null) {
+ list = new ArrayList<>();
+ }
List prevList = null;
if (append) {
@@ -157,6 +160,9 @@
if (!BaseApplication.deviceAvailable) {
return;
}
+ if (list == null) {
+ list = new ArrayList<>();
+ }
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
index 75b391f..ee31dd1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
@@ -3,6 +3,11 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
@@ -38,4 +43,19 @@
}
}
+ private Map<String, String> departmentIdMap = new HashMap();
+
+ public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
+ List nameList = new ArrayList();
+ for (Dictionary dictionary : dictionaryList) {
+ departmentIdMap.put(dictionary.getName(), dictionary.getDictId()+"");
+ nameList.add(dictionary.getName());
+ }
+ return nameList;
+ }
+
+ public String getId(String name) {
+ return departmentIdMap.get(name);
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index eb38d12..0fb724f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -220,7 +220,8 @@
// return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
// return "rtsp://Admin:1234@192.168.1.22/h264";
- return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/sub/av_stream";
+// return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/sub/av_stream";
+ return "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream";
// return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/main/av_stream";
}
@@ -248,7 +249,8 @@
//return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
// return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
// return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/sub/av_stream";
- return "rtsp://Admin:1234@192.168.1.22/h264";
+// return "rtsp://Admin:1234@192.168.1.22/h264";
+ return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
index e1f4459..19cb125 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
@@ -3,6 +3,11 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
@@ -37,4 +42,19 @@
}
}
+ private Map<String, String> departmentIdMap = new HashMap();
+
+ public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
+ List nameList = new ArrayList();
+ for (Dictionary dictionary : dictionaryList) {
+ departmentIdMap.put(dictionary.getName(), dictionary.getDictId()+"");
+ nameList.add(dictionary.getName());
+ }
+ return nameList;
+ }
+
+ public String getId(String name) {
+ return departmentIdMap.get(name);
+ }
+
}
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 a48905c..168983d 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
@@ -101,10 +101,10 @@
}
} else {
try {
- long registerId = RegisterDao.getInstance().add(offlineVisitorRegisterItem);
- if (registerId > 0) {
+ long result = RegisterDao.getInstance().add(offlineVisitorRegisterItem);
+ if (result > 0) {
MainActivity.selectPage(2);
- final ResultBean resultBean = (ResultBean) CheckInDao.getInstance().findCheckInLeftVisitorListByVisitorId(registerId);
+ final ResultBean resultBean = (ResultBean) CheckInDao.getInstance().findCheckInLeftVisitorListByVisitorId(offlineVisitorRegisterItem.getRegisterId());
MainActivity.getInstance().runOnUiThread(new Runnable() {
@Override
@@ -250,7 +250,13 @@
}
} else {
RegisterDao.getInstance().addAttender(offlineAttenderRegisterItem, idCardHeadPhoto);
- Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ AttenderRegisterFragment.getInstance().resetForm();
+ }
+ });
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index ec9b520..4f21f6c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -118,7 +118,7 @@
return c.getInt(0) > 0 ? true : false;
}
- public ResultBean findCheckInLeftVisitorListByVisitorId(long registerId) {
+ public ResultBean findCheckInLeftVisitorListByVisitorId(String registerId) {
SQLiteDatabase db = MainActivity.getInstance().db;
ResultBean resultBean = new ResultBean();
try {
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 e6a5d35..a536b13 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
@@ -7,7 +7,7 @@
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.51:8333/face/";
- public final static String BASE_URL = "http://192.168.1.101:8080/face/";
+ public final static String BASE_URL = "http://192.168.1.36:8080/face/";
//璁垮娉ㄥ唽娣诲姞
public static final String REGISTER_ADD = "Register/o_add.do";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
index ba41c06..ce6381c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/FileUtil.java
@@ -72,7 +72,9 @@
e.printStackTrace();
} finally {
try {
- f.close();
+ if (f != null) {
+ f.close();
+ }
}catch (Exception e) {
e.printStackTrace();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java
index f580a58..180da46 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java
@@ -25,11 +25,15 @@
try {
count ++;
if (count < 10) {
- String surveillancePhotoName = "/sdcard/xiuxi.jpg";//MainActivity.getInstance().getFilesDir().getAbsolutePath()
+ String surveillancePhotoName = "/system/xiuxi.jpg";//MainActivity.getInstance().getFilesDir().getAbsolutePath()
// +System.currentTimeMillis()+".jpg";
List bitmapList = new ArrayList();
NativeImg nativeImg = new NativeImg();
- nativeImg.image = FileUtil.readFile(new File(surveillancePhotoName));
+ File file = new File(surveillancePhotoName);
+ if (file.exists()) {
+ System.out.println("file exisit");
+ }
+ nativeImg.image = FileUtil.readFile(file);
nativeImg.size = nativeImg.image.length;
SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
surveillanceQueryItem.setNativeImg(nativeImg);
--
Gitblit v1.8.0