From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 07 十一月 2019 13:48:36 +0800 Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 441 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 362 insertions(+), 79 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index a4e865e..1060bd2 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> @@ -76,7 +77,7 @@ /// 鑾峰彇Logic鐨勬柟娉� /// </summary> /// <returns>The logic identifier.</returns> - public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId,int LogicType) + public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId, int LogicType) { return await System.Threading.Tasks.Task.Run(async () => { @@ -452,13 +453,26 @@ } } var accounts = new JArray(); - foreach (var dictionary in logic.Accounts) { + foreach (var dictionary in logic.Accounts) + { var Type = int.Parse(dictionary["Type"]); switch (Type) { - case 1: { + case 1: + { /// - } break; + if (logic.LogicType == 1) + { + var accounts1 = new JObject + { + ["Type"] = int.Parse(dictionary["Type"]), + ["Account"] = dictionary["Account"], + + }; + accounts.Add(accounts1); + } + } + break; case 7: { var location = new JObject @@ -481,6 +495,7 @@ { "IsEnable", logic.IsEnable} , { "LogicName", logic.LogicName}, { "Relationship",logic.Relationship} , + { "LogicType",logic.LogicType} , { "LogicCustomPushText",logic.LogicCustomPushText} , { "TimeAttribute", timeAttribute} , { "Conditions", conditions }, @@ -569,13 +584,13 @@ /// 鑾峰彇Logic鍒楄〃鐨勬柟娉� /// </summary> /// <returns>The logic identifier.</returns> - public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum,int LogicType) + public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum, int LogicType) { return await System.Threading.Tasks.Task.Run(async () => { - var listLogic = new List<Common.Logic>(); - // bool @bool = false; + var listLogic = new List<Common.Logic>(); + // bool @bool = false; Action<string, string> action = (topic, data) => { var gatewayID = topic.Split('/')[0]; @@ -597,6 +612,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()); @@ -696,67 +712,69 @@ return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId); } + #endregion #region ----鑾峰彇闂ㄩ攣 - public static List<DoorLock> ReadDoorLockIfon(string doorlockMac) + #region ---绗�1绉� + public static List<LogicLock> ReadDoorLockIfon(string doorlockMac) { - List<DoorLock> list = new List<DoorLock>(); + List<LogicLock> list = new List<LogicLock>(); 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())) - { + 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 { } - }); + 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) + while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000) { if (list.Count != 0) { @@ -767,9 +785,9 @@ } - public static List<DoorLock> ReadToken(Residential residential) + public static List<LogicLock> ReadToken(Residential residential) { - List<DoorLock> list = new List<DoorLock>(); + List<LogicLock> list = new List<LogicLock>(); 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(); @@ -791,7 +809,7 @@ var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString(); var RequestToken = jObject["ResponseData"]["RequestToken"].ToString(); Residential lockifon = new Residential(); - lockifon.Url = RequestBaseUrl + "/App/GetDoorLockPager"; + lockifon.Url = RequestBaseUrl + "/DoorLock/GetDoorLockPager"; lockifon.Token = RequestToken; lockifon.Id = Config.Instance.HomeId; lockifon.IsOtherAccountCtrl = true; @@ -812,10 +830,10 @@ return list; } - public static List<DoorLock> ReadDoorLock(Residential lockifon) + public static List<LogicLock> ReadDoorLock(Residential lockifon) { - List<DoorLock> list = new List<DoorLock>(); - System.Net.WebClient webClient = new System.Net.WebClient(); + List<LogicLock> list = new List<LogicLock>(); + 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); @@ -839,7 +857,7 @@ for (int i = 0; i < datalist.Count; i++) { var data = JObject.Parse(datalist[i].ToString()); - DoorLock doorLock = new DoorLock(); + LogicLock doorLock = new LogicLock(); doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString(); doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString()); doorLock.CloudAccountId = data["CloudAccountId"].ToString(); @@ -847,9 +865,9 @@ } } - catch + catch (Exception e) { - + var s = e.Message; } }); @@ -864,44 +882,309 @@ return list; } + #endregion + + #region ---绗�2绉� + /// <summary> + /// 鑾峰彇鑷繁+鍏朵粬鎴愬憳淇℃伅 + /// </summary> + /// <param name="doorlockMac">闂ㄩ攣Mac</param> + /// <returns></returns> + public static async System.Threading.Tasks.Task<List<MembershipIfon>> AllMembers(string doorlockMac) + { + var userlist = new List<MembershipIfon>(); + ///鍒ゆ柇APP鐧诲綍杩涙潵鐢ㄦ埛韬唤(涓讳汉锛岀鐞嗗憳锛屾垚鍛�) + var doorlockifonlist = await ReadUserListIfon(doorlockMac); + var membershipIfon = new MembershipIfon(); + membershipIfon.MembershipId = Config.Instance.Guid; + if (string.IsNullOrEmpty(Config.Instance.Name)) + { + membershipIfon.MembershipName = Config.Instance.Account; + } + else + { + membershipIfon.MembershipName = Config.Instance.Name; + } + foreach (var o in doorlockifonlist) + { + if (o.CloudAccountId == Config.Instance.Guid) + { + LockMode lockMode = new LockMode(); + lockMode.OpenMode = o.OpenLockMode; + lockMode.UserId = o.DoorLockLocalUserId; + membershipIfon.UserIdMode.Add(lockMode); + } + } + if (membershipIfon.UserIdMode.Count != 0) + { + userlist.Add(membershipIfon); + } + + 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++) + { + + var membership = new MembershipIfon(); + var membershipifon = listInfo[i]; + membership.MembershipId = membershipifon.SubAccountDistributedMark; + if (string.IsNullOrEmpty(membershipifon.UserName)) + { + membership.MembershipName = membershipifon.Account; + } + else + { + membership.MembershipName = membershipifon.UserName; + + } + for (int j = 0; j < doorlockifonlist.Count; j++) + { + ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗) + if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId) + { + LockMode lockMode = new LockMode(); + lockMode.OpenMode = doorlockifonlist[j].OpenLockMode; + lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId; + membership.UserIdMode.Add(lockMode); + } + + } + if (membership.UserIdMode.Count != 0) + { + ///杩囨护鎺夐噸澶嶆暟鎹紱 + var str = userlist.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; }); + if (str == null) + { + userlist.Add(membership); + } + } + + } + + } + return userlist; + } + /// <summary> + /// 璇诲彇闂ㄩ攣鎵�鏈夋垚鍛樹俊鎭� + /// </summary> + /// <param name="doorlockMac">闂ㄩ攣Mac</param> + /// <returns></returns> + public static async System.Threading.Tasks.Task<List<LogicLock>> ReadUserListIfon(string doorlockMac) + { + List<LogicLock> list = new List<LogicLock>(); + var s = await ReadUserList(doorlockMac); + var jObject = JObject.Parse(s); + if (jObject == null || jObject["StateCode"].ToString() != "Success") + { + 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()); + LogicLock doorLock = new LogicLock(); + doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString(); + doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString()); + doorLock.CloudAccountId = data["CloudAccountId"].ToString(); + list.Add(doorLock); + } + return list; + } + + public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac) + { + string s = null; + var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager"); + var jObject = JObject.Parse(str); + if (jObject == null || jObject["StateCode"].ToString() != "Success") + { + 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()) + { + 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; + residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl"; + s = await ReadUserDoorLock(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; + s = await WebClientAsync(2, residential.Url, residential); + } + + } + } + 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); + + } + 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()); + } + System.Net.WebClient webClient = new System.Net.WebClient(); + byte[] responseArray = webClient.UploadValues(url, postValues); + return System.Text.Encoding.UTF8.GetString(responseArray); + } + + + + #endregion + 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; + /// <summary> + /// 褰撳墠闂ㄩ攣mac + /// </summary> public string doorlockmac; } - public class DoorLock + public class LogicLock { - public string DoorLockLocalUserId = string.Empty; - public int OpenLockMode; - public string CloudAccountId = string.Empty; /// <summary> - /// 韬唤+瑙﹀彂婧�(0鎸夐敭/3鍗�/15鎸囩汗) + /// 瑙﹀彂婧怚D /// </summary> - public string UserIdMode - { - get - { - return DoorLockLocalUserId + "_" + OpenLockMode.ToString(); - } - } + public string DoorLockLocalUserId = string.Empty; + /// <summary> + /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;) + /// </summary> + public int OpenLockMode; + /// <summary> + /// 璇嗗埆鐢ㄦ埛韬唤 + /// </summary> + public string CloudAccountId = string.Empty; } public class MembershipIfon { + /// <summary> + /// 璇嗗埆鐢ㄦ埛韬唤 + /// </summary> public string MembershipId = string.Empty; - public List<string> UserIdMode=new List<string>(); + /// <summary> + /// 瑙﹀彂婧怚D+妯″紡(0:瀵嗙爜;3:鍗�;15:鎸囩汗;) + /// </summary> + public List<LockMode> UserIdMode = new List<LockMode>(); + /// <summary> + /// 鐢ㄦ埛鏄电О + /// </summary> public string MembershipName = string.Empty; } - public static List<MembershipIfon> UserList = new List<MembershipIfon>(); + public class LockMode + { + /// <summary> + /// 瑙﹀彂婧怚D + /// </summary> + public string UserId = string.Empty; + /// <summary> + /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;) + /// </summary> + public int OpenMode; - + } + /// <summary> + /// 鑷姩鍖栭棬閿佹垚鍛樹俊鎭綔涓烘潯浠跺垪琛� + /// </summary> + public static List<MembershipIfon> UserList = new List<MembershipIfon>(); + /// <summary> + ///鑱斿姩浜嬩欢闂ㄩ攣鎴愬憳淇℃伅浣滀负鏉′欢鐨勫垪琛� + /// </summary> + public static List<MembershipIfon> LinkageventLockList = 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