From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 710 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 647 insertions(+), 63 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
old mode 100644
new mode 100755
index 67f0ddd..15ca0f0
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -3,16 +3,19 @@
using Newtonsoft.Json.Linq;
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>
/// <returns>The logic identifier.</returns>
- public static async System.Threading.Tasks.Task<List<int>> GetLogicId()
+ public static async System.Threading.Tasks.Task<List<int>> GetLogicId(int LogicType)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
@@ -30,7 +33,8 @@
{
var list = jObjectdata["Data"]["LogicList"];
- if(list==null){
+ if (list == null)
+ {
return;
}
foreach (var listIfon in list)
@@ -50,7 +54,9 @@
mainGateWay.GwResDataAction += action;
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2004 } };
- mainGateWay?.Send("Logic/GetLogicList",jObject.ToString());
+ var jObjectdata1 = new JObject { { "LogicType", LogicType } };
+ jObject.Add("Data", jObjectdata1);
+ mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
//await System.Threading.Tasks.Task.Run(async () =>
//{
var dateTime = DateTime.Now;
@@ -71,14 +77,14 @@
/// 鑾峰彇Logic鐨勬柟娉�
/// </summary>
/// <returns>The logic identifier.</returns>
- public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId)
+ public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId, int LogicType)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
Common.Logic logic = null;
Action<string, string> action = (topic, data) =>
{
-
+
var gatewayID = topic.Split('/')[0];
var jObjectdata = JObject.Parse(data);
if (jObjectdata == null)
@@ -88,51 +94,52 @@
if (topic == $"{gatewayID}/Logic/GetLogicInfo_Respon")
{
-
- logic = new Common.Logic();
- var Logicifon = jObjectdata["Data"];
- logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
- logic.IsEnable = int.Parse(Logicifon["IsEnable"]?.ToString());
- logic.LogicName = Logicifon["LogicName"]?.ToString();
- 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());
- var listactions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(Logicifon["Actions"].ToString());
- if (listactions != null)
+ logic = new Common.Logic();
+ var Logicifon = jObjectdata["Data"];
+ logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
+ logic.IsEnable = int.Parse(Logicifon["IsEnable"]?.ToString());
+ logic.LogicName = Logicifon["LogicName"]?.ToString();
+
+ logic.Relationship = int.Parse(Logicifon["Relationship"]?.ToString());
+ logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<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());
+ var listactions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(Logicifon["Actions"].ToString());
+ if (listactions != null)
+ {
+ foreach (var actions in listactions)
{
- foreach (var actions in listactions)
+ Dictionary<string, object> actionsdictionary = new Dictionary<string, object>();
+ List<Dictionary<string, string>> tasklist = new List<Dictionary<string, string>>();
+ if (actions["LinkType"].ToString() == "0")
{
- Dictionary<string, object> actionsdictionary = new Dictionary<string, object>();
- List<Dictionary<string, string>> tasklist = new List<Dictionary<string, string>>();
- if (actions["LinkType"].ToString() == "0")
+ actionsdictionary.Add("LinkType", actions["LinkType"]);
+ actionsdictionary.Add("DeviceAddr", actions["DeviceAddr"]);
+ actionsdictionary.Add("Epoint", actions["Epoint"]);
+ actionsdictionary.Add("Time", actions["Time"]);
+ var list = JArray.Parse(actions["TaskList"].ToString());
+ foreach (var taskIfon in list)
{
- actionsdictionary.Add("LinkType", actions["LinkType"]);
- actionsdictionary.Add("DeviceAddr", actions["DeviceAddr"]);
- actionsdictionary.Add("Epoint", actions["Epoint"]);
- actionsdictionary.Add("Time", actions["Time"]);
- var list = JArray.Parse(actions["TaskList"].ToString());
- foreach (var taskIfon in list)
- {
- Dictionary<string, string> dictionary = new Dictionary<string, string>();
- dictionary.Add("TaskType", taskIfon["TaskType"].ToString());
- dictionary.Add("Data1", taskIfon["Data1"].ToString());
- dictionary.Add("Data2", taskIfon["Data2"].ToString());
- tasklist.Add(dictionary);
- }
- actionsdictionary.Add("TaskList", tasklist);
+ Dictionary<string, string> dictionary = new Dictionary<string, string>();
+ dictionary.Add("TaskType", taskIfon["TaskType"].ToString());
+ dictionary.Add("Data1", taskIfon["Data1"].ToString());
+ dictionary.Add("Data2", taskIfon["Data2"].ToString());
+ tasklist.Add(dictionary);
}
- else
- {
- actionsdictionary = actions;
- }
-
- logic.Actions.Add(actionsdictionary);
+ actionsdictionary.Add("TaskList", tasklist);
+ }
+ else
+ {
+ actionsdictionary = actions;
}
+ logic.Actions.Add(actionsdictionary);
}
-
- };
+
+ }
+
+ }
};
var mainGateWay = ZbGateway.MainGateWay;
if (mainGateWay == null)
@@ -145,7 +152,8 @@
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2002 } };
var data = new JObject {
- { "LogicId",LogicId}
+ { "LogicId",LogicId},
+ { "LogicType",LogicType}
};
jObject.Add("Data", data);
ZbGateway.MainGateWay?.Send("Logic/GetLogicInfo", jObject.ToString());
@@ -219,7 +227,7 @@
Common.Logic Logicifon = null;
Action<string, string> action = (topic, datastring) =>
{
-
+
var gatewayID = topic.Split('/')[0];
var jObjectdata = JObject.Parse(datastring);
if (jObjectdata == null)
@@ -230,8 +238,8 @@
if (topic == gatewayID + "/Logic/AddLogic_Respon")
{
try
- {
- Logicifon=new Common.Logic();
+ {
+ Logicifon = new Common.Logic();
Logicifon = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Logic>(jObjectdata["Data"].ToString());
}
catch (Exception ex)
@@ -250,10 +258,6 @@
try
{
- //var bytes = new byte[64];
- //var LogicNameBytes = System.Text.Encoding.UTF8.GetBytes(logic.LogicName);
- //Array.Copy(LogicNameBytes, 0, bytes, 0, 64 < LogicNameBytes.Length ? 64 : LogicNameBytes.Length);
- //logic.LogicName = System.Text.Encoding.UTF8.GetString(bytes);
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2000 } };
var selectMonthList = new JArray { };
@@ -281,7 +285,7 @@
var tInfo = new JObject
{
["Type"] = int.Parse(dictionary["Type"]),
- ["IsValid"] =int.Parse(dictionary["IsValid"]),
+ ["IsValid"] = int.Parse(dictionary["IsValid"]),
["DateType"] = int.Parse(dictionary["DateType"]),
["RemindTime"] = int.Parse(dictionary["RemindTime"]),
["EnDelay"] = int.Parse(dictionary["EnDelay"]),
@@ -309,8 +313,13 @@
["AttriButeId"] = int.Parse(dictionary["AttriButeId"]),
["AttriButeData1"] = int.Parse(dictionary["AttriButeData1"]),
["AttriButeData2"] = int.Parse(dictionary["AttriButeData2"]),
- ["Range"] = int.Parse(dictionary["Range"]),
+ ["Range"] = int.Parse(dictionary["Range"])
};
+ if (dictionary.ContainsKey("IgnoreTime"))
+ {
+ dInfo.Add("IgnoreTime", int.Parse(dictionary["IgnoreTime"]));
+ }
+
conditions.Add(dInfo);
break;
case 2:
@@ -397,7 +406,7 @@
["LinkType"] = int.Parse(dictionary["LinkType"].ToString()),
["DeviceAddr"] = dictionary["DeviceAddr"].ToString(),
["Epoint"] = int.Parse(dictionary["Epoint"].ToString()),
- ["Time"] =int.Parse(dictionary["Time"].ToString()),
+ ["Time"] = int.Parse(dictionary["Time"].ToString()),
["taskList"] = taskList,
};
@@ -433,16 +442,66 @@
};
actions.Add(cdInfo);
break;
+ case 7:
+ var timeInfo = new JObject
+ {
+ ["LinkType"] = int.Parse(dictionary["LinkType"].ToString()),
+ ["DelayTime"] = int.Parse(dictionary["DelayTime"].ToString()),
+ };
+ actions.Add(timeInfo);
+ break;
}
+ }
+ var accounts = new JArray();
+ foreach (var dictionary in logic.Accounts)
+ {
+ var Type = int.Parse(dictionary["Type"]);
+ switch (Type)
+ {
+ case 1:
+ {
+ ///
+ if (logic.LogicType == 1)
+ {
+ var accounts1 = new JObject
+ {
+ ["Type"] = int.Parse(dictionary["Type"]),
+ ["Account"] = dictionary["Account"],
+ ["UserId"] = dictionary["UserId"],
+
+ };
+ accounts.Add(accounts1);
+ }
+ }
+ break;
+ case 7:
+ {
+ var location = new JObject
+ {
+ ["Type"] = int.Parse(dictionary["Type"]),
+ ["Account"] = dictionary["Account"],
+ ["Longitude"] = int.Parse(dictionary["Longitude"]),
+ ["Latitude"] = int.Parse(dictionary["Latitude"]),
+ ["Radius"] = int.Parse(dictionary["Radius"]),
+
+ };
+ accounts.Add(location);
+ }
+ break;
+ }
+
}
var data = new JObject{
{ "LogicId",logic.LogicId},
{ "IsEnable", logic.IsEnable} ,
{ "LogicName", logic.LogicName},
{ "Relationship",logic.Relationship} ,
+ { "LogicType",logic.LogicType} ,
+ { "LogicCustomPushText",logic.LogicCustomPushText} ,
{ "TimeAttribute", timeAttribute} ,
{ "Conditions", conditions },
{ "Actions", actions },
+ { "Accounts", accounts },
};
jObject.Add("Data", data);
ZbGateway.MainGateWay?.Send("Logic/AddLogic", jObject.ToString());
@@ -454,7 +513,7 @@
var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < 3*1000)
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
{
await System.Threading.Tasks.Task.Delay(100);
if (Logicifon != null)
@@ -467,26 +526,551 @@
});
}
/// <summary>
- /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+ /// 鍗曠嫭鎺у埗鑷姩鍖栧紑鍏冲睘鎬�
+ /// </summary>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<int> LogicControlSwitch(Common.Logic logic)
+ {
+ return await System.Threading.Tasks.Task.Run(async () =>
+ {
+ int intvalue = 3;
+ Action<string, string> action = (topic, data) =>
+ {
+ var gatewayID = topic.Split('/')[0];
+ var jObjectdata = JObject.Parse(data);
+ if (jObjectdata == null)
+ {
+ return;
+ }
+
+ if (topic == $"{gatewayID}/Logic/ReviseAttribute_Respon")
+ {
+ intvalue = int.Parse(jObjectdata["Data"]["Result"].ToString());
+ }
+ };
+ var mainGateWay = ZbGateway.MainGateWay;
+ if (mainGateWay == null)
+ {
+ Console.WriteLine("娌℃湁涓荤綉鍏�");
+ return intvalue;
+ }
+ mainGateWay.GwResDataAction += action;
+
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2001 } };
+ var date = new JObject();
+ jObject.Add("Data", date);
+ date.Add("LogicId", logic.LogicId);
+ date.Add("IsEnable", logic.IsEnable);
+ date.Add("LogicName", logic.LogicName);
+ date.Add("Relationship", logic.Relationship);
+ date.Add("LogicCustomPushText", logic.LogicCustomPushText);
+ mainGateWay?.Send("Logic/ReviseAttribute", jObject.ToString());
+ //await System.Threading.Tasks.Task.Run(async () =>
+ //{
+ var dateTime = DateTime.Now;
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
+ {
+ await System.Threading.Tasks.Task.Delay(100);
+ if (intvalue != 3)
+ {
+ break;
+ }
+ }
+ ZbGateway.MainGateWay.GwResDataAction -= action;
+ //});
+ return intvalue;
+ });
+ }
+ /// <summary>
+ /// 鑾峰彇Logic鍒楄〃鐨勬柟娉�
+ /// </summary>
+ /// <returns>The logic identifier.</returns>
+ 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;
+ Action<string, string> action = (topic, data) =>
+ {
+ var gatewayID = topic.Split('/')[0];
+ var jObjectdata = JObject.Parse(data);
+ if (jObjectdata == null)
+ {
+ return;
+ }
+
+ if (topic == $"{gatewayID}/Logic/GetAllLogicListInfo_Respon")
+ {
+
+ var logic = new Common.Logic();
+ var Logicifon = jObjectdata["Data"];
+ logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
+ logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
+ logic.LogicName = Logicifon["LogicName"].ToString();
+ logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
+ 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());
+
+ if (listactions != null)
+ {
+ foreach (var actions in listactions)
+ {
+ Dictionary<string, object> actionsdictionary = new Dictionary<string, object>();
+ List<Dictionary<string, string>> tasklist = new List<Dictionary<string, string>>();
+ if (actions["LinkType"].ToString() == "0")
+ {
+ actionsdictionary.Add("LinkType", actions["LinkType"]);
+ actionsdictionary.Add("DeviceAddr", actions["DeviceAddr"]);
+ actionsdictionary.Add("Epoint", actions["Epoint"]);
+ actionsdictionary.Add("Time", actions["Time"]);
+ var list = JArray.Parse(actions["TaskList"].ToString());
+ foreach (var taskIfon in list)
+ {
+ Dictionary<string, string> dictionary = new Dictionary<string, string>();
+ dictionary.Add("TaskType", taskIfon["TaskType"].ToString());
+ dictionary.Add("Data1", taskIfon["Data1"].ToString());
+ dictionary.Add("Data2", taskIfon["Data2"].ToString());
+ tasklist.Add(dictionary);
+ }
+ actionsdictionary.Add("TaskList", tasklist);
+ }
+ else
+ {
+ actionsdictionary = actions;
+ }
+
+ logic.Actions.Add(actionsdictionary);
+ }
+
+ }
+
+ lock (listLogic)
+ {
+ var @null = listLogic.Find((o) => { return o.LogicId == logic.LogicId; });
+ if (@null == null)
+ {
+ listLogic.Add(logic);
+ }
+ }
+
+ }
+ //if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
+ //{
+ // @bool = true;
+ //}
+ };
+ var mainGateWay = ZbGateway.MainGateWay;
+ if (mainGateWay == null)
+ {
+ Console.WriteLine("娌℃湁涓荤綉鍏�");
+ return listLogic;
+ }
+ mainGateWay.GwResDataAction += action;
+ try
+ {
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2015 } };
+ var jObjectdata = new JObject { { "LogicType", LogicType } };
+ jObject.Add("Data", jObjectdata);
+ ZbGateway.MainGateWay?.Send("Logic/GetAllLogicListInfo", jObject.ToString());
+ }
+ catch { }
+ var dateTime = DateTime.Now;
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
+ {
+ await System.Threading.Tasks.Task.Delay(100);
+ if (sum == listLogic.Count)
+ {
+ break;
+ }
+ //if (@bool)
+ //{
+ // break;
+ //}
+ }
+ ZbGateway.MainGateWay.GwResDataAction -= action;
+ return listLogic;
+ });
+ }
+ // <summary>
+ /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
/// </summary>
/// <param name="btnregionname">Btnregionname.</param>
/// <param name="device">Device.</param>
public static void RoomNmae(Button btnregionname, CommonDevice device)
{
var room = new Common.Room();
- var roomlistname = room.GetRoomListNameByDevice(device);
- if (roomlistname.Count == 0)
+ btnregionname.Text = room.GetRoomNameByDevice(device);
+ }
+
+ public static List<Common.Room> GetRoomList(string floorId)
+ {
+ return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
+
+ }
+ #endregion
+
+ #region ----鑾峰彇闂ㄩ攣
+
+ /// <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 AllUserIfon = await ReadUserListIfon(doorlockMac);
+ var currUserIfon = new MembershipIfon();
+ currUserIfon.CloudAccountId = Config.Instance.Guid;
+ if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
{
- btnregionname.Text = Language.StringByID(R.MyInternationalizationString.customroom);
+ ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
}
else
{
- foreach (var roomname in roomlistname)
- {
- btnregionname.Text += roomname + ",";
- }
- btnregionname.Text = btnregionname.Text.TrimEnd(',');
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
}
+ foreach (var o in AllUserIfon)
+ {
+ if (o.IsFreezeUser || string.IsNullOrEmpty(o.UserId))
+ {
+ ///杩囨护鎺夊喕缁撶殑鎴愬憳鍜孶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);
+ }
+ }
+ if (currUserIfon.UserIdMode.Count != 0)
+ {
+ 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++)
+ {
+
+ var userIfon = new MembershipIfon();
+ var user = listInfo[i];
+ userIfon.CloudAccountId = user.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(user.UserName))
+ {
+ ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ userIfon.UserName = user.Account;
+
+ }
+ 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);
+ }
+ }
+
+ }
+
+ }
+ 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")
+ {
+ 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 async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
+ {
+ 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")
+ {
+ 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 = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
+ //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
+ s = await ReadUserDoorLock(residential);
+ }
+ else
+ {
+ 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);
+ }
+
+ }
+ }
+ 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;
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣mac
+ /// </summary>
+ public string doorlockmac;
+ }
+
+ public class MembershipIfon
+ {
+ /// <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 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