From 785fd3c3e9984f301018b3b5deb91ecc2c8da124 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:44:35 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java |  199 +++++++++++++++++++++++++++++++------------------
 1 files changed, 124 insertions(+), 75 deletions(-)

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 1bbb56a..00be9c0 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,254 +3,303 @@
 
 public class DeviceQueryItem {
 
-	// 
+	// 璁惧涓婚敭
 	private String deviceId;
-	// 
+	// 璁惧鎵�灞炲叕鍙�
 	private String companyId;
-	// 
+	// 璁惧鍚嶇О
 	private String deviceName;
-	// 
+	// 璁惧绫诲瀷锛歝amera1, camera2, main_device
 	private String type;
-	// 
-	private String address;
-	// 
+	// 璁惧鍦板潃
+	private String installAddress;
+	// 瀛︽牎鍚嶇О
 	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;
+	// 鍚嶇О
+	private String brandName;
+	// 鍚嶇О
+	private String resolution;
+	// 鍚嶇О
+	private String protocol;
 
 	/**
-	 * Get 
+	 * Get 璁惧涓婚敭
 	 */
 	public String getDeviceId() {
 		return deviceId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 璁惧涓婚敭
 	 */
 	public void setDeviceId(String deviceId) {
 		this.deviceId = deviceId;
 	}
 
 	/**
-	 * Get 
+	 * Get 璁惧鎵�灞炲叕鍙�
 	 */
 	public String getCompanyId() {
 		return companyId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 璁惧鎵�灞炲叕鍙�
 	 */
 	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 getType() {
 		return type;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 璁惧绫诲瀷锛歝amera1, camera2, main_device
 	 */
 	public void setType(String type) {
 		this.type = type;
 	}
 
 	/**
-	 * Get 
+	 * Get 璁惧鍦板潃
 	 */
-	public String getAddress() {
-		return address;
-	}
-	
-	/**
-	 * Set 
-	 */
-	public void setAddress(String address) {
-		this.address = address;
+	public String getInstallAddress() {
+		return installAddress;
 	}
 
 	/**
-	 * Get 
+	 * Set 璁惧鍦板潃
+	 */
+	public void setInstallAddress(String installAddress) {
+		this.installAddress = installAddress;
+	}
+
+	/**
+	 * Get 瀛︽牎鍚嶇О
 	 */
 	public String getSchoolName() {
 		return schoolName;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 瀛︽牎鍚嶇О
 	 */
 	public void setSchoolName(String schoolName) {
 		this.schoolName = schoolName;
 	}
 
 	/**
-	 * Get 
+	 * Get 鍝佺墝
 	 */
 	public String getBrandId() {
 		return brandId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 鍝佺墝
 	 */
 	public void setBrandId(String brandId) {
 		this.brandId = brandId;
 	}
 
 	/**
-	 * Get 
+	 * Get IP
 	 */
 	public String getIp() {
 		return ip;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set IP
 	 */
 	public void setIp(String ip) {
 		this.ip = ip;
 	}
 
 	/**
-	 * Get 
+	 * Get 绔彛
 	 */
 	public String getPort() {
 		return port;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 绔彛
 	 */
 	public void setPort(String port) {
 		this.port = port;
 	}
 
 	/**
-	 * Get 
+	 * Get 鍒嗚鲸鐜�
 	 */
 	public String getResolutionId() {
 		return resolutionId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 鍒嗚鲸鐜�
 	 */
 	public void setResolutionId(String resolutionId) {
 		this.resolutionId = resolutionId;
 	}
 
 	/**
-	 * Get 
+	 * Get 鐢ㄦ埛鍚�
 	 */
 	public String getUsername() {
 		return username;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 鐢ㄦ埛鍚�
 	 */
 	public void setUsername(String username) {
 		this.username = username;
 	}
 
 	/**
-	 * Get 
+	 * Get 瀵嗙爜
 	 */
 	public String getPassword() {
 		return password;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 瀵嗙爜
 	 */
 	public void setPassword(String password) {
 		this.password = password;
 	}
 
 	/**
-	 * Get 
+	 * Get 閫氳鍗忚
 	 */
 	public String getProtocolId() {
 		return protocolId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 閫氳鍗忚
 	 */
 	public void setProtocolId(String protocolId) {
 		this.protocolId = protocolId;
 	}
 
 	/**
-	 * Get 
+	 * Get 搴忓垪鍙�
 	 */
 	public String getSn() {
 		return sn;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 搴忓垪鍙�
 	 */
 	public void setSn(String sn) {
 		this.sn = sn;
 	}
 
 	/**
-	 * Get 
+	 * Get 鎵�灞炶澶噄d
 	 */
 	public String getBelongId() {
 		return belongId;
 	}
-	
+
 	/**
-	 * Set 
+	 * Set 鎵�灞炶澶噄d
 	 */
 	public void setBelongId(String belongId) {
 		this.belongId = belongId;
 	}
 
+	/**
+	 * Get 鍚嶇О
+	 */
+	public String getBrandName() {
+		return brandName;
+	}
+
+	/**
+	 * Set 鍚嶇О
+	 */
+	public void setBrandName(String brandName) {
+		this.brandName = brandName;
+	}
+
+	/**
+	 * Get 鍚嶇О
+	 */
+	public String getResolution() {
+		return resolution;
+	}
+
+	/**
+	 * Set 鍚嶇О
+	 */
+	public void setResolution(String resolution) {
+		this.resolution = resolution;
+	}
+
+	/**
+	 * Get 鍚嶇О
+	 */
+	public String getProtocol() {
+		return protocol;
+	}
+
+	/**
+	 * Set 鍚嶇О
+	 */
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+
 	public String toString() {
-		return 
-			 ", ="     + deviceId   +  ", ="     + companyId  +  ", ="     + deviceName + 
-			 ", ="     + type       +  ", ="     + address    +  ", ="     + schoolName + 
-			 ", ="     + brandId    +  ", ="     + ip         +  ", ="     + port       + 
-			 ", ="     + resolutionId +  ", ="     + username   +  ", ="     + password   + 
-			 ", ="     + protocolId +  ", ="     + sn         +  ", ="     + belongId  
-			;
+		return
+				",璁惧涓婚敭 =" + deviceId   +  ",璁惧鎵�灞炲叕鍙� ="+ companyId  +  ",璁惧鍚嶇О =" + deviceName +
+						",璁惧绫诲瀷锛歝amera1, camera2, main_device ="+ type       +  ",璁惧鍦板潃 =" + installAddress +  ",瀛︽牎鍚嶇О =" + schoolName +
+						",鍝佺墝 ="   + brandId    +  ",IP ="   + ip         +  ",绔彛 ="   + port       +
+						",鍒嗚鲸鐜� ="  + resolutionId +  ",鐢ㄦ埛鍚� ="  + username   +  ",瀵嗙爜 ="   + password   +
+						",閫氳鍗忚 =" + protocolId +  ",搴忓垪鍙� ="  + sn         +  ",鎵�灞炶澶噄d ="+ belongId   +
+						",鍚嶇О ="   + brandName  +  ",鍚嶇О ="   + resolution +  ",鍚嶇О ="   + protocol
+				;
 	}
 }

--
Gitblit v1.8.0