~wxr/OnPro.git - Gitblit

			@@ -280,7 +280,8 @@
			}
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
			new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255,
			new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
			}
			else if (DB_ResidenceData.Instance.GatewayType == 1)
			{
			@@ -655,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)
			@@ -666,7 +740,7 @@
			gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
			sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
			} });
			MainPage.Log($"安防控制结果:code：{result.Code}；msg：{result.message}");
			MainPage.Log($"安防控制结果:{result.Code}");
			}
			else
			{
			@@ -843,13 +917,16 @@
			byte[] bodyBytes = new byte[receiveObj.Length];
			Array.Copy(originalReceiveBytes, topicBytes.Length + 4, bodyBytes, 0, receiveObj.Length);
			byte[] receiveBytes = Securitys.EncryptionService.AesDecryptPayload(bodyBytes, DB_ResidenceData.Instance.CurrentRegion.localSecret);
			var revString = Encoding.UTF8.GetString(receiveBytes);
			receiveObj.BodyDataString = revString;
			MainPage.Log($"局域网信息: 解密后：" + receiveObj.BodyDataString);
			//if (receiveObj.Topic.EndsWith("/thing/property/up"))
			//{
			// MsgInfoList.Add(revString + "\r\n");
			//}
			if (receiveBytes != null)
			{
			var revString = Encoding.UTF8.GetString(receiveBytes);
			receiveObj.BodyDataString = revString;
			MainPage.Log($"局域网信息: 解密后：" + receiveObj.BodyDataString);
			//if (receiveObj.Topic.EndsWith("/thing/property/up"))
			//{
			// MsgInfoList.Add(revString + "\r\n");
			//}
			}
			}
			else
			{
			@@ -951,7 +1028,6 @@
			/// <summary>
			/// 更新设备状态
			/// A协议数据
			/// Tag Link状态处理
			/// </summary>
			/// <param name="updateBytes"></param>
			public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
			@@ -977,9 +1053,6 @@
			}
			}
			}




			var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (localFunction == null)
			@@ -1057,6 +1130,14 @@
			localFunction.lastState = localFunction.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
			CurtainModulePage.UpdataState(localFunction);
			break;
			case SPK.CurtainDream:
			if(localFunction.GetAttrState(FunctionAttributeKey.Percent) == "0")
			{
			localFunction.SetAttrState(FunctionAttributeKey.OnOff, "off");
			}
			localFunction.lastState = localFunction.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
			CurtainDreamPage.UpdataState(localFunction);
			break;
			case SPK.CurtainTrietex:
			localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
			MotorCurtainPage.UpdataState(localFunction);
			@@ -1066,10 +1147,6 @@
			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:
			@@ -1190,16 +1267,57 @@
			case SPK.SensorSmoke:
			case SPK.SensorWater:
			case SPK.ClothesHanger:
			case SPK.SenesorMegahealth:
			case SPK.SenesorMegahealth2:
			case SPK.AirFreshStandard:
			case SPK.HvacAirFresh:
			case SPK.SensorGas:
			case SPK.SensorHelp:
			case SPK.HvacCac:
			//设备状态推送
			//状态更新
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
			break;
			case SPK.SenesorMegahealth:
			case SPK.SenesorMegahealth2:

			var tempStatus = localFunction.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
			if (tempStatus != null)
			{

			switch (tempStatus.state)
			{//0空，1走，2跑，3坐，4跌倒，5站
			case "0":
			localFunction.lastState = Language.StringByID(StringId.SensorNormalState);
			break;
			case "1":
			localFunction.lastState = Language.StringByID(StringId.SomeoneIn);
			break;
			case "2":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneRunning);
			}
			break;
			case "3":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneSitting);
			}
			break;
			case "4":
			localFunction.lastState = Language.StringByID(StringId.SomeoneFell);
			break;
			case "5":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneStanding);
			}
			break;
			default:

			break;
			}
			}
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
			break;
			case SPK.AvMusic:
			case SPK.MusicStandard:
			//UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp);