From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
old mode 100755
new mode 100644
index 09410f7..422459f
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -96,8 +96,8 @@
return AdminConnectZigbeeMqttBrokerName;
}
return Config.Instance.Account;
- }
- }
+ }
+ }
/// <summary>
/// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜
/// </summary>
@@ -173,7 +173,10 @@
return (DateTime.Now - LoginDateTime).Days < 7;
}
}
-
+ /// <summary>
+ ///鏆傛椂榛樿
+ /// </summary>
+ public string Nmae = string.Empty;
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
/// </summary>
@@ -182,10 +185,7 @@
/// 璐︽埛鐧诲綍鎴愬姛鐨勪富ID
/// </summary>
public int MasterID = 0;
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- public int UserID = 0;
+
public static void ReFresh()
{
@@ -197,7 +197,8 @@
config = new Config { };
}
}
-
+
+ public string Name = string.Empty;
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -284,7 +285,7 @@
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
-
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
--
Gitblit v1.8.0