~wjc/HomeApp.git

			@@ -380,6 +380,16 @@
			};
			conditions.Add(sInfo);
			break;
			case 7:
			var diliInfo = new JObject
			{
			["Type"] = int.Parse(dictionary["Type"]),
			["IsValid"] = int.Parse(dictionary["IsValid"]),
			["AtHome"] = int.Parse(dictionary["AtHome"]),
			["WhoSiteUId"] =dictionary["WhoSiteUId"],
			};
			conditions.Add(diliInfo);
			break;
			}
			}
			var actions = new JArray();
			@@ -467,6 +477,7 @@
			{
			["Type"] = int.Parse(dictionary["Type"]),
			["Account"] = dictionary["Account"],
			["UserId"] = dictionary["UserId"],

			};
			accounts.Add(accounts1);
			@@ -710,16 +721,91 @@
			public static List<Common.Room> GetRoomList(string floorId)
			{
			return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
			//var list1 = new List<Common.Room>();
			/////找到某楼层房间列表；
			//var list = Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
			//for (int i = 0; i < list.Count; i++)
			//{
			// if (str == "device")
			// {
			// if (list[i].DeviceUIList.Count != 0)
			// { ///过滤掉没有设备的房间
			// list1.Add(list[i]);
			// }
			// }
			// else
			// {
			// if (list[i].SceneUIList.Count != 0)
			// { ///过滤掉没有场景的房间
			// list1.Add(list[i]);
			// }
			// }
			//}
			/////返回房间列表；
			//return list1;
			}


			/// <summary>
			/// 获取场景信息的方法
			/// </summary>
			/// <param name="SceneId"></param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<SceneUI> GetScene(int SceneId)
			{
			SceneUI sceneui = null;
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			Action<string, string> action = (topic, data) =>
			{
			var gatewayID = topic.Split('/')[0];
			var jObjectdata = JObject.Parse(data);
			if (jObjectdata == null)
			{
			return;
			}

			if (topic == $"{gatewayID}/Scene/GetDeviceList_Respon")
			{
			sceneui = new SceneUI();
			sceneui.Name = jObjectdata["Data"]["ScenesName"].ToString();
			sceneui.Id = int.Parse(jObjectdata["Data"]["ScenesId"].ToString());

			}
			};
			var mainGateWay = ZbGateway.MainGateWay;
			if (mainGateWay == null)
			{
			Console.WriteLine("没有主网关");
			return sceneui;
			}
			mainGateWay.GwResDataAction += action;

			var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 806 } };
			var jObjectdata1 = new JObject { { "ScenesId", SceneId } };
			jObject.Add("Data", jObjectdata1);
			mainGateWay?.Send("Scene/GetDeviceList", jObject.ToString());
			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (sceneui!=null)
			{
			break;
			}
			}
			ZbGateway.MainGateWay.GwResDataAction -= action;
			return sceneui;
			});
			}
			#endregion

			#region ----获取门锁


			/// <summary>
			/// 获取自己+其他成员信息
			/// </summary>
			/// <param name="doorlockMac">门锁Mac</param>
			/// <param name="doorlockMac">门锁Mac+端口</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<List<MembershipIfon>> AllMembers(string doorlockMac)
			{
			@@ -728,22 +814,29 @@
			var AllUserIfon = await ReadUserListIfon(doorlockMac);
			var currUserIfon = new MembershipIfon();
			currUserIfon.CloudAccountId = Config.Instance.Guid;
			if (string.IsNullOrEmpty(Config.Instance.UserName))
			if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
			{
			currUserIfon.UserName = Config.Instance.Account;
			///如果昵称为空，此时，登陆账号为默认昵称；
			currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
			}
			else
			{
			currUserIfon.UserName = Config.Instance.UserName;
			currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
			}
			foreach (var o in AllUserIfon)
			{
			if (o.IsFreezeUser \|\| string.IsNullOrEmpty(o.UserId))
			{
			///过滤掉冻结的成员和UserId为空的数据；
			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;
			@@ -769,6 +862,7 @@
			userIfon.CloudAccountId = user.SubAccountDistributedMark;
			if (string.IsNullOrEmpty(user.UserName))
			{
			///如果昵称为空，此时，登陆账号为默认昵称；
			userIfon.UserName = user.Account;

			}
			@@ -779,6 +873,11 @@
			}
			for (int j = 0; j < AllUserIfon.Count; j++)
			{
			if (AllUserIfon[j].IsFreezeUser \|\| string.IsNullOrEmpty(AllUserIfon[j].UserId))
			{
			///过滤掉冻结的成员和UserId为空的数据；
			continue;
			}
			if (string.IsNullOrEmpty(userIfon.DoorLockMacPort))
			{
			userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
			@@ -834,6 +933,7 @@
			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;
			@@ -841,8 +941,8 @@

			public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
			{
			string s = null;
			var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/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")
			@@ -886,7 +986,7 @@
			}
			return s;
			}


			public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
			{

			@@ -931,14 +1031,14 @@
			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)
			{
			postValues.Add("RequestVersion", CommonPage.RequestVersion);
			postValues.Add("LoginAccessToken", residential.Token);
			postValues.Add("HomeId", residential.Id);
			postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac
			postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac+端口
			postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
			postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
			}
			@@ -972,7 +1072,7 @@
			public string doorlockmac;
			}

			public class MembershipIfon
			public class MembershipIfon
			{
			/// <summary>
			/// 识别用户身份
			@@ -990,7 +1090,10 @@
			/// 用户昵称
			/// </summary>
			public string UserName = string.Empty;

			/// <summary>
			/// 是否冻结该成员（true已冻结）
			/// </summary>
			public bool IsFreezeUser;

			}

			@@ -1033,15 +1136,17 @@
			/// 门锁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>
			@@ -1051,5 +1156,40 @@
			/// </summary>
			public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
			#endregion

			#region 存取本地文件的方法 ---暂时不用合并该方法---
			/// <summary>
			/// 文件保存
			/// </summary>
			/// <param name="FileName">文件路径</param>
			/// <param name="obj">需要序列化数据</param>
			public static void SaveLocalFile(string FileName, object obj)
			{
			//先序列化数据；
			var data = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
			//数据转换为字节流；
			var byteData = System.Text.Encoding.UTF8.GetBytes(data);
			//写入数据；
			Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
			}

			/// <summary>
			/// 文件读取
			/// </summary>
			/// <param name="FileName">文件路径</param>
			/// <returns></returns>
			public static string ReadLocalFile(string FileName)
			{
			if (System.IO.File.Exists(FileName) == false)
			{
			///判断是否有文件;
			return null;
			}
			//读出保存该路径的文件；
			var varByte = Shared.IO.FileUtils.ReadFile(FileName);
			//字节流转换为字符串；
			return System.Text.Encoding.UTF8.GetString(varByte);
			}
			#endregion
			}
			}