~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -7,6 +7,7 @@
			using System.Collections.Specialized;
			using System.Net;
			using System.IO;
			using System.Diagnostics.CodeAnalysis;

			namespace Shared.Phone.Device.Logic
			{
			@@ -22,7 +23,7 @@
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			List<int> logicIdList = new List<int>();


			Action<string, string> action = (topic, data) =>
			{
			var gatewayID = topic.Split('/')[0];
			@@ -31,7 +32,7 @@
			{
			return;
			}


			if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
			{

			@@ -44,7 +45,7 @@
			{
			var logicId = int.Parse(listIfon["LogicId"].ToString());
			logicIdList.Add(logicId);


			}

			}
			@@ -63,7 +64,8 @@
			jObject.Add("Data", jObjectdata1);
			mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
			}
			catch(Exception e) {
			catch (Exception e)
			{
			var d = e.Message;
			}
			//await System.Threading.Tasks.Task.Run(async () =>
			@@ -267,7 +269,7 @@

			try
			{


			var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2000 } };
			var selectMonthList = new JArray { };
			foreach (var intvalue in logic.TimeAttribute.SelectMonDate)
			@@ -476,7 +478,7 @@
			["LinkType"] = int.Parse(dictionary["LinkType"].ToString()),
			["DeviceAddr"] = dictionary["DeviceAddr"].ToString(),
			["Epoint"] = int.Parse(dictionary["Epoint"].ToString()),
			["PassData"] =dictionary["PassData"].ToString(),
			["PassData"] = dictionary["PassData"].ToString(),
			};
			actions.Add(lockInfo);
			break;
			@@ -504,7 +506,7 @@

			if (dictionary.ContainsKey("Option4"))
			{
			accounts1.Add("Option4",dictionary["Option4"]);
			accounts1.Add("Option4", dictionary["Option4"]);
			}
			if (dictionary.ContainsKey("Option2"))
			{
			@@ -549,7 +551,7 @@
			}

			}


			var data = new JObject{
			{ "LogicId",logic.LogicId},
			{ "IsEnable", logic.IsEnable} ,
			@@ -744,7 +746,7 @@
			}
			catch { }
			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000)
			while ((DateTime.Now - dateTime).TotalMilliseconds < 5 * 1000)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (sum == listLogic.Count)
			@@ -974,7 +976,7 @@
			{
			string s = null;
			var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//不同区域域名前缀不一样


			var jObject = JObject.Parse(str);
			if (jObject == null \|\| jObject["StateCode"].ToString() != "Success")
			{
			@@ -1036,7 +1038,7 @@
			lockifon.doorlockmac = residential.doorlockmac;
			return await WebClientAsync(2, lockifon.Url, lockifon);
			}


			public class Residential
			{
			/// <summary>
			@@ -1240,33 +1242,42 @@
			{
			HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //创建请求
			request.Method = method; //请求方式为POST/GET
			request.ContentType = "application/json";
			request.ContentType = "application/json";
			request.Timeout = second * 1000;//超时时间
			if (_bool) {
			//用于高胜可视对讲接口
			request.Headers.Add("Authorization", Config.Instance.Token);
			}
			if (method == "POST")
			{
			byte[] jsonbyte = System.Text.Encoding.UTF8.GetBytes(str);
			request.ContentLength = jsonbyte.Length;
			Stream postStream = request.GetRequestStream();
			postStream.Write(jsonbyte, 0, jsonbyte.Length);
			postStream.Close();
			}
			//发送请求并获取相应回应数据
			HttpWebResponse res;
			try
			{
			res = (HttpWebResponse)request.GetResponse();
			if (_bool)
			{
			//用于高胜可视对讲接口
			request.Headers.Add("Authorization", Config.Instance.Token);
			}
			if (method == "POST")
			{
			byte[] jsonbyte = System.Text.Encoding.UTF8.GetBytes(str);
			request.ContentLength = jsonbyte.Length;
			Stream postStream = request.GetRequestStream();
			postStream.Write(jsonbyte, 0, jsonbyte.Length);
			postStream.Close();
			}
			//发送请求并获取相应回应数据
			HttpWebResponse res;
			try
			{
			res = (HttpWebResponse)request.GetResponse();
			}
			catch (WebException ex)
			{
			res = (HttpWebResponse)ex.Response;
			}
			StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
			string content = sr.ReadToEnd(); //获得响应字符串
			return content;
			}
			catch (WebException ex)
			catch
			{
			res = (HttpWebResponse)ex.Response;
			return null;
			}
			StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
			string content = sr.ReadToEnd(); //获得响应字符串
			return content;

			}
			/// <summary>
			/// 请求服务器的方法