~wxr/HDL_APP_Project.git

			@@ -62,7 +62,8 @@
			/// <summary>
			/// 网关是否在线
			/// </summary>
			public bool GatewayOnline {
			public bool GatewayOnline
			{
			get
			{
			return _gatewayOnline;
			@@ -96,7 +97,8 @@
			/// <summary>
			/// 是否为远程连接
			/// </summary>
			public bool IsRemote {
			public bool IsRemote
			{
			get
			{
			return _isRemote;
			@@ -479,72 +481,174 @@
			try
			{
			//bool hadChange = false;//状态有变化再更新界面
			var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (updataObj != null)
			var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (localFunction != null)
			{
			foreach (var attr in updateTemp.status)
			{
			foreach (var locatAttr in updataObj.attributes)
			{
			if (attr.key == locatAttr.key)
			{
			if (locatAttr.curValue.ToString() == attr.value)
			{
			continue;
			}
			locatAttr.curValue = attr.value;
			//hadChange = true;
			}
			}
			}
			//2020-12-13 如果控制时，立即更新界面即状态，收到数据不用在处理，目前只修改设备状态，界面没有更新，还是需要接收数据更新
			//if (!hadChange)//状态有变化再更新界面
			//var updateInfoString = $"更新设备:{localFunction.name}";
			//foreach (var attr in updateTemp.status)
			//{
			// continue;
			// updateInfoString += $" key:{attr.key};value:{attr.value}";
			//}
			//MainPage.Log(updateInfoString);


			//更新界面状态
			switch (updataObj.spk)
			Function localObj = null;
			switch (localFunction.spk)
			{
			case SPK.LightSwitch:
			RelayPage.UpdataState(updataObj as Light);
			var localSwitch = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
			if (localSwitch != null)
			{
			localObj = localSwitch;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = localSwitch.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
			RelayPage.UpdataState(localSwitch);
			}
			break;
			case SPK.LightDimming:
			var dimming = updataObj as Light;
			var dimming = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
			if (dimming != null)
			{
			localObj = dimming;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = dimming.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			dimming.lastState = Language.StringByID(StringId.Brightness) + " : " + dimming.brightness + "%";
			DimmerPage.UpdataStates(dimming);
			}
			break;
			case SPK.ElectricFan:
			var fan = updataObj as Fan;
			var fan = FunctionList.List.fans.Find((obj) => obj.sid == updateTemp.sid);
			if (fan != null)
			{
			localObj = fan;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = fan.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			fan.lastState = Language.StringByID(StringId.Level) + " : " + fan.openLevel;
			FanPage.UpdataState(fan);
			}
			break;
			case SPK.LightRGB:
			var rgb = updataObj as Light;
			var rgb = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
			if (rgb != null)
			{
			localObj = rgb;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = rgb.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
			RGBPage.UpdataStates(rgb);
			}
			break;
			case SPK.LightRGBW:
			break;
			case SPK.LightCCT:
			var lightCCT = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
			if (lightCCT != null)
			{
			localObj = lightCCT;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = lightCCT.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
			DimmerPage.UpdataStates(lightCCT);
			}
			break;
			case SPK.CurtainSwitch:
			var curtain = updataObj as Curtain;
			var curtain = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
			if (curtain != null)
			{
			localObj = curtain;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = curtain.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			curtain.lastState = curtain.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
			CurtainModulePage.UpdataState(curtain);
			}
			break;
			case SPK.CurtainTrietex:
			var trietex = updataObj as Curtain;
			var trietex = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
			if (trietex != null)
			{
			localObj = trietex;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = trietex.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			trietex.lastState = Language.StringByID(StringId.Open) + trietex.percent + "%";
			MotorCurtainPage.UpdataState(trietex);
			}
			break;
			case SPK.CurtainRoller:
			var roller = updataObj as Curtain;
			var roller = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
			if (roller != null)
			{
			localObj = roller;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = roller.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			roller.lastState = Language.StringByID(StringId.Open) + roller.percent + "%";
			RollingShutterPage.UpdataState(roller);
			}
			break;
			case SPK.CurtainShades:
			break;
			case SPK.AcStandard:
			var ac = updataObj as AC;
			var ac = FunctionList.List.aCs.Find((obj) => obj.sid == updateTemp.sid);
			if (ac != null)
			{
			localObj = ac;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = ac.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			ac.lastState = "";
			switch (ac.trait_mode.curValue.ToString())
			{
			@@ -581,9 +685,21 @@
			}
			ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
			ACPage.UpdataStates(ac);
			}
			break;
			case SPK.FloorHeatStandard:
			var fh = updataObj as FloorHeating;
			var fh = FunctionList.List.floorHeatings.Find((obj) => obj.sid == updateTemp.sid);
			if (fh != null)
			{
			localObj = fh;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = fh.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			switch (fh.trait_mode.curValue)
			{
			case "normal":
			@@ -604,26 +720,53 @@
			}
			fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
			FloorHeatingPage.UpdataStates(fh);
			}
			break;
			case SPK.SensorPm25:
			case SPK.SensorCO2:
			case SPK.SensorTVOC:
			case SPK.SensorTemperature:
			case SPK.SensorHumidity:
			var sensor = updataObj as Sensor;
			var sensor = FunctionList.List.sensorsEnvironmentalScience.Find((obj) => obj.sid == updateTemp.sid);
			if (sensor != null)
			{
			localObj = sensor;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = sensor.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
			}
			break;
			case SPK.ElectricSocket:
			var es = FunctionList.List.switchSockets.Find((obj) => obj.sid == updateTemp.sid);
			if (es != null)
			{
			localObj = es;
			foreach (var attr in updateTemp.status)
			{
			var localAttr = es.attributes.Find((obj) => obj.key == attr.key);
			if (localAttr != null)
			{
			localAttr.curValue = attr.value;
			}
			}
			SocketPage.UpdataState(es);
			}
			break;
			case SPK.ElectricTV:
			break;
			default:
			break;
			}
			HomePage.UpdataFunctionStates(updataObj);
			RoomPage.UpdataStates(updataObj);
			FunctionPage.UpdataStates(updataObj);
			ClassificationPage.UpdataInfo(updataObj);
			HomePage.UpdataFunctionStates(localObj);
			RoomPage.UpdataStates(localObj);
			FunctionPage.UpdataStates(localObj);
			ClassificationPage.UpdataInfo(localObj);
			}
			}
			catch (Exception ex)