From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 69 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index f7b8d43..fe9d306 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,22 +7,19 @@
public class ZbGatewayData
{
#region 涓�鍫嗗彉閲�
- /// <summary>
- /// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
- /// </summary>
- public bool GatewayOnlineFlage = false;
+
/// <summary>
/// 浣忓畢ID
/// </summary>
public string HomeId = string.Empty;
- /// <summary>
- /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
- /// </summary>
- public string RoomId = string.Empty;
///<summary>
///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
/// </summary>
- public string GwId = string.Empty;
+ public string GwId = string.Empty;
+ /// <summary>
+ ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
+ /// </summary>
+ public string GwMac = string.Empty;
/// <summary>
///缃戝叧鍚嶇О
/// </summary>
@@ -46,7 +43,7 @@
/// </summary>
public long GwVersionDate = 0;
/// <summary>
- ///Linux缃戝叧绫诲瀷
+ ///Linux缃戝叧绫诲瀷(涔熷彨缃戝叧闀滃儚绫诲瀷)
/// </summary>
public int LinuxImageType = -1;
/// <summary>
@@ -66,14 +63,13 @@
/// </summary>
public int CoordinatorFirmwareVersion = -1;
/// <summary>
- /// 鍗忚皟鍣ㄩ暅鍍廔D(涔熷彨缃戝叧闀滃儚绫诲瀷)
+ /// 鍗忚皟鍣ㄩ暅鍍廔D
/// </summary>
public int CoordinatorImageId = -1;
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
-
+ public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
/// <summary>
/// 铏氭嫙缃戝叧
/// </summary>
@@ -84,6 +80,28 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public DateTime LastDateTime = DateTime.MinValue;
+ /// <summary>
+ /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣(杩欎釜涓滆タ鏈夌偣鐢ㄥ,褰撶涓�娆¤幏鍙栨椂,闇�瑕佽繑鍥炲綋鍓嶆椂闂村洖鍘�,鐒跺悗鎵嶅紑濮嬭鏃�)
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ private DateTime m_OnlineTime = new DateTime(1970, 1, 1);
+ /// <summary>
+ /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime OnlineTime
+ {
+ get
+ {
+ if (m_OnlineTime.Year == 1970)
+ {
+ //褰撶涓�娆¤幏鍙栨椂,闇�瑕佽繑鍥炲綋鍓嶆椂闂村洖鍘�,鐒跺悗鎵嶅紑濮嬭鏃�
+ m_OnlineTime = DateTime.Now;
+ }
+ return m_OnlineTime;
+ }
+ set { m_OnlineTime = value; }
+ }
#endregion
@@ -249,32 +267,9 @@
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
+ public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
}
- public class DriveCodeListObj
- {
- /// <summary>
- /// 椹卞姩浠ｅ彿锛堢敱缃戝叧涓洪┍鍔ㄥ垎閰嶅敮涓�鏍囪瘑锛�
- /// </summary>
- public int DriveCode;
- /// <summary>
- /// 椹卞姩纭欢鐗堟湰
- /// </summary>
- public int DriveHwVersion;
- /// <summary>
- /// 椹卞姩杞欢鐗�
- /// </summary>
- public int DriveFwVersion;
- /// <summary>
- /// 椹卞姩鍥轰欢绫诲瀷
- /// </summary>
- public int DriveImageType;
- /// <summary>
- /// 椹卞姩id
- /// </summary>
- public int DriveId;
- }
#endregion
#region 淇敼缃戝叧鍚嶇О
--
Gitblit v1.8.0