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/discern/entity/Device.java | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 252 insertions(+), 26 deletions(-)
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
+ ;
}
}
--
Gitblit v1.8.0