From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
old mode 100644
new mode 100755
index cd42244..0f6dec7
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,7 +7,6 @@
public class ZbGatewayData : CommonDevice
{
#region 缃戝叧鍦ㄧ嚎鏍囪瘑
- [Newtonsoft.Json.JsonIgnore]
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
@@ -25,7 +24,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
@@ -72,7 +71,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
@@ -128,6 +127,10 @@
///缃戝叧鍚嶇О
/// </summary>
public string GwName;
+ /// <summary>
+ /// 缃戝叧鐨勫簭鍒楀彿
+ /// </summary>
+ public string GWSN = string.Empty;
/// <summary>
///鏄惁涓轰富缃戝叧銆�(鍥犱负鍦ㄥ缃戠殑鎯呭喌涓嬶紝杩欎釜瀛楁鍙互鑾峰彇鍒帮紝鐢ㄦ潵鏇存柊灞�鍩熺綉涓熀鏈俊鎭殑瀵硅薄涓殑涓荤綉鍏充俊鎭級
///<para>0锛氬惁</para>
@@ -137,7 +140,7 @@
///<summary>
///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿
///</summary>
- public int StartTime;
+ public long StartTime;
/// <summary>
///鍔犲叆灞�鍩熺綉妯″紡
///<para>0锛歸ifi杩炴帴灞�鍩熺綉</para>
@@ -149,6 +152,10 @@
///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃
/// </summary>
public string GwIP;
+ /// <summary>
+ /// 涓讳汉鐨凣uid(鍗充娇鏄鐞嗗憳,杩欓噷涔熸槸涓讳汉鐨凣uid)
+ /// </summary>
+ public string AccountId;
/// <summary>
///褰撳墠灞�鍩熺綉缃戠粶鍙峰崰鐢ㄤ綅鏁帮紝鐢ㄤ簬璁＄畻瀛愮綉鎺╃爜锛屽Mask=32锛屽垯瀛愮綉鎺╃爜涓�255.255.255.0
/// </summary>
@@ -165,7 +172,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
--
Gitblit v1.8.0