From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index 33f7267..b27483c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,10 +7,7 @@
public class ZbGatewayData
{
#region 涓�鍫嗗彉閲�
- /// <summary>
- /// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
- /// </summary>
- public bool GatewayOnlineFlage = false;
+
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -22,7 +19,11 @@
///<summary>
///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
/// </summary>
- public string GwId = string.Empty;
+ public string GwId = string.Empty;
+ /// <summary>
+ ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
+ /// </summary>
+ public string GwMac = string.Empty;
/// <summary>
///缃戝叧鍚嶇О
/// </summary>
@@ -73,7 +74,6 @@
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
-
/// <summary>
/// 铏氭嫙缃戝叧
/// </summary>
@@ -83,7 +83,29 @@
/// 鏈�鍚庣殑鏇存柊鏃堕棿
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public DateTime LastDateTime = DateTime.MinValue;
+ 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
--
Gitblit v1.8.0