From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期三, 25 十二月 2019 11:21:06 +0800 Subject: [PATCH] 2019.12.25 --- ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 163 ++---------------------------------------------------- 1 files changed, 7 insertions(+), 156 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 84ce50c..e8c0307 --- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs @@ -19,139 +19,6 @@ return config; } } - /// <summary> - /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey - /// </summary> - public string MqttKey - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminMqttKey; - } - return MeMqttKey; - } - set { MeMqttKey = value; } - } - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧� - /// </summary> - public string ZigbeeMqttBrokerLoadSubDomain - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminZigbeeMqttBrokerLoadSubDomain; - } - return MeZigbeeMqttBrokerLoadSubDomain; - } - set { MeZigbeeMqttBrokerLoadSubDomain = value; } - } - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId - /// </summary> - public string ConnectZigbeeMqttClientId - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminConnectZigbeeMqttClientId; - } - return MeConnectZigbeeMqttClientId; - } - set { MeConnectZigbeeMqttClientId = value; } - } - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜 - /// </summary> - public string ConnectZigbeeMqttBrokerPwd - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminConnectZigbeeMqttBrokerPwd; - } - return MeConnectZigbeeMqttBrokerPwd; - } - set { MeConnectZigbeeMqttBrokerPwd = value; } - } - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜 - /// </summary> - public string ConnectZigbeeMqttBrokerName - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminConnectZigbeeMqttBrokerName; - } - return Config.Instance.Account; - } - } - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜 - /// </summary> - public string ConnectGuid - { - get - { - if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2 - || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3) - { - return AdminConnectZigbeeMqttBrokerName; - } - return Config.Instance.Guid; - } - } - - /// <summary> - /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey - /// </summary> - private string MeMqttKey = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧� - /// </summary> - private string MeZigbeeMqttBrokerLoadSubDomain = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId - /// </summary> - private string MeConnectZigbeeMqttClientId = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜 - /// </summary> - [Newtonsoft.Json.JsonIgnore] - private string MeConnectZigbeeMqttBrokerPwd = string.Empty; - /// <summary> - /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey(绠$悊鍛樿韩浠界敤) - /// </summary> - public string AdminMqttKey = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧�(绠$悊鍛樿韩浠界敤) - /// </summary> - public string AdminZigbeeMqttBrokerLoadSubDomain = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId(绠$悊鍛樿韩浠界敤) - /// </summary> - public string AdminConnectZigbeeMqttClientId = string.Empty; - /// <summary> - /// 搴旇鏄彨杩滅▼杩炴帴鐨勫悕瀛楀惂 - /// </summary> - public string AdminConnectZigbeeMqttBrokerName = string.Empty; - /// <summary> - /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜(绠$悊鍛樿韩浠界敤) - /// </summary> - [Newtonsoft.Json.JsonIgnore] - public string AdminConnectZigbeeMqttBrokerPwd = string.Empty; /// <summary> /// 鏈嶅姟鍣ㄦ敞鍐孖D @@ -212,7 +79,7 @@ /// </summary> public string Guid = string.Empty; /// <summary> - /// 鏄惁鏄鐞嗗憳鏉冮檺(涓轰粈涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken) + /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken) /// </summary> public bool isAdministrator = false; /// <summary> @@ -223,32 +90,11 @@ /// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫�� /// </summary> public string AdminRequestToken = string.Empty; - /// <summary> - /// 鍥轰欢鍚嶇О - /// </summary> - //public string Name = string.Empty; - ///// <summary> - ///// 鍥轰欢鍞竴鏍囪瘑 - ///// </summary> - //public string DistributedMark = string.Empty; - ///// <summary> - ///// 鍥轰欢鐗堟湰 - ///// </summary> - //public string FirmwareVersion = string.Empty; - ///// <summary> - ///// 鍥轰欢澶囨敞 - ///// </summary> - //public string Remarks = string.Empty; - ///// <summary> - ///// 鍥轰欢ID - ///// </summary> - //public string Id; [Newtonsoft.Json.JsonIgnore] /// <summary> /// 褰撳墠甯愬彿鐨凾oken /// </summary> - private string Token1 = ""; public string Token { get @@ -274,6 +120,11 @@ } /// <summary> + /// 鐧诲綍鏃禩oken + /// </summary> + public string LoginToken = string.Empty; + + /// <summary> /// 鐧诲綍杩囩殑甯愬彿淇℃伅 /// </summary> public List<string> AccountList = new List<string> { }; @@ -281,7 +132,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