From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 351 ++++++++++++++++++----------------------------------------
1 files changed, 108 insertions(+), 243 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 1060bd2..baa7047 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -715,176 +715,7 @@
#endregion
#region ----鑾峰彇闂ㄩ攣
- #region ---绗�1绉�
- public static List<LogicLock> ReadDoorLockIfon(string doorlockMac)
- {
- 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()))
- {
- //鍒嗕韩鑰匢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)
- {
- if (list.Count != 0)
- {
- break;
- }
- }
- return list;
-
- }
-
- public static List<LogicLock> ReadToken(Residential residential)
- {
- 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();
- 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(() =>
- {
- 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 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;
- list = ReadDoorLock(lockifon);
-
- }
- catch { }
- });
- var datetime = DateTime.Now;
- while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
- {
- if (list.Count != 0)
- {
- break;
- }
- }
- return list;
- }
-
- public static List<LogicLock> ReadDoorLock(Residential lockifon)
- {
- 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);
- postValues.Add("HomeId", lockifon.Id);
- postValues.Add("DoorLockId", lockifon.doorlockmac);//闂ㄩ攣Mac19091
- postValues.Add("IsOtherAccountCtrl", lockifon.IsOtherAccountCtrl.ToString());
- System.Threading.Tasks.Task.Run(() =>
- {
- try
- {
-
- 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")
- {
- 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());
- LogicLock doorLock = new LogicLock();
- doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
- doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
- doorLock.CloudAccountId = data["CloudAccountId"].ToString();
- list.Add(doorLock);
- }
-
- }
- catch (Exception e)
- {
- var s = e.Message;
- }
-
- });
- var datetime = DateTime.Now;
- while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
- {
- if (list.Count != 0)
- {
- break;
- }
- }
- return list;
- }
-
- #endregion
-
- #region ---绗�2绉�
/// <summary>
/// 鑾峰彇鑷繁+鍏朵粬鎴愬憳淇℃伅
/// </summary>
@@ -894,30 +725,35 @@
{
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))
+ var AllUserIfon = await ReadUserListIfon(doorlockMac);
+ var currUserIfon = new MembershipIfon();
+ currUserIfon.CloudAccountId = Config.Instance.Guid;
+ if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
{
- membershipIfon.MembershipName = Config.Instance.Account;
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
}
else
{
- membershipIfon.MembershipName = Config.Instance.Name;
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
}
- foreach (var o in doorlockifonlist)
+ foreach (var o in AllUserIfon)
{
+ if (string.IsNullOrEmpty(currUserIfon.DoorLockMacPort))
+ {
+ currUserIfon.DoorLockMacPort = o.DoorLockMacPort;
+ }
if (o.CloudAccountId == Config.Instance.Guid)
{
- LockMode lockMode = new LockMode();
- lockMode.OpenMode = o.OpenLockMode;
- lockMode.UserId = o.DoorLockLocalUserId;
- membershipIfon.UserIdMode.Add(lockMode);
+ UnlockingMode unlockingMode = new UnlockingMode();
+ unlockingMode.OpenMode = o.OpenMode;
+ unlockingMode.UserId = o.UserId;
+ unlockingMode.ModeName = o.ModeName;
+ currUserIfon.UserIdMode.Add(unlockingMode);
}
}
- if (membershipIfon.UserIdMode.Count != 0)
+ if (currUserIfon.UserIdMode.Count != 0)
{
- userlist.Add(membershipIfon);
+ userlist.Add(currUserIfon);
}
if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
@@ -928,37 +764,43 @@
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))
+ var userIfon = new MembershipIfon();
+ var user = listInfo[i];
+ userIfon.CloudAccountId = user.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(user.UserName))
{
- membership.MembershipName = membershipifon.Account;
+ userIfon.UserName = user.Account;
+
}
else
{
- membership.MembershipName = membershipifon.UserName;
+ userIfon.UserName = user.UserName;
}
- for (int j = 0; j < doorlockifonlist.Count; j++)
+ for (int j = 0; j < AllUserIfon.Count; j++)
{
- ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId)
+ if (string.IsNullOrEmpty(userIfon.DoorLockMacPort))
{
- LockMode lockMode = new LockMode();
- lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
- lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId;
- membership.UserIdMode.Add(lockMode);
+ 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 (membership.UserIdMode.Count != 0)
+ if (userIfon.UserIdMode.Count != 0)
{
///杩囨护鎺夐噸澶嶆暟鎹紱
- var str = userlist.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; });
+ var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
if (str == null)
{
- userlist.Add(membership);
+ userlist.Add(userIfon);
}
}
@@ -972,9 +814,9 @@
/// </summary>
/// <param name="doorlockMac">闂ㄩ攣Mac</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<List<LogicLock>> ReadUserListIfon(string doorlockMac)
+ public static async System.Threading.Tasks.Task<List<User>> ReadUserListIfon(string doorlockMac)
{
- List<LogicLock> list = new List<LogicLock>();
+ var list = new List<User>();
var s = await ReadUserList(doorlockMac);
var jObject = JObject.Parse(s);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
@@ -986,19 +828,22 @@
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);
+ 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();
+ list.Add(user);
}
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");
+ 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")
{
@@ -1022,12 +867,14 @@
residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
residential.IsOtherAccountCtrl = true;
residential.doorlockmac = doorlockMac;
- residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
+ residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
+ //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
s = await ReadUserDoorLock(residential);
}
else
{
- residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
+ 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;
@@ -1039,7 +886,7 @@
}
return s;
}
-
+
public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
{
@@ -1071,10 +918,12 @@
{
NameValueCollection postValues = new NameValueCollection();
+
if (value == 0)
{
postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//
}
else if (value == 1)
@@ -1082,7 +931,7 @@
postValues.Add("RequestVersion", CommonPage.RequestVersion);
postValues.Add("LoginAccessToken", Config.Instance.Token);
postValues.Add("MainAccountId", residential.MainUserDistributedMark);
- postValues.Add("SharedHid", residential.Id);
+ postValues.Add("SharedHid", residential.Id);
}
else if (value == 2)
{
@@ -1090,16 +939,15 @@
postValues.Add("LoginAccessToken", residential.Token);
postValues.Add("HomeId", residential.Id);
postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac
- postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
+ 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);
- return System.Text.Encoding.UTF8.GetString(responseArray);
+ var s = System.Text.Encoding.UTF8.GetString(responseArray);
+ return s;
+
}
-
-
-
- #endregion
public class Residential
{
@@ -1124,39 +972,29 @@
public string doorlockmac;
}
- public class LogicLock
+ public class MembershipIfon
{
- /// <summary>
- /// 瑙﹀彂婧怚D
- /// </summary>
- public string DoorLockLocalUserId = string.Empty;
- /// <summary>
- /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
- /// </summary>
- public int OpenLockMode;
/// <summary>
/// 璇嗗埆鐢ㄦ埛韬唤
/// </summary>
public string CloudAccountId = string.Empty;
- }
-
- public class MembershipIfon
- {
/// <summary>
- /// 璇嗗埆鐢ㄦ埛韬唤
+ /// 闂ㄩ攣Mac+Port,璇嗗埆闂ㄩ攣锛�
/// </summary>
- public string MembershipId = string.Empty;
+ public string DoorLockMacPort = string.Empty;
/// <summary>
- /// 瑙﹀彂婧怚D+妯″紡(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// 瑙﹀彂婧愬垪琛�
/// </summary>
- public List<LockMode> UserIdMode = new List<LockMode>();
+ public List<UnlockingMode> UserIdMode = new List<UnlockingMode>();
/// <summary>
/// 鐢ㄦ埛鏄电О
/// </summary>
- public string MembershipName = string.Empty;
+ public string UserName = string.Empty;
+
+
}
- public class LockMode
+ public class UnlockingMode
{
/// <summary>
/// 瑙﹀彂婧怚D
@@ -1166,16 +1004,43 @@
/// 瑙﹀彂婧愭ā寮�(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>
- /// 鑷姩鍖栭棬閿佹垚鍛樹俊鎭綔涓烘潯浠跺垪琛�
+ /// 闂ㄩ攣鍒楄〃
/// </summary>
- public static List<MembershipIfon> UserList = new List<MembershipIfon>();
- /// <summary>
- ///鑱斿姩浜嬩欢闂ㄩ攣鎴愬憳淇℃伅浣滀负鏉′欢鐨勫垪琛�
- /// </summary>
- public static List<MembershipIfon> LinkageventLockList = new List<MembershipIfon>();
+ public static List<MembershipIfon> LockList = new List<MembershipIfon>();
/// <summary>
/// 褰撳墠闂ㄩ攣
--
Gitblit v1.8.0