~wxr/OnPro.git - Gitblit

			@@ -94,7 +94,7 @@
			}
			set
			{
			if (_GatewayOnline_Local != value)
			//if (_GatewayOnline_Local != value)
			{
			_GatewayOnline_Local = value;
			if (value)
			@@ -129,7 +129,7 @@
			}
			set
			{
			if (_GatewayOnline_Cloud != value)
			//if (_GatewayOnline_Cloud != value)
			{
			_GatewayOnline_Cloud = value;
			if(GatewayOnline_Local)
			@@ -360,10 +360,11 @@
			/// <param name="function"></param>
			/// <param name="useRemote">是否直接使用远程发送</param>
			/// <returns></returns>
			public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false,int resend = 3)
			public bool SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false,int resend = 3)
			{
			function.controlCounter++;
			function.refreshTime = DateTime.Now;


			//如果是控制调光的开时，亮度值不能为0
			if (commandDictionary.Count > 2)
			@@ -404,7 +405,7 @@
			upDataObj.objects.Add(asd);
			revString = Newtonsoft.Json.JsonConvert.SerializeObject(upDataObj);
			UpdataFunctionStatus(revString, null, true);
			return;
			return true;
			}


			@@ -459,6 +460,7 @@
			var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
			new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id,resend);
			MainPage.Log($"本地通讯发送HDL-Link数据:{functionControlDataJson}");
			//Control.Ins.MsgInfoList.Add($"本地通讯发送HDL-Link数据:{functionControlDataJson}"+"\r\n");
			}
			}
			//远程通讯
			@@ -493,6 +495,8 @@
			}

			}

			return true;
			}
			/// <summary>
			/// 全开全关功能
			@@ -652,6 +656,79 @@
			}

			/// <summary>
			/// 发送读取命令
			/// 自动判断是否为A协议设备
			/// </summary>
			public void SendReadCommand(List<Function> functions, bool forceRemote = false)
			{
			List<string> sids = new List<string>();
			foreach (Function function in functions)
			{
			sids.Add(function.sid);
			function.refreshTime = DateTime.Now;
			}
			if (forceRemote)
			{

			var pm = new DAL.Server.HttpServerRequest();
			var pack = pm.RefreshDeviceStatus(sids);
			}
			else
			{
			if (Ins.GatewayOnline_Local)
			{

			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			try
			{
			var busClient = new Control_Udp();
			foreach (Function function in functions)
			{
			busClient.ReadBusData(function);
			}

			}
			catch (Exception ex)
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			}
			}
			else
			{
			var objects = new List<Dictionary<string, string>>();


			foreach (Function function in functions)
			{
			var readKey = new Dictionary<string, string>();
			readKey.Add("sid", function.sid);
			objects.Add(readKey);
			}


			var readDataObj = new AlinkReadFunctionStatusObj()
			{
			id = Ins.msg_id.ToString(),
			objects = objects,
			time_stamp = Utlis.GetTimestamp()
			};
			var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
			var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
			MainPage.Log($"本地通讯发送HDL-Link数据:{functionControlDataJson}");
			new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
			}
			}
			else
			{
			var pm = new DAL.Server.HttpServerRequest();
			var pack = pm.RefreshDeviceStatus(sids);
			}
			}
			}


			/// <summary>
			/// 安防控制
			/// </summary>
			public void ControlSecurity(SecurityAlarm securityAlarm,string state)
			@@ -663,7 +740,7 @@
			gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
			sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
			} });
			MainPage.Log($"安防控制结果:{result.Code}");
			MainPage.Log($"安防控制结果:code：{result.Code}；msg：{result.message}");
			}
			else
			{
			@@ -948,6 +1025,7 @@
			/// <summary>
			/// 更新设备状态
			/// A协议数据
			/// Tag Link状态处理
			/// </summary>
			/// <param name="updateBytes"></param>
			public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
			@@ -1062,6 +1140,10 @@
			RollingShutterPage.UpdataState(localFunction);
			break;
			case SPK.CurtainShades:
			break;
			case SPK.HvacCac:
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);

			break;
			case SPK.AcStandard:
			case SPK.HvacAC:
			@@ -1187,6 +1269,7 @@
			case SPK.AirFreshStandard:
			case SPK.HvacAirFresh:
			case SPK.SensorGas:
			case SPK.SensorHelp:
			//设备状态推送
			//状态更新
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
			@@ -1194,7 +1277,7 @@
			case SPK.AvMusic:
			case SPK.MusicStandard:
			//UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp);
			Console.WriteLine("音乐播放器显示状态======="+ revString);
			//Console.WriteLine("音乐播放器显示状态======="+ revString);
			//wjc
			break;
			}
			@@ -1232,13 +1315,88 @@
			}
			else
			{
			Dictionary<string, object> d = new Dictionary<string, object>();
			d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
			d.Add("deviceId", doorlock.deviceId);
			var requestJson = HttpUtil.GetSignRequestJson(d);
			HttpUtil.RequestHttpsPost("/home-wisdom/app/device/door/remoteOpen", requestJson);
			ConfirmUnlocking(doorlock.deviceId, extStr);
			}
			}
			/// <summary>
			/// 确认开锁
			/// </summary>
			/// <param name="functionId"></param>
			/// <param name="pwd"></param>
			public void ConfirmUnlocking(string functionId,string pwd)
			{
			Loading loading = new Loading();
			MainPage.BaseView.AddChidren(loading);
			loading.BackgroundColor = 0x88000000;
			loading.LodingBackgroundColor = UI.CSS.CSS_Color.BackgroundColor;
			loading.Start(Language.StringByID(StringId.PleaseWait));
			new System.Threading.Thread(() =>
			{
			try
			{
			Dictionary<string, object> d = new Dictionary<string, object>();
			d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
			d.Add("deviceId", functionId);
			d.Add("pwd", pwd);
			var requestJson = HttpUtil.GetSignRequestJson(d);
			var pack = HttpUtil.RequestHttpsPost("/home-wisdom/app/device/door/pwdConfirm", requestJson);
			if (pack.Code == StateCode.SUCCESS)
			{
			Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(pack.Data.ToString());
			var scrip = pairs.GetValue("scrip");

			d = new Dictionary<string, object>();
			d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
			d.Add("deviceId", functionId);
			d.Add("scrip", scrip);
			requestJson = HttpUtil.GetSignRequestJson(d);
			pack = HttpUtil.RequestHttpsPost("/home-wisdom/app/device/door/remoteOpen", requestJson);
			//if(pack.Code == StateCode.SUCCESS)
			//{
			// return true;
			//}
			//else
			//{
			// return false;
			//}
			if (pack.Code != StateCode.SUCCESS) {
			Application.RunOnMainThread(() => {
			new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), pack.message);
			UserInfo.Current.doorPasswordString = "";//
			UserInfo.Current.LastTimeOpenDoor = DateTime.MinValue;
			});
			}
			}
			if (pack.Code != StateCode.SUCCESS)
			{
			Application.RunOnMainThread(() => {
			if(string.IsNullOrEmpty(pack.message))
			{
			new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip),
			Language.StringByID(StringId.OperationFailed));
			}
			else
			{
			new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), pack.message);
			}
			});
			}
			}
			catch (Exception ex)
			{

			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			loading.Hide();
			loading.RemoveFromParent();
			});
			}
			})
			{ IsBackground = true }.Start();
			}
			//密码冻结
			//密码验证