From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析  并在RTSPServer判断

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java |  338 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 324 insertions(+), 14 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 4e0c53f..3b32896 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
@@ -1,11 +1,12 @@
 package cn.com.basic.face.discern.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import cn.com.basic.face.discern.common.BaseEntity;
 
 /**
- * Device
+ * 鍙屽悜
  */
 public class Device extends BaseEntity implements Serializable {
 
@@ -33,7 +34,7 @@
 		/**
 		 * 璁惧鍦板潃
 		 */
-		public static final String address = "address";
+		public static final String installAddress = "installAddress";
 		/**
 		 * 瀛︽牎鍚嶇О
 		 */
@@ -74,6 +75,66 @@
 		 * 鎵�灞炶澶噄d
 		 */
 		public static final String belongId = "belongId";
+		/**
+		 * 璐熻矗浜�
+		 */
+		public static final String principal = "principal";
+		/**
+		 * 瀹夎鏃堕棿
+		 */
+		public static final String installTime = "installTime";
+		/**
+		 * 瀹夎鍏徃
+		 */
+		public static final String installCompany = "installCompany";
+		/**
+		 * 鐢熶骇鍘傚
+		 */
+		public static final String manufacturer = "manufacturer";
+		/**
+		 * 鐢熶骇鏃ユ湡
+		 */
+		public static final String productionDate = "productionDate";
+		/**
+		 * 澶囨敞
+		 */
+		public static final String remark = "remark";
+		/**
+		 * 鎶ュ簾鏃ユ湡
+		 */
+		public static final String scrappedDate = "scrappedDate";
+		/**
+		 * 璁惧id
+		 */
+		public static final String snId = "snId";
+		/**
+		 * 鍚屾鏃堕棿
+		 */
+		public static final String updateTime = "updateTime";
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
+		/**
+		 * 鏁版嵁鏄惁鏈夋晥
+		 */
+		public static final String isValid = "isValid";
+		/**
+		 * 鍒涘缓鏃堕棿
+		 */
+		public static final String createTime = "createTime";
+		/**
+		 * 鎽勫儚澶村搧鐗�
+		 */
+		public static final String brand = "brand";
+		/**
+		 * 鍒嗚鲸鐜�
+		 */
+		public static final String resolution = "resolution";
 	}
 
 	// 璁惧涓婚敭
@@ -85,7 +146,7 @@
 	// 璁惧绫诲瀷
 	private String type;
 	// 璁惧鍦板潃
-	private String address;
+	private String installAddress;
 	// 瀛︽牎鍚嶇О
 	private String schoolName;
 	// 鍝佺墝
@@ -106,6 +167,36 @@
 	private String sn;
 	// 鎵�灞炶澶噄d
 	private String belongId;
+	// 璐熻矗浜�
+	private String principal;
+	// 瀹夎鏃堕棿
+	private String installTime;
+	// 瀹夎鍏徃
+	private String installCompany;
+	// 鐢熶骇鍘傚
+	private String manufacturer;
+	// 鐢熶骇鏃ユ湡
+	private String productionDate;
+	// 澶囨敞
+	private String remark;
+	// 鎶ュ簾鏃ユ湡
+	private String scrappedDate;
+	// 璁惧id
+	private String snId;
+	// 鍚屾鏃堕棿
+	private String updateTime;
+	// 鏄惁鍚屾
+	private String isSynchron;
+	// 璁惧鎵�鍦ㄦ満鏋刬d
+	private String deviceCompanyId;
+	// 鏁版嵁鏄惁鏈夋晥
+	private String isValid;
+	// 鍒涘缓鏃堕棿
+	private String createTime;
+	// 鎽勫儚澶村搧鐗�
+	private String brand;
+	// 鍒嗚鲸鐜�
+	private String resolution;
 
 	/**
 	 * Get 璁惧涓婚敭
@@ -168,15 +259,15 @@
 	/**
 	 * Get 璁惧鍦板潃
 	 */
-	public String getAddress() {
-		return address;
+	public String getInstallAddress() {
+		return installAddress;
 	}
 
 	/**
 	 * Set 璁惧鍦板潃
 	 */
-	public void setAddress(String address) {
-		this.address = address;
+	public void setInstallAddress(String installAddress) {
+		this.installAddress = installAddress;
 	}
 
 	/**
@@ -319,13 +410,232 @@
 		this.belongId = belongId;
 	}
 
+	/**
+	 * Get 璐熻矗浜�
+	 */
+	public String getPrincipal() {
+		return principal;
+	}
+
+	/**
+	 * Set 璐熻矗浜�
+	 */
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
+	/**
+	 * Get 瀹夎鏃堕棿
+	 */
+	public String getInstallTime() {
+		return installTime;
+	}
+
+	/**
+	 * Set 瀹夎鏃堕棿
+	 */
+	public void setInstallTime(String installTime) {
+		this.installTime = installTime;
+	}
+
+	/**
+	 * Get 瀹夎鍏徃
+	 */
+	public String getInstallCompany() {
+		return installCompany;
+	}
+
+	/**
+	 * Set 瀹夎鍏徃
+	 */
+	public void setInstallCompany(String installCompany) {
+		this.installCompany = installCompany;
+	}
+
+	/**
+	 * Get 鐢熶骇鍘傚
+	 */
+	public String getManufacturer() {
+		return manufacturer;
+	}
+
+	/**
+	 * Set 鐢熶骇鍘傚
+	 */
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	/**
+	 * Get 鐢熶骇鏃ユ湡
+	 */
+	public String getProductionDate() {
+		return productionDate;
+	}
+
+	/**
+	 * Set 鐢熶骇鏃ユ湡
+	 */
+	public void setProductionDate(String productionDate) {
+		this.productionDate = productionDate;
+	}
+
+	/**
+	 * Get 澶囨敞
+	 */
+	public String getRemark() {
+		return remark;
+	}
+
+	/**
+	 * Set 澶囨敞
+	 */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	/**
+	 * Get 鎶ュ簾鏃ユ湡
+	 */
+	public String getScrappedDate() {
+		return scrappedDate;
+	}
+
+	/**
+	 * Set 鎶ュ簾鏃ユ湡
+	 */
+	public void setScrappedDate(String scrappedDate) {
+		this.scrappedDate = scrappedDate;
+	}
+
+	/**
+	 * Get 璁惧id
+	 */
+	public String getSnId() {
+		return snId;
+	}
+
+	/**
+	 * Set 璁惧id
+	 */
+	public void setSnId(String snId) {
+		this.snId = snId;
+	}
+
+	/**
+	 * Get 鍚屾鏃堕棿
+	 */
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * Set 鍚屾鏃堕棿
+	 */
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	/**
+	 * Get 鏄惁鍚屾
+	 * 锛孻-宸插悓姝ワ紝N-鏈悓姝�
+	 */
+	public String getIsSynchron() {
+		return isSynchron;
+	}
+
+	/**
+	 * Set 鏄惁鍚屾
+	 * 锛孻-宸插悓姝ワ紝N-鏈悓姝�
+	 */
+	public void setIsSynchron(String isSynchron) {
+		this.isSynchron = isSynchron;
+	}
+
+	/**
+	 * Get 璁惧鎵�鍦ㄦ満鏋刬d
+	 */
+	public String getDeviceCompanyId() {
+		return deviceCompanyId;
+	}
+
+	/**
+	 * Set 璁惧鎵�鍦ㄦ満鏋刬d
+	 */
+	public void setDeviceCompanyId(String deviceCompanyId) {
+		this.deviceCompanyId = deviceCompanyId;
+	}
+
+	/**
+	 * Get 鏁版嵁鏄惁鏈夋晥
+	 * 锛屼綔涓鸿蒋鍒犻櫎鐨勫垽鏂潯浠讹紝1-鏈夋晥锛�0-鏃犳晥
+	 */
+	public String getIsValid() {
+		return isValid;
+	}
+
+	/**
+	 * Set 鏁版嵁鏄惁鏈夋晥
+	 * 锛屼綔涓鸿蒋鍒犻櫎鐨勫垽鏂潯浠讹紝1-鏈夋晥锛�0-鏃犳晥
+	 */
+	public void setIsValid(String isValid) {
+		this.isValid = isValid;
+	}
+
+	/**
+	 * Get 鍒涘缓鏃堕棿
+	 */
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * Set 鍒涘缓鏃堕棿
+	 */
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * Get 鎽勫儚澶村搧鐗�
+	 */
+	public String getBrand() {
+		return brand;
+	}
+
+	/**
+	 * Set 鎽勫儚澶村搧鐗�
+	 */
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	/**
+	 * Get 鍒嗚鲸鐜�
+	 */
+	public String getResolution() {
+		return resolution;
+	}
+
+	/**
+	 * Set 鍒嗚鲸鐜�
+	 */
+	public void setResolution(String resolution) {
+		this.resolution = resolution;
+	}
+
 	public String toString() {
-		return 
-			 ",璁惧涓婚敭 =" + deviceId   +  ",璁惧鎵�灞炲叕鍙� ="+ companyId  +  ",璁惧鍚嶇О =" + deviceName + 
-			 ",璁惧绫诲瀷 =" + type       +  ",璁惧鍦板潃 =" + address    +  ",瀛︽牎鍚嶇О =" + schoolName + 
-			 ",鍝佺墝 ="   + brandId    +  ",IP ="   + ip         +  ",绔彛 ="   + port       + 
-			 ",鍒嗚鲸鐜� ="  + resolutionId +  ",鐢ㄦ埛鍚� ="  + username   +  ",瀵嗙爜 ="   + password   + 
-			 ",閫氳鍗忚 =" + protocolId +  ",搴忓垪鍙� ="  + sn         +  ",鎵�灞炶澶噄d ="+ belongId  
-			;
+		return
+				",璁惧涓婚敭 =" + deviceId   +  ",璁惧鎵�灞炲叕鍙� ="+ companyId  +  ",璁惧鍚嶇О =" + deviceName +
+						",璁惧绫诲瀷 =" + type       +  ",璁惧鍦板潃 =" + installAddress +  ",瀛︽牎鍚嶇О =" + schoolName +
+						",鍝佺墝 ="   + brandId    +  ",IP ="   + ip         +  ",绔彛 ="   + port       +
+						",鍒嗚鲸鐜� ="  + resolutionId +  ",鐢ㄦ埛鍚� ="  + username   +  ",瀵嗙爜 ="   + password   +
+						",閫氳鍗忚 =" + protocolId +  ",搴忓垪鍙� ="  + sn         +  ",鎵�灞炶澶噄d ="+ belongId   +
+						",璐熻矗浜� ="  + principal  +  ",瀹夎鏃堕棿 =" + installTime +  ",瀹夎鍏徃 =" + installCompany +
+						",鐢熶骇鍘傚 =" + manufacturer +  ",鐢熶骇鏃ユ湡 =" + productionDate +  ",澶囨敞 ="   + remark     +
+						",鎶ュ簾鏃ユ湡 =" + scrappedDate +  ",璁惧id =" + snId       +  ",鍚屾鏃堕棿 =" + updateTime +
+						",鏄惁鍚屾 =" + isSynchron +  ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId +  ",鏁版嵁鏄惁鏈夋晥 ="+ isValid    +
+						",鍒涘缓鏃堕棿 =" + createTime +  ",鎽勫儚澶村搧鐗� ="+ brand      +  ",鍒嗚鲸鐜� ="  + resolution
+				;
 	}
 }

--
Gitblit v1.8.0