From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/HDL/Operation/UserConfig.cs | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/UserConfig.cs b/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
index 0679d27..a51d781 100644
--- a/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
+++ b/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
@@ -167,9 +167,12 @@
public RegionInfoRes CurrentRegion {
set {
currentRegion = value;
- CheckIfNeedGetMasterAccountToken ();
+ //CheckIfNeedGetMasterAccountToken ();
//鍒囨崲浣忓畢 璁剧疆鏈湴鍔犲瘑Key
SetLocalEncryptKey ();
+ //娓呯┖涔嬪墠缃戝叧鐨勪俊鎭紝閲嶆柊鑾峰彇
+ HomeGateway = null;
+ GetHomeGatewayList ();
}
get {
if (currentRegion == null) {
@@ -179,10 +182,57 @@
}
}
+ #region HomeGateway
+ /// <summary>
+ /// 鏄惁鑾峰彇涓�
+ /// 2020-01-11
+ /// </summary>
+ bool bGettingMac = false;
+ //public static List<string> LocalFiles = IO.FileUtils.ReadFiles ();
+ /// <summary>
+ /// 妫�鏌ユ槸鍚﹂渶瑕佽幏鍙栨帶鍒跺垎浜」鐩�(浣忓畢)璇锋眰淇℃伅
+ /// </summary>
+ /// <param name="mMainAccountId"></param>
+ /// <param name="mSharedHid"></param>
+ public void GetHomeGatewayList ()
+ {
+ //System.Threading.Tasks.Task.Run (() => {
+ //if (bGettingMac) return;
+ HttpServerRequest.Current.GetHomeGatewayList ();
+ //});
+ }
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
/// </summary>
public HomeGatewayInfo HomeGateway;
+ /// <summary>
+ /// 鏄惁鍏佽杩滅▼鎺у埗
+ /// </summary>
+ public bool AllowRemoteControl {
+ get {
+ if (HomeIsOtherShare) {
+ //绛変簬0鏄厑璁歌繙绋嬫帶鍒�
+ return UserConfig.Instance.CurrentRegion.isRemoteControl;
+ } else {
+ //浣忓畢鏄嚜宸辨湰浜虹殑鍏佽鎺у埗
+ return true;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
+ /// </summary>
+ public bool HomeIsOtherShare {
+ get {
+ if (UserConfig.Instance == null || UserConfig.Instance.CurrentRegion == null) {
+ return false;
+ } else {
+ return UserConfig.Instance.CurrentRegion.IsOthreShare;
+ }
+ }
+ }
+
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// gatewayId 鍒ょ┖
@@ -236,28 +286,30 @@
}
- /// <summary>
- /// 鏇存柊璁剧疆褰撳墠浣忓畢缃戝叧
- /// 2020-01-11
- /// </summary>
- /// <param name="mGatewayDataList"></param>
- public void SetNowHomeGateways (List<GatewayRes> mGatewayDataList) {
- try {
- if (currentRegion != null) {
- if (mGatewayDataList != null && mGatewayDataList.Count > 0) {
- var mMacList = new List<HomeGateways> ();
- foreach (var mGatewayRes in mGatewayDataList) {
- var mac = new HomeGateways ();
- mac.GatewayUniqueId = mGatewayRes.GatewayUniqueId;
- mMacList.Add (mac);
- }
- //HomeGateways = mMacList;
- }
- }
- } catch {
+ #endregion
- }
- }
+ ///// <summary>
+ ///// 鏇存柊璁剧疆褰撳墠浣忓畢缃戝叧
+ ///// 2020-01-11
+ ///// </summary>
+ ///// <param name="mGatewayDataList"></param>
+ //public void SetNowHomeGateways (List<GatewayRes> mGatewayDataList) {
+ // try {
+ // if (currentRegion != null) {
+ // if (mGatewayDataList != null && mGatewayDataList.Count > 0) {
+ // var mMacList = new List<HomeGateways> ();
+ // foreach (var mGatewayRes in mGatewayDataList) {
+ // var mac = new HomeGateways ();
+ // mac.GatewayUniqueId = mGatewayRes.GatewayUniqueId;
+ // mMacList.Add (mac);
+ // }
+ // //HomeGateways = mMacList;
+ // }
+ // }
+ // } catch {
+
+ // }
+ //}
//public List<string> RometoUserInfoKeys = new List<string> ();
@@ -265,7 +317,6 @@
/// 鏈湴閫氫俊鍔犲瘑Key
/// </summary>
public string LocalEncryptKey = string.Empty;
-
/// <summary>
/// 鏄惁鍔犲瘑瀵嗙爜楠岃瘉閫氳繃
--
Gitblit v1.8.0