From 3cceac30dc1c5a7cf5bd4f95e327e855cdcf304d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:01:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/DeviceQueryCondition.java | 95 ++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 19 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 278 ++++++++++++++++++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java | 228 ++++++++++++++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 2
10 files changed, 581 insertions(+), 57 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index 2be0efc..54d4c69 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -100,4 +100,10 @@
public static final String CAMERA2 = "device_camera2";
}
+ public static class DeviceType {
+ public static final String ANDROID_DEVICE = "android_device";
+ public static final String CAMERA1 = "camera1";
+ public static final String CAMERA2 = "camera2";
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 8fcd35e..4e0c53f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -19,27 +19,93 @@
*/
public static final String deviceId = "deviceId";
/**
- * 鍏徃涓婚敭
+ * 璁惧鎵�灞炲叕鍙�
*/
- public static final String deviceCompanyId = "deviceCompanyId";
+ public static final String companyId = "companyId";
/**
- * 璁惧鍦扮偣
+ * 璁惧鍚嶇О
*/
public static final String deviceName = "deviceName";
/**
- * 璁惧鎺堟潈鐮�
+ * 璁惧绫诲瀷
*/
- public static final String authorizationId = "authorizationId";
+ public static final String type = "type";
+ /**
+ * 璁惧鍦板潃
+ */
+ public static final String address = "address";
+ /**
+ * 瀛︽牎鍚嶇О
+ */
+ public static final String schoolName = "schoolName";
+ /**
+ * 鍝佺墝
+ */
+ public static final String brandId = "brandId";
+ /**
+ * IP
+ */
+ public static final String ip = "ip";
+ /**
+ * 绔彛
+ */
+ public static final String port = "port";
+ /**
+ * 鍒嗚鲸鐜�
+ */
+ public static final String resolutionId = "resolutionId";
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ public static final String username = "username";
+ /**
+ * 瀵嗙爜
+ */
+ public static final String password = "password";
+ /**
+ * 閫氳鍗忚
+ */
+ public static final String protocolId = "protocolId";
+ /**
+ * 搴忓垪鍙�
+ */
+ public static final String sn = "sn";
+ /**
+ * 鎵�灞炶澶噄d
+ */
+ public static final String belongId = "belongId";
}
// 璁惧涓婚敭
private String deviceId;
- // 鍏徃涓婚敭
- private String deviceCompanyId;
- // 璁惧鍦扮偣
+ // 璁惧鎵�灞炲叕鍙�
+ private String companyId;
+ // 璁惧鍚嶇О
private String deviceName;
- // 璁惧鎺堟潈鐮�
- private String authorizationId;
+ // 璁惧绫诲瀷
+ private String type;
+ // 璁惧鍦板潃
+ private String address;
+ // 瀛︽牎鍚嶇О
+ private String schoolName;
+ // 鍝佺墝
+ private String brandId;
+ // IP
+ private String ip;
+ // 绔彛
+ private String port;
+ // 鍒嗚鲸鐜�
+ private String resolutionId;
+ // 鐢ㄦ埛鍚�
+ private String username;
+ // 瀵嗙爜
+ private String password;
+ // 閫氳鍗忚
+ private String protocolId;
+ // 搴忓垪鍙�
+ private String sn;
+ // 鎵�灞炶澶噄d
+ private String belongId;
/**
* Get 璁惧涓婚敭
@@ -56,50 +122,210 @@
}
/**
- * Get 鍏徃涓婚敭
+ * Get 璁惧鎵�灞炲叕鍙�
*/
- public String getDeviceCompanyId() {
- return deviceCompanyId;
+ public String getCompanyId() {
+ return companyId;
}
/**
- * Set 鍏徃涓婚敭
+ * Set 璁惧鎵�灞炲叕鍙�
*/
- public void setDeviceCompanyId(String deviceCompanyId) {
- this.deviceCompanyId = deviceCompanyId;
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
}
/**
- * Get 璁惧鍦扮偣
+ * Get 璁惧鍚嶇О
*/
public String getDeviceName() {
return deviceName;
}
/**
- * Set 璁惧鍦扮偣
+ * Set 璁惧鍚嶇О
*/
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
/**
- * Get 璁惧鎺堟潈鐮�
+ * Get 璁惧绫诲瀷
+ * 锛歝amera1, camera2, main_device
*/
- public String getAuthorizationId() {
- return authorizationId;
+ public String getType() {
+ return type;
}
/**
- * Set 璁惧鎺堟潈鐮�
+ * Set 璁惧绫诲瀷
+ * 锛歝amera1, camera2, main_device
*/
- public void setAuthorizationId(String authorizationId) {
- this.authorizationId = authorizationId;
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * Get 璁惧鍦板潃
+ */
+ public String getAddress() {
+ return address;
+ }
+
+ /**
+ * Set 璁惧鍦板潃
+ */
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ /**
+ * Get 瀛︽牎鍚嶇О
+ */
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ /**
+ * Set 瀛︽牎鍚嶇О
+ */
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ /**
+ * Get 鍝佺墝
+ */
+ public String getBrandId() {
+ return brandId;
+ }
+
+ /**
+ * Set 鍝佺墝
+ */
+ public void setBrandId(String brandId) {
+ this.brandId = brandId;
+ }
+
+ /**
+ * Get IP
+ */
+ public String getIp() {
+ return ip;
+ }
+
+ /**
+ * Set IP
+ */
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ /**
+ * Get 绔彛
+ */
+ public String getPort() {
+ return port;
+ }
+
+ /**
+ * Set 绔彛
+ */
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ /**
+ * Get 鍒嗚鲸鐜�
+ */
+ public String getResolutionId() {
+ return resolutionId;
+ }
+
+ /**
+ * Set 鍒嗚鲸鐜�
+ */
+ public void setResolutionId(String resolutionId) {
+ this.resolutionId = resolutionId;
+ }
+
+ /**
+ * Get 鐢ㄦ埛鍚�
+ */
+ public String getUsername() {
+ return username;
+ }
+
+ /**
+ * Set 鐢ㄦ埛鍚�
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ /**
+ * Get 瀵嗙爜
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Set 瀵嗙爜
+ */
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ /**
+ * Get 閫氳鍗忚
+ */
+ public String getProtocolId() {
+ return protocolId;
+ }
+
+ /**
+ * Set 閫氳鍗忚
+ */
+ public void setProtocolId(String protocolId) {
+ this.protocolId = protocolId;
+ }
+
+ /**
+ * Get 搴忓垪鍙�
+ */
+ public String getSn() {
+ return sn;
+ }
+
+ /**
+ * Set 搴忓垪鍙�
+ */
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
+
+ /**
+ * Get 鎵�灞炶澶噄d
+ */
+ public String getBelongId() {
+ return belongId;
+ }
+
+ /**
+ * Set 鎵�灞炶澶噄d
+ */
+ public void setBelongId(String belongId) {
+ this.belongId = belongId;
}
public String toString() {
return
- ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + deviceCompanyId + ",璁惧鍦扮偣 =" + deviceName +
- ",璁惧鎺堟潈鐮� ="+ authorizationId;
+ ",璁惧涓婚敭 =" + deviceId + ",璁惧鎵�灞炲叕鍙� ="+ companyId + ",璁惧鍚嶇О =" + deviceName +
+ ",璁惧绫诲瀷 =" + type + ",璁惧鍦板潃 =" + address + ",瀛︽牎鍚嶇О =" + schoolName +
+ ",鍝佺墝 =" + brandId + ",IP =" + ip + ",绔彛 =" + port +
+ ",鍒嗚鲸鐜� =" + resolutionId + ",鐢ㄦ埛鍚� =" + username + ",瀵嗙爜 =" + password +
+ ",閫氳鍗忚 =" + protocolId + ",搴忓垪鍙� =" + sn + ",鎵�灞炶澶噄d ="+ belongId
+ ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/DeviceQueryCondition.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/DeviceQueryCondition.java
new file mode 100644
index 0000000..4e96db0
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/DeviceQueryCondition.java
@@ -0,0 +1,95 @@
+package cn.com.basic.face.discern.query.condition;
+
+
+public class DeviceQueryCondition extends BaseCondition {
+
+ public static final class FieldNames {
+ /**
+ *
+ */
+ public static final String sn = "sn";
+ /**
+ *
+ */
+ public static final String type = "type";
+ /**
+ *
+ */
+ public static final String companyId = "companyId";
+ /**
+ *
+ */
+ public static final String belongId = "belongId";
+ }
+
+ //
+ private String sn;
+ //
+ private String type;
+ //
+ private String companyId;
+ //
+ private String belongId;
+
+ /**
+ * Get
+ */
+ public String getSn() {
+ return sn;
+ }
+
+ /**
+ * Set
+ */
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
+
+ /**
+ * Get
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * Get
+ */
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ /**
+ * Set
+ */
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ /**
+ * Get
+ */
+ public String getBelongId() {
+ return belongId;
+ }
+
+ /**
+ * Set
+ */
+ public void setBelongId(String belongId) {
+ this.belongId = belongId;
+ }
+
+ public String toString() {
+ return
+ ", =" + sn + ", =" + type + ", =" + companyId +
+ ", =" + belongId ;
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
index 22acb74..1bbb56a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
@@ -3,74 +3,254 @@
public class DeviceQueryItem {
- // 璁惧涓婚敭
+ //
private String deviceId;
- // 鍏徃涓婚敭
- private String deviceCompanyId;
- // 璁惧鍦扮偣
+ //
+ private String companyId;
+ //
private String deviceName;
- // 璁惧鎺堟潈鐮�
- private String authorizationId;
+ //
+ private String type;
+ //
+ private String address;
+ //
+ private String schoolName;
+ //
+ private String brandId;
+ //
+ private String ip;
+ //
+ private String port;
+ //
+ private String resolutionId;
+ //
+ private String username;
+ //
+ private String password;
+ //
+ private String protocolId;
+ //
+ private String sn;
+ //
+ private String belongId;
/**
- * Get 璁惧涓婚敭
+ * Get
*/
public String getDeviceId() {
return deviceId;
}
/**
- * Set 璁惧涓婚敭
+ * Set
*/
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
/**
- * Get 鍏徃涓婚敭
+ * Get
*/
- public String getDeviceCompanyId() {
- return deviceCompanyId;
+ public String getCompanyId() {
+ return companyId;
}
/**
- * Set 鍏徃涓婚敭
+ * Set
*/
- public void setDeviceCompanyId(String deviceCompanyId) {
- this.deviceCompanyId = deviceCompanyId;
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
}
/**
- * Get 璁惧鍦扮偣
+ * Get
*/
public String getDeviceName() {
return deviceName;
}
/**
- * Set 璁惧鍦扮偣
+ * Set
*/
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
/**
- * Get 璁惧鎺堟潈鐮�
+ * Get
*/
- public String getAuthorizationId() {
- return authorizationId;
+ public String getType() {
+ return type;
}
/**
- * Set 璁惧鎺堟潈鐮�
+ * Set
*/
- public void setAuthorizationId(String authorizationId) {
- this.authorizationId = authorizationId;
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * Get
+ */
+ public String getAddress() {
+ return address;
+ }
+
+ /**
+ * Set
+ */
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ /**
+ * Get
+ */
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ /**
+ * Set
+ */
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ /**
+ * Get
+ */
+ public String getBrandId() {
+ return brandId;
+ }
+
+ /**
+ * Set
+ */
+ public void setBrandId(String brandId) {
+ this.brandId = brandId;
+ }
+
+ /**
+ * Get
+ */
+ public String getIp() {
+ return ip;
+ }
+
+ /**
+ * Set
+ */
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ /**
+ * Get
+ */
+ public String getPort() {
+ return port;
+ }
+
+ /**
+ * Set
+ */
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ /**
+ * Get
+ */
+ public String getResolutionId() {
+ return resolutionId;
+ }
+
+ /**
+ * Set
+ */
+ public void setResolutionId(String resolutionId) {
+ this.resolutionId = resolutionId;
+ }
+
+ /**
+ * Get
+ */
+ public String getUsername() {
+ return username;
+ }
+
+ /**
+ * Set
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ /**
+ * Get
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Set
+ */
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ /**
+ * Get
+ */
+ public String getProtocolId() {
+ return protocolId;
+ }
+
+ /**
+ * Set
+ */
+ public void setProtocolId(String protocolId) {
+ this.protocolId = protocolId;
+ }
+
+ /**
+ * Get
+ */
+ public String getSn() {
+ return sn;
+ }
+
+ /**
+ * Set
+ */
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
+
+ /**
+ * Get
+ */
+ public String getBelongId() {
+ return belongId;
+ }
+
+ /**
+ * Set
+ */
+ public void setBelongId(String belongId) {
+ this.belongId = belongId;
}
public String toString() {
return
- ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + deviceCompanyId + ",璁惧鍦扮偣 =" + deviceName +
- ",璁惧鎺堟潈鐮� ="+ authorizationId;
+ ", =" + deviceId + ", =" + companyId + ", =" + deviceName +
+ ", =" + type + ", =" + address + ", =" + schoolName +
+ ", =" + brandId + ", =" + ip + ", =" + port +
+ ", =" + resolutionId + ", =" + username + ", =" + password +
+ ", =" + protocolId + ", =" + sn + ", =" + belongId
+ ;
}
}
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 8784fdd..9cbf508 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
@@ -74,7 +74,7 @@
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));
params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId());
- params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
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 a91c66e..ebb1730 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
@@ -52,7 +52,7 @@
return;
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
- String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId();
+ String deviceCompanyId = BaseApplication.getInstance().getDevice().getCompanyId();
if (isVisitorList) {
params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
} else {
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 ed676f0..f74447c 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
@@ -61,7 +61,8 @@
// return;
// }
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
- params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
+ params.addBodyParameter(Device.FieldNames.sn, authorationId);
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> places = resultBean.getListBeanOfType(Device.class);
@@ -90,6 +91,22 @@
}
public void saveLanSetting(Map<String, String> fields) {
+
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+ params.addBodyParameter(Device.FieldNames.sn, authorationId);
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> places = resultBean.getListBeanOfType(Device.class);
+ if (places.size() > 0) {
+ BaseApplication.getInstance().setDevice(places.get(0));
+ } else {
+ Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+
+
SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 9706ef3..4fedf2d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -74,7 +74,7 @@
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
x.http().post(params, new BaseCommonCallBack() {
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 2de4eeb..a77ad39 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
@@ -3,8 +3,8 @@
public class AppApi {
// public final static String IMAGE_URL_BASE = "http://192.168.1.141/AI/img/";
// public final static String BASE_URL = "http://192.168.1.141/AI/";
- public final static String IMAGE_URL_BASE = "http://192.168.1.27/face/img/";
- public final static String BASE_URL = "http://192.168.1.27/face/";
+ public final static String IMAGE_URL_BASE = "http://192.168.1.17/face/img/";
+ public final static String BASE_URL = "http://192.168.1.17/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/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index e8ce15e..6ed3406 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
@@ -72,7 +72,7 @@
RefByteArray faceListPb = new RefByteArray();
try {
- COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getCompanyId());
} catch (Exception e) {
COMPANY_ID = 0;
}
--
Gitblit v1.8.0