From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index f7b8d43..1a9e97c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -8,9 +8,10 @@
{
#region 涓�鍫嗗彉閲�
/// <summary>
- /// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
+ /// 缃戝叧鍦ㄧ嚎鐨勬椂闂寸偣
/// </summary>
- public bool GatewayOnlineFlage = false;
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime OnlineTime = DateTime.Now;
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -23,6 +24,10 @@
///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
/// </summary>
public string GwId = string.Empty;
+ /// <summary>
+ ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
+ /// </summary>
+ public string GwMac = string.Empty;
/// <summary>
///缃戝叧鍚嶇О
/// </summary>
@@ -46,7 +51,7 @@
/// </summary>
public long GwVersionDate = 0;
/// <summary>
- ///Linux缃戝叧绫诲瀷
+ ///Linux缃戝叧绫诲瀷(涔熷彨缃戝叧闀滃儚绫诲瀷)
/// </summary>
public int LinuxImageType = -1;
/// <summary>
@@ -66,14 +71,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>
@@ -249,32 +253,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