~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -12,6 +12,7 @@
			{
			public class Send
			{

			#region ----Logic所有发送命令
			/// <summary>
			/// 获取LogicId的方法
			@@ -22,6 +23,9 @@
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			List<int> logicIdList = new List<int>();

			bool if_theme = false;
			int if_number = -1;
			Action<string, string> action = (topic, data) =>
			{
			var gatewayID = topic.Split('/')[0];
			@@ -30,21 +34,22 @@
			{
			return;
			}


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

			var list = jObjectdata["Data"]["LogicList"];
			if (list == null)
			if_theme = true;
			var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(jObjectdata["Data"]["LogicList"].ToString());
			if_number = list.Count;
			if (list.Count == 0)
			{
			return;
			}
			foreach (var listIfon in list)
			{
			var logicId = int.Parse(listIfon["LogicId"].ToString());
			var logicId = int.Parse(listIfon["LogicId"]);
			logicIdList.Add(logicId);

			}

			}
			};
			var mainGateWay = ZbGateway.MainGateWay;
			@@ -70,9 +75,13 @@
			while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (logicIdList.Count != 0)
			if (if_theme)
			{
			break;
			if (if_number == 0 \|\| if_number == logicIdList.Count)
			{
			break;//回复没有数据立刻返回
			}

			}
			}
			ZbGateway.MainGateWay.GwResDataAction -= action;
			@@ -101,7 +110,6 @@

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

			logic = new Common.Logic();
			var Logicifon = jObjectdata["Data"];
			logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
			@@ -180,7 +188,7 @@
			});
			}
			///<summary>
			/// 删除逻辑
			/// 删除逻辑(0成功,其它值:失败)
			/// </summary>
			public static async System.Threading.Tasks.Task<int> DelLogic(int LogicId)
			{
			@@ -246,7 +254,6 @@
			{
			try
			{
			Logicifon = new Common.Logic();
			Logicifon = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Logic>(jObjectdata["Data"].ToString());
			}
			catch (Exception ex)
			@@ -297,6 +304,7 @@
			["RemindTime"] = int.Parse(dictionary["RemindTime"]),
			["EnDelay"] = int.Parse(dictionary["EnDelay"]),
			["DelayTime"] = int.Parse(dictionary["DelayTime"]),
			["DoorLockOpenDelayTime"] = int.Parse(dictionary["DoorLockOpenDelayTime"]),
			};
			if (dictionary["DateType"].ToString() == "0")
			{
			@@ -498,6 +506,15 @@
			["AccountName"] = dictionary["AccountName"],

			};

			if (dictionary.ContainsKey("Option4"))
			{
			accounts1.Add("Option4",dictionary["Option4"]);
			}
			if (dictionary.ContainsKey("Option2"))
			{
			accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
			}
			accounts.Add(accounts1);
			}
			}
			@@ -514,6 +531,24 @@

			};
			accounts.Add(location);
			}
			break;
			case 8:
			{
			var accounts1 = new JObject();
			if (dictionary.ContainsKey("Type"))
			{
			accounts1.Add("Type", int.Parse(dictionary["Type"]));
			}
			if (dictionary.ContainsKey("Option4"))
			{
			accounts1.Add("Option4", dictionary["Option4"]);
			}
			if (dictionary.ContainsKey("Option2"))
			{
			accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
			}
			accounts.Add(accounts1);
			}
			break;
			}
			@@ -622,7 +657,6 @@
			{

			var listLogic = new List<Common.Logic>();
			// bool @bool = false;
			Action<string, string> action = (topic, data) =>
			{
			var gatewayID = topic.Split('/')[0];
			@@ -634,7 +668,6 @@

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

			var logic = new Common.Logic();
			var Logicifon = jObjectdata["Data"];
			logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
			@@ -693,10 +726,7 @@
			}

			}
			//if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
			//{
			// @bool = true;
			//}

			};
			var mainGateWay = ZbGateway.MainGateWay;
			if (mainGateWay == null)
			@@ -714,17 +744,13 @@
			}
			catch { }
			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
			while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (sum == listLogic.Count)
			{
			break;
			}
			//if (@bool)
			//{
			// break;
			//}
			}
			ZbGateway.MainGateWay.GwResDataAction -= action;
			return listLogic;
			@@ -774,7 +800,7 @@
			while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (sceneui != null)
			if (sceneui != null && sceneui.Id > 0)
			{
			break;
			}
			@@ -842,9 +868,19 @@
			{
			//服务返回来没有门锁成员信息，没有必要再去请求成员列表，
			//原因：节约时间，体验效果好；
			result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
			result = UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
			}
			if (string.IsNullOrEmpty(result))
			{
			//防止为空抛异常；
			return userlist;
			}
			var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
			var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
			if (listInfo == null)
			{
			//防止为空抛异常；
			return userlist;
			}
			for (int i = 0; i < listInfo.Count; i++)
			{

			@@ -1112,6 +1148,14 @@
			/// <param name="logic">逻辑对象</param>
			public static void Zj(bool tag, Common.Logic logic)
			{

			if (string.IsNullOrEmpty(logic.LogicCustomPushText))
			{
			///默认推送自定义内容
			string str = logic.LogicName + Language.StringByID(R.MyInternationalizationString.defaulttext);
			logic.LogicCustomPushText = str;
			}

			new System.Threading.Thread(() =>
			{
			if (logic.LogicId != 0)
			@@ -1188,33 +1232,45 @@
			/// <param name="method">请求方式为POST/GET</param>
			/// <param name="second">超时时间</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3)
			public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3, bool _bool = false)
			{
			HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //创建请求
			request.Method = method; //请求方式为POST/GET
			request.ContentType = "application/json";
			request.Timeout = second * 1000;//超时时间
			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();
			try
			{
			HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //创建请求
			request.Method = method; //请求方式为POST/GET
			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();
			}
			catch (WebException ex)
			{
			res = (HttpWebResponse)ex.Response;
			}
			StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
			string content = sr.ReadToEnd(); //获得响应字符串
			return content;
			}
			//发送请求并获取相应回应数据
			HttpWebResponse res;
			try
			{
			res = (HttpWebResponse)request.GetResponse();
			catch
			{
			return null;
			}
			catch (WebException ex)
			{
			res = (HttpWebResponse)ex.Response;
			}
			StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
			string content = sr.ReadToEnd(); //获得响应字符串
			return content;
			}
			/// <summary>
			/// 请求服务器的方法
			@@ -1264,6 +1320,23 @@

			#region 存取本地文件的方法 ---暂时不用合并该方法---
			/// <summary>
			/// 判断是否开启GPS服务
			/// </summary>
			public static string If_Exist
			{
			get
			{
			string value = ReadLocalFile(Config.Instance.HomeId+"_GPS_File");
			//读取本地GPS服务状态
			if (value == "0"\|\|string.IsNullOrEmpty(value))
			{
			return "0";
			}
			return "1";
			}

			}
			/// <summary>
			/// 文件保存
			/// </summary>
			/// <param name="FileName">文件路径</param>
			@@ -1277,7 +1350,19 @@
			//写入数据；
			Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
			}

			/// <summary>
			/// 文件保存
			/// </summary>
			/// <param name="FileName">文件路径</param>
			/// <param name="data">字符串</param>
			public static void SaveLocalFile(string FileName, string data)
			{
			//先序列化数据；
			//数据转换为字节流；
			var byteData = System.Text.Encoding.UTF8.GetBytes(data);
			//写入数据；
			Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
			}
			/// <summary>
			/// 文件读取
			/// </summary>
			@@ -1285,11 +1370,6 @@
			/// <returns></returns>
			public static string ReadLocalFile(string FileName)
			{
			if (System.IO.File.Exists(FileName) == false)
			{
			///判断是否有文件;
			return null;
			}
			//读出保存该路径的文件；
			var varByte = Shared.IO.FileUtils.ReadFile(FileName);
			//字节流转换为字符串；
			@@ -1301,8 +1381,8 @@
			/// 判断字典是否存在的方法
			/// </summary>
			/// <param name="deviceConditionsInfo"></param>
			/// <param name="Key"></param>
			/// <param name="Value"></param>
			/// <param name="Key">键</param>
			/// <param name="Value">键值</param>
			public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
			{
			if (deviceConditionsInfo.ContainsKey(Key))
			@@ -1312,6 +1392,6 @@
			deviceConditionsInfo.Add(Key, Value);
			}



			}
			}