From 241bb308ff7f40269952fab927001a783b7271f7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 11:36:32 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 1 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java | 40 +++++++++++++++++++++++++---------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 2 ++
4 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
index a98265b..84c28a2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
@@ -23,6 +23,8 @@
private String postName;
// 绉诲姩鐢佃瘽
private String mobilePhone;
+ // 鍗遍櫓浜哄憳璀﹀憡娑堟伅
+ private String warning;
/**
* Get 浜哄憳涓婚敭
@@ -30,7 +32,7 @@
public String getRegisterId() {
return registerId;
}
-
+
/**
* Set 浜哄憳涓婚敭
*/
@@ -44,7 +46,7 @@
public String getUsername() {
return username;
}
-
+
/**
* Set 浜哄憳鍚嶅瓧
*/
@@ -58,7 +60,7 @@
public String getSurveillancePhoto() {
return surveillancePhoto;
}
-
+
/**
* Set 鐩戞帶鍥剧墖
*/
@@ -72,7 +74,7 @@
public String getCompanyName() {
return companyName;
}
-
+
/**
* Set 鍏徃鍚嶇О
*/
@@ -86,7 +88,7 @@
public String getTel() {
return tel;
}
-
+
/**
* Set 搴ф満鐢佃瘽
*/
@@ -100,7 +102,7 @@
public String getIdentifyNum() {
return identifyNum;
}
-
+
/**
* Set 璇佷欢缂栧彿
*/
@@ -114,7 +116,7 @@
public String getDeptName() {
return deptName;
}
-
+
/**
* Set 閮ㄩ棬鍚嶇О
*/
@@ -128,7 +130,7 @@
public String getCompanyId() {
return companyId;
}
-
+
/**
* Set 鍏徃涓婚敭
*/
@@ -142,7 +144,7 @@
public String getPostName() {
return postName;
}
-
+
/**
* Set 鑱屼綅鍚嶇О
*/
@@ -156,7 +158,7 @@
public String getMobilePhone() {
return mobilePhone;
}
-
+
/**
* Set 绉诲姩鐢佃瘽
*/
@@ -164,11 +166,19 @@
this.mobilePhone = mobilePhone;
}
+ public String getWarning() {
+ return warning;
+ }
+
+ public void setWarning(String warning) {
+ this.warning = warning;
+ }
+
public String toString() {
- return
- ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto +
- ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum +
- ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
- ",绉诲姩鐢佃瘽 =" + mobilePhone;
+ return
+ ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto +
+ ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum +
+ ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 93ffeb6..2f8f8fb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -178,11 +178,13 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date()));
params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
+ params.addBodyParameter(Visit.FieldNames.warning, visitor.getWarning());
params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
+
CheckInMng.getInstance().add(params, visitReasonId);
}
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 9e8fd6a..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
@@ -258,6 +258,7 @@
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);
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 61fee8a..2d6c4af 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
@@ -109,7 +109,7 @@
Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
bitmap.copyPixelsFromBuffer(byteBuffer);
- surveillanceQueryItem.setBase64Bitmap(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
+ surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
surveillanceQueryItem.setBitmap(bitmap);
surveillanceQueryItem.setWidth(item.width+"");
surveillanceQueryItem.setHeight(item.height+"");
--
Gitblit v1.8.0