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/Device/Logic/Send.cs | 477 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 316 insertions(+), 161 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 4c72631..15ca0f0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -4,12 +4,13 @@
using ZigBee.Device;
using ZigBee.Common;
using Shared.Common;
+using System.Collections.Specialized;
namespace Shared.Phone.Device.Logic
{
public class Send
{
-
+ #region ----鑾峰彇Logic
/// <summary>
/// 鑾峰彇LogicId鐨勬柟娉�
/// </summary>
@@ -466,6 +467,7 @@
{
["Type"] = int.Parse(dictionary["Type"]),
["Account"] = dictionary["Account"],
+ ["UserId"] = dictionary["UserId"],
};
accounts.Add(accounts1);
@@ -611,6 +613,7 @@
logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
+ logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
List<Dictionary<string, object>> listactions = new List<Dictionary<string, object>>();
listactions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(Logicifon["Actions"].ToString());
@@ -710,212 +713,364 @@
return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
}
+ #endregion
#region ----鑾峰彇闂ㄩ攣
- public static List<DoorLock> ReadDoorLockIfon(string doorlockMac)
+
+ /// <summary>
+ /// 鑾峰彇鑷繁+鍏朵粬鎴愬憳淇℃伅
+ /// </summary>
+ /// <param name="doorlockMac">闂ㄩ攣Mac</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<List<MembershipIfon>> AllMembers(string doorlockMac)
{
- List<DoorLock> list = new List<DoorLock>();
- string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";//瀛愯处鍙峰拰涓昏处鍙峰彲鑳介摼鎺ヤ笉鍚�
- System.Net.WebClient webClient = new System.Net.WebClient();
- System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
- System.Threading.Tasks.Task.Run(() =>
- {
- try
- {
-
- byte[] responseArray = webClient.UploadValues(url, postValues);
- var str = System.Text.Encoding.UTF8.GetString(responseArray);
- var jObject = JObject.Parse(str);
- if (jObject == null || jObject["StateCode"].ToString() != "Success")
- {
- return;
- }
- var pageData = jObject["ResponseData"]["PageData"].ToString();
- var datalist = JArray.Parse(pageData);
- for (int i = 0; i < datalist.Count; i++)
- {
- var data = JObject.Parse(datalist[i].ToString());
- if (Config.Instance.HomeId == data["Id"].ToString())
- {
- Residential residential = new Residential();
-
- if (Convert.ToBoolean(data["IsOthreShare"].ToString()))
- {
- //鍒嗕韩鑰匢D
- residential.Id = data["Id"].ToString();
- //鏄惁鏄垎浜处鍙穂true(鏄垎浜�);false;(涓嶆槸鍒嗕韩)];
- residential.IsOthreShare = Convert.ToBoolean(data["IsOthreShare"].ToString());
- //鍒嗕韩鑰呬綇瀹匢D
- residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
- residential.IsOtherAccountCtrl = true;
- residential.doorlockmac = doorlockMac;
- list = ReadToken(residential);
- }
- else
- {
- residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
- residential.Token = Config.Instance.Token;
- residential.Id = Config.Instance.HomeId;
- residential.IsOtherAccountCtrl = false;
- residential.doorlockmac = doorlockMac;
- list = ReadDoorLock(residential);
-
- }
- }
-
- }
- }
- catch { }
- });
- var datetime = DateTime.Now;
- while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
+ var userlist = new List<MembershipIfon>();
+ ///鍒ゆ柇APP鐧诲綍杩涙潵鐢ㄦ埛韬唤(涓讳汉锛岀鐞嗗憳锛屾垚鍛�)
+ var AllUserIfon = await ReadUserListIfon(doorlockMac);
+ var currUserIfon = new MembershipIfon();
+ currUserIfon.CloudAccountId = Config.Instance.Guid;
+ if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
{
- if (list.Count != 0)
+ ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
+ }
+ else
+ {
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
+ }
+ foreach (var o in AllUserIfon)
+ {
+ if (o.IsFreezeUser || string.IsNullOrEmpty(o.UserId))
{
- break;
+ ///杩囨护鎺夊喕缁撶殑鎴愬憳鍜孶serId涓虹┖鐨勬暟鎹紱
+ continue;
+ }
+ if (string.IsNullOrEmpty(currUserIfon.DoorLockMacPort))
+ {
+ currUserIfon.DoorLockMacPort = o.DoorLockMacPort;
+ }
+ if (o.CloudAccountId == Config.Instance.Guid)
+ {
+
+ UnlockingMode unlockingMode = new UnlockingMode();
+ unlockingMode.OpenMode = o.OpenMode;
+ unlockingMode.UserId = o.UserId;
+ unlockingMode.ModeName = o.ModeName;
+ currUserIfon.UserIdMode.Add(unlockingMode);
}
}
- return list;
-
- }
-
- public static List<DoorLock> ReadToken(Residential residential)
- {
- List<DoorLock> list = new List<DoorLock>();
- string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
- System.Net.WebClient webClient = new System.Net.WebClient();
- System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("LoginAccessToken", Config.Instance.Token);
- postValues.Add("MainAccountId", residential.MainUserDistributedMark);
- postValues.Add("SharedHid", residential.Id);
- System.Threading.Tasks.Task.Run(() =>
+ if (currUserIfon.UserIdMode.Count != 0)
{
- try
+ userlist.Add(currUserIfon);
+ }
+
+ if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
+ {
+ var pra = new UserCenter.MemberListInfoPra();
+ string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+ var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+ for (int i = 0; i < listInfo.Count; i++)
{
- byte[] responseArray = webClient.UploadValues(url, postValues);
- var str = System.Text.Encoding.UTF8.GetString(responseArray);
- var jObject = JObject.Parse(str);
- if (jObject == null || jObject["StateCode"].ToString() != "Success")
+
+ var userIfon = new MembershipIfon();
+ var user = listInfo[i];
+ userIfon.CloudAccountId = user.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(user.UserName))
{
- return;
+ ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ userIfon.UserName = user.Account;
+
}
- var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString();
- var RequestToken = jObject["ResponseData"]["RequestToken"].ToString();
- Residential lockifon = new Residential();
- lockifon.Url = RequestBaseUrl + "/App/GetDoorLockPager";
- lockifon.Token = RequestToken;
- lockifon.Id = Config.Instance.HomeId;
- lockifon.IsOtherAccountCtrl = true;
- lockifon.doorlockmac = residential.doorlockmac;
- list = ReadDoorLock(lockifon);
+ else
+ {
+ userIfon.UserName = user.UserName;
+
+ }
+ for (int j = 0; j < AllUserIfon.Count; j++)
+ {
+ if (AllUserIfon[j].IsFreezeUser || string.IsNullOrEmpty(AllUserIfon[j].UserId))
+ {
+ ///杩囨护鎺夊喕缁撶殑鎴愬憳鍜孶serId涓虹┖鐨勬暟鎹紱
+ continue;
+ }
+ if (string.IsNullOrEmpty(userIfon.DoorLockMacPort))
+ {
+ userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
+ }
+ ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
+ if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
+ {
+ UnlockingMode unlockingMode = new UnlockingMode();
+ unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
+ unlockingMode.UserId = AllUserIfon[j].UserId;
+ unlockingMode.ModeName = AllUserIfon[j].ModeName;
+ userIfon.UserIdMode.Add(unlockingMode);
+ }
+
+ }
+ if (userIfon.UserIdMode.Count != 0)
+ {
+ ///杩囨护鎺夐噸澶嶆暟鎹紱
+ var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
+ if (str == null)
+ {
+ userlist.Add(userIfon);
+ }
+ }
}
- catch { }
- });
- var datetime = DateTime.Now;
- while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
+
+ }
+ return userlist;
+ }
+ /// <summary>
+ /// 璇诲彇闂ㄩ攣鎵�鏈夋垚鍛樹俊鎭�
+ /// </summary>
+ /// <param name="doorlockMac">闂ㄩ攣Mac</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<List<User>> ReadUserListIfon(string doorlockMac)
+ {
+ var list = new List<User>();
+ var s = await ReadUserList(doorlockMac);
+ var jObject = JObject.Parse(s);
+ if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
- if (list.Count != 0)
- {
- break;
- }
+ return null;
+ }
+ var pageData = jObject["ResponseData"]["PageData"].ToString();
+ var datalist = JArray.Parse(pageData);
+ for (int i = 0; i < datalist.Count; i++)
+ {
+ var data = JObject.Parse(datalist[i].ToString());
+ var user = new User();
+ user.UserId = data["DoorLockLocalUserId"].ToString();
+ user.OpenMode = int.Parse(data["OpenLockMode"].ToString());
+ user.CloudAccountId = data["CloudAccountId"].ToString();
+ user.DoorLockMacPort = data["DoorLockId"].ToString();
+ user.ModeName = data["UserIdRemarks"].ToString();
+ user.IsFreezeUser = Convert.ToBoolean(data["IsFreezeUser"].ToString());
+ list.Add(user);
}
return list;
}
- public static List<DoorLock> ReadDoorLock(Residential lockifon)
+ public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
{
- List<DoorLock> list = new List<DoorLock>();
- System.Net.WebClient webClient = new System.Net.WebClient();
- System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("LoginAccessToken", lockifon.Token);
- postValues.Add("HomeId", lockifon.Id);
- postValues.Add("DoorLockId", lockifon.doorlockmac);//闂ㄩ攣Mac19091
- postValues.Add("IsOtherAccountCtrl", lockifon.IsOtherAccountCtrl.ToString());
- System.Threading.Tasks.Task.Run(() =>
+ string s = null;
+ var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
+ // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
+ var jObject = JObject.Parse(str);
+ if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
- try
+ return null;
+ }
+ var pageData = jObject["ResponseData"]["PageData"].ToString();
+ var datalist = JArray.Parse(pageData);
+ for (int i = 0; i < datalist.Count; i++)
+ {
+ var data = JObject.Parse(datalist[i].ToString());
+ if (Config.Instance.HomeId == data["Id"].ToString())
{
-
- byte[] responseArray = webClient.UploadValues(lockifon.Url, postValues);
- var str = System.Text.Encoding.UTF8.GetString(responseArray);
- var jObject = JObject.Parse(str);
- if (jObject == null || jObject["StateCode"].ToString() != "Success")
+ Residential residential = new Residential();
+ if (Convert.ToBoolean(data["IsOthreShare"].ToString()))
{
- return;
+ //鍒嗕韩鑰匢D
+ residential.Id = data["Id"].ToString();
+ //鏄惁鏄垎浜处鍙穂true(鏄垎浜�);false;(涓嶆槸鍒嗕韩)];
+ residential.IsOthreShare = Convert.ToBoolean(data["IsOthreShare"].ToString());
+ //鍒嗕韩鑰呬綇瀹匢D
+ residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
+ residential.IsOtherAccountCtrl = true;
+ residential.doorlockmac = doorlockMac;
+ residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
+ //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
+ s = await ReadUserDoorLock(residential);
}
- var pageData = jObject["ResponseData"]["PageData"].ToString();
- var datalist = JArray.Parse(pageData);
- for (int i = 0; i < datalist.Count; i++)
+ else
{
- var data = JObject.Parse(datalist[i].ToString());
- DoorLock doorLock = new DoorLock();
- doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
- doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
- doorLock.CloudAccountId = data["CloudAccountId"].ToString();
- list.Add(doorLock);
+ residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
+ //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
+ residential.Token = Config.Instance.Token;
+ residential.Id = Config.Instance.HomeId;
+ residential.IsOtherAccountCtrl = false;
+ residential.doorlockmac = doorlockMac;
+ s = await WebClientAsync(2, residential.Url, residential);
}
- }
- catch
- {
-
- }
-
- });
- var datetime = DateTime.Now;
- while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
- {
- if (list.Count != 0)
- {
- break;
}
}
- return list;
+ return s;
+ }
+
+ public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
+ {
+
+ var s = await WebClientAsync(1, residential.Url, residential);
+
+ var jObject = JObject.Parse(s);
+ if (jObject == null || jObject["StateCode"].ToString() != "Success")
+ {
+ return null;
+ }
+ var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString();
+ var RequestToken = jObject["ResponseData"]["RequestToken"].ToString();
+ Residential lockifon = new Residential();
+ lockifon.Url = RequestBaseUrl + "/DoorLock/GetDoorLockPager";
+ lockifon.Token = RequestToken;
+ lockifon.Id = Config.Instance.HomeId;
+ lockifon.IsOtherAccountCtrl = true;
+ lockifon.doorlockmac = residential.doorlockmac;
+ return await WebClientAsync(2, lockifon.Url, lockifon);
+ }
+
+ /// <summary>
+ /// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
+ /// </summary>
+ /// <param name="postValues">post鍙傛暟</param>
+ /// <param name="url"></param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<string> WebClientAsync(int value, string url, Residential residential = null)
+ {
+
+ NameValueCollection postValues = new NameValueCollection();
+
+ if (value == 0)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//
+
+ }
+ else if (value == 1)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", Config.Instance.Token);
+ postValues.Add("MainAccountId", residential.MainUserDistributedMark);
+ postValues.Add("SharedHid", residential.Id);
+ }
+ else if (value == 2)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", residential.Token);
+ postValues.Add("HomeId", residential.Id);
+ postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac
+ postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
+ postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
+ }
+ System.Net.WebClient webClient = new System.Net.WebClient();
+ byte[] responseArray = webClient.UploadValues(url, postValues);
+ var s = System.Text.Encoding.UTF8.GetString(responseArray);
+ return s;
+
}
public class Residential
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
public string Id = string.Empty;
+ /// <summary>
+ /// 褰撳墠浣忓畢鏄笉鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨�
+ /// </summary>
public bool IsOthreShare;
+ /// <summary>
+ /// 褰撳墠浣忓畢鏄笉鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
+ /// </summary>
public string MainUserDistributedMark = string.Empty;
public string Url = string.Empty;
public string Token = string.Empty;
public bool IsOtherAccountCtrl;
- public string doorlockmac;
- }
-
- public class DoorLock
- {
- public string DoorLockLocalUserId = string.Empty;
- public int OpenLockMode;
- public string CloudAccountId = string.Empty;
/// <summary>
- /// 韬唤+瑙﹀彂婧�(0鎸夐敭/3鍗�/15鎸囩汗)
+ /// 褰撳墠闂ㄩ攣mac
/// </summary>
- public string UserIdMode
- {
- get
- {
- return DoorLockLocalUserId + "_" + OpenLockMode.ToString();
- }
- }
+ public string doorlockmac;
}
public class MembershipIfon
{
- public string MembershipId = string.Empty;
- public List<string> UserIdMode = new List<string>();
- public string MembershipName = string.Empty;
+ /// <summary>
+ /// 璇嗗埆鐢ㄦ埛韬唤
+ /// </summary>
+ public string CloudAccountId = string.Empty;
+ /// <summary>
+ /// 闂ㄩ攣Mac+Port,璇嗗埆闂ㄩ攣锛�
+ /// </summary>
+ public string DoorLockMacPort = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧愬垪琛�
+ /// </summary>
+ public List<UnlockingMode> UserIdMode = new List<UnlockingMode>();
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string UserName = string.Empty;
+ /// <summary>
+ /// 鏄惁鍐荤粨璇ユ垚鍛橈紙true宸插喕缁擄級
+ /// </summary>
+ public bool IsFreezeUser;
+
}
- public static List<MembershipIfon> UserList = new List<MembershipIfon>();
-
-
+ public class UnlockingMode
+ {
+ /// <summary>
+ /// 瑙﹀彂婧怚D
+ /// </summary>
+ public string UserId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// </summary>
+ public int OpenMode;
+ /// <summary>
+ /// 鑷畾涔夎Е鍙戞簮鍚嶇О
+ /// </summary>
+ public string ModeName = string.Empty;
+
+ }
+
+ public class User
+ {
+ /// <summary>
+ /// 璇嗗埆鐢ㄦ埛韬唤
+ /// </summary>
+ public string CloudAccountId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧怚D
+ /// </summary>
+ public string UserId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// </summary>
+ public int OpenMode;
+ /// <summary>
+ /// 鑷畾涔夎Е鍙戞簮鍚嶇О
+ /// </summary>
+ public string ModeName = string.Empty;
+ /// <summary>
+ /// 闂ㄩ攣Mac+Port,璇嗗埆闂ㄩ攣锛�
+ /// </summary>
+ public string DoorLockMacPort = string.Empty;
+ /// <summary>
+ /// 鏄惁鍐荤粨璇ユ垚鍛橈紙true宸插喕缁擄級
+ /// </summary>
+ public bool IsFreezeUser;
+
+ }
+
+ /// <summary>
+ /// 闂ㄩ攣鍒楄〃
+ /// </summary>
+ public static List<MembershipIfon> LockList = new List<MembershipIfon>();
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
+ public static ZigBee.Device.DoorLock CurrentDoorLock = null;
+ /// <summary>
+ /// 褰撳墠鐢ㄦ埛鐨勪俊鎭�
+ /// </summary>
+ public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
#endregion
+
}
}
--
Gitblit v1.8.0