From 80a6fefdcbee2c256570987efdfff17aec498047 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 15:50:13 +0800
Subject: [PATCH]
---
/dev/null | 11 -----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java | 36 ++++++++++++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 4 -
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 29 +++++++++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java | 3 -
6 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java
index 226cb70..e3e2632 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java
@@ -5,30 +5,50 @@
public static final class FieldNames {
/**
+ * 鍏徃涓婚敭
+ */
+ public static final String companyId = "companyId";
+ /**
* 浜哄憳鍚嶅瓧
*/
- public static final String name = "name";
+ public static final String username = "username";
}
+ // 鍏徃涓婚敭
+ private String companyId;
// 浜哄憳鍚嶅瓧
- private String name;
+ private String username;
+
+ /**
+ * Get 鍏徃涓婚敭
+ */
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ /**
+ * Set 鍏徃涓婚敭
+ */
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
/**
* Get 浜哄憳鍚嶅瓧
*/
- public String getName() {
- return name;
+ public String getUsername() {
+ return username;
}
/**
* Set 浜哄憳鍚嶅瓧
*/
- public void setName(String name) {
- this.name = name;
+ public void setUsername(String username) {
+ this.username = username;
}
public String toString() {
- return
- ",浜哄憳鍚嶅瓧 =" + name ;
+ return
+ ",鍏徃涓婚敭 =" + companyId + ",浜哄憳鍚嶅瓧 =" + username ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index 9da5ee5..28421e5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -9,11 +9,9 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.query.condition.AttendanceDetailQueryCondition;
import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
import cn.com.basic.face.discern.query.item.AttendanceQueryItem;
import cn.com.basic.face.fragment.AttendanceFragment;
-import cn.com.basic.face.service.vo.VisitFragment;
import cn.com.basic.face.util.AppApi;
public class AttendanceMng {
@@ -25,7 +23,7 @@
public void reloadLeftList(String searchText) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
-// params.addBodyParameter(AttendanceQueryCondition.FieldNames, searchText);
+ params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
index 8ad0134..2141815 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -20,7 +20,7 @@
public void findLeftVisitorList(String searchText) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.VISIT_QUERY);
- params.addBodyParameter(VisitQueryCondition.FieldNames.name, searchText);
+ params.addBodyParameter(VisitQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<VisitQueryItem> list = getList(VisitQueryItem.class);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/AttendanceFragment.java
deleted file mode 100644
index b243062..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/AttendanceFragment.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package cn.com.basic.face.service.vo;
-
-public class AttendanceFragment {
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/CheckInFragment.java
deleted file mode 100644
index a41bad6..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/CheckInFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.com.basic.face.service.vo;
-
-import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-
-public class CheckInFragment {
-
- public static class AttendanceQueryItem extends SurveillanceQueryItem {
-
- }
-
- public static class AttendanceRightQueryItem extends SurveillanceQueryItem {
-
- }
-
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java
deleted file mode 100644
index 773310d..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.com.basic.face.service.vo;
-
-import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-
-public class PhoneCallFragment {
-
- public static class PhoneCallQueryItem extends SurveillanceQueryItem {
-
- }
-
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java
deleted file mode 100644
index 42fe3c5..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.com.basic.face.service.vo;
-
-import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-
-public class VisitFragment {
-
- public static class VisitQueryItem extends SurveillanceQueryItem {
-
- }
-
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index e438fe4..ddb98d0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -14,7 +14,6 @@
public class RtspFaceNative {
-
public static native void init();
public static native void setSurface(int cameraIdx, Surface surface);
public static native boolean createPlayer(int cameraIdx, String uri);
@@ -36,7 +35,33 @@
byte[] faceImages = new byte[1024 * 1024 * 1];
ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
- int c = faceImagesIdx.size();
+ int c = 0;
+ if (faceImagesIdx != null)
+ c = faceImagesIdx.size();
+
+ for (int i = 0; i < c; i++) {
+ System.out.println(i);
+// faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size;
+ try {
+ File path = BaseApplication.getInstance().getFilesDir();
+ File f1 = new File(path, ""+i);
+ if (!f1.exists()) {
+ f1.createNewFile();
+ }
+ FileOutputStream f = new FileOutputStream(f1);
+ f.write(faceImages, faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size);
+ f.close();
+
+
+ RequestParams params = new RequestParams();
+// String encodedImage = Base64.encodeToString(faceImages, Base64.DEFAULT);
+ params.addBodyParameter("choosePhoto", f1);
+ RegisterMng.getInstance().add(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
releaseFace(cameraIdx);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
index 2b87d0f..b89087a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -5,12 +5,9 @@
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
-import cn.com.basic.face.adapter.CheckInFragment;
import cn.com.basic.face.adapter.PhoneCallFragment.PhoneCallLeftAdapter;
import java.util.List;
-
-import cn.com.basic.face.service.vo.PhoneCallFragment;
public class PhoneCallLeftListView extends EasyRecyclerView {
--
Gitblit v1.8.0