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 | 135 ++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 51 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index c4b44cc..fe9d306 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,14 +7,69 @@
public class ZbGatewayData
{
#region 涓�鍫嗗彉閲�
- /// <summary>
- /// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
- /// </summary>
- public bool GatewayOnlineFlage = false;
+
/// <summary>
- /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
+ /// 浣忓畢ID
/// </summary>
- public string RoomId = string.Empty;
+ public string HomeId = string.Empty;
+ ///<summary>
+ ///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
+ /// </summary>
+ public string GwId = string.Empty;
+ /// <summary>
+ ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
+ /// </summary>
+ public string GwMac = string.Empty;
+ /// <summary>
+ ///缃戝叧鍚嶇О
+ /// </summary>
+ public string GwName = string.Empty;
+ /// <summary>
+ /// 缃戝叧鐨勫簭鍒楀彿
+ /// </summary>
+ public string GwSerialNum = string.Empty;
+ /// <summary>
+ ///鏄惁涓轰富缃戝叧銆�(鍥犱负鍦ㄥ缃戠殑鎯呭喌涓嬶紝杩欎釜瀛楁鍙互鑾峰彇鍒帮紝鐢ㄦ潵鏇存柊灞�鍩熺綉涓熀鏈俊鎭殑瀵硅薄涓殑涓荤綉鍏充俊鎭級
+ ///<para>0锛氬惁</para>
+ ///<para>1锛氭槸</para>
+ /// </summary>
+ public bool IsMainGateWay;
+ /// <summary>
+ ///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃
+ /// </summary>
+ public string GwIP = string.Empty;
+ /// <summary>
+ /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�(缃戝叧鍥轰欢鏃ユ湡锛燂紵)
+ /// </summary>
+ public long GwVersionDate = 0;
+ /// <summary>
+ ///Linux缃戝叧绫诲瀷(涔熷彨缃戝叧闀滃儚绫诲瀷)
+ /// </summary>
+ public int LinuxImageType = -1;
+ /// <summary>
+ ///Linux缃戝叧纭欢鐗堟湰
+ /// </summary>
+ public int LinuxHardVersion = -1;
+ /// <summary>
+ /// Linux缃戝叧鍥轰欢鐗堟湰
+ /// </summary>
+ public int LinuxFirmwareVersion = -1;
+ /// <summary>
+ /// 鍗忚皟鍣ㄧ‖浠剁増鏈�
+ /// </summary>
+ public int CoordinatorHardVersion = -1;
+ /// <summary>
+ /// 鍗忚皟鍣ㄥ浐浠剁増鏈�
+ /// </summary>
+ public int CoordinatorFirmwareVersion = -1;
+ /// <summary>
+ /// 鍗忚皟鍣ㄩ暅鍍廔D
+ /// </summary>
+ public int CoordinatorImageId = -1;
+ /// <summary>
+ /// 铏氭嫙椹卞姩淇℃伅
+ /// </summary>
+ public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
/// <summary>
/// 铏氭嫙缃戝叧
/// </summary>
@@ -25,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
@@ -73,10 +150,6 @@
}
/// <summary>
- /// 缃戝叧淇℃伅.
- /// </summary>
- public GetGwData getGwInfo;
- /// <summary>
/// 缃戝叧淇℃伅(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉浣跨敤鐨勫彉閲�)
/// </summary>
[System.Serializable]
@@ -89,7 +162,6 @@
/// <summary>
///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string GwMac;
/// <summary>
///缃戝叧鍚嶇О
@@ -108,7 +180,6 @@
///<summary>
///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿
///</summary>
- [Newtonsoft.Json.JsonIgnore]
public long StartTime;
/// <summary>
///鍔犲叆灞�鍩熺綉妯″紡
@@ -116,7 +187,6 @@
///<para>1锛氭湁绾胯繛鎺ュ眬鍩熺綉</para>
///<para>2锛氭湭鍔犲叆灞�鍩熺綉</para>
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public int JoinMode;
/// <summary>
///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃
@@ -125,23 +195,19 @@
/// <summary>
/// 涓讳汉鐨凣uid(鍗充娇鏄鐞嗗憳,杩欓噷涔熸槸涓讳汉鐨凣uid)
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string AccountId;
/// <summary>
///褰撳墠灞�鍩熺綉缃戠粶鍙峰崰鐢ㄤ綅鏁帮紝鐢ㄤ簬璁＄畻瀛愮綉鎺╃爜锛屽Mask=32锛屽垯瀛愮綉鎺╃爜涓�255.255.255.0
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public int Mask;
/// <summary>
///涓婄骇璺敱鍣ㄦ棤绾垮悕绉�
///<para>褰� JoinMode = 0鏃跺瓨鍦� </para>
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string RouteESSID;
/// <summary>
///DNS鏈嶅姟鍣ㄥ湴鍧�
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string DNSServer;
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�(缃戝叧鍥轰欢鏃ユ湡锛燂紵)
@@ -150,24 +216,20 @@
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public int ZigbeeVersion;
/// <summary>
///鍗忚皟鍣╩ac鍦板潃
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string ZigbeeMacAddr;
/// <summary>
///缃戝叧瀹卛d
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string HomeId;
/// <summary>
///鏄惁宸茬粡杩炴帴浜戠mqtt
///<para>0锛氬惁</para>
///<para>1锛氭槸</para>
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public int IsConnectCloud;
/// <summary>
///锛堢敤浜庣綉鍏崇▼搴忚皟璇曪級
@@ -177,7 +239,6 @@
///<para>(3)NoBind,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄦ墍鎻愪氦鐨刐GatewayUniqueId 缃戝叧鍞竴Id(MAC)]鍜孾浣忓畢涓婚敭Id]涓嶅瓨鍦ㄧ粦瀹氱殑鍏崇郴]</para>
///<para>(4)YouDataNoIsLocalRegion,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄧ殑鐨勬暟鎹苟涓嶅湪姝DL鍖哄煙鏈嶅姟鍣�, 璇烽噸瀹氬悜鍒板涓婬DL鍖哄煙鏈嶅姟鍣ㄨ繘琛屽鐞�.]</para>
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string StateCode;
/// <summary>
///Linux缃戝叧绫诲瀷
@@ -206,33 +267,9 @@
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
- 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 淇敼缃戝叧鍚嶇О
@@ -286,10 +323,6 @@
public string HomeId;
}
- /// <summary>
- /// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺)
- /// </summary>
- public GatewayBaseInfo getGatewayBaseInfo = new GatewayBaseInfo();
/// <summary>
/// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺)
/// </summary>
--
Gitblit v1.8.0