~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -406,10 +406,36 @@
			else if (report.DeviceStatusReport.CluterID == 8)
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			if (locadevice.Type == DeviceType.DimmableLight && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			//此属性表明当前亮度程度
			((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			if (locadevice.Type == DeviceType.DimmableLight)
			{
			//此属性表明当前亮度程度
			((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			}
			else if (locadevice.Type == DeviceType.ColorTemperatureLight)
			{
			//此属性表明当前亮度程度
			((ColorTemperatureLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			}
			#endregion

			#region ■ 色温数据
			//色温数据
			else if (report.DeviceStatusReport.CluterID == 768)
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			if (locadevice.Type == DeviceType.ColorTemperatureLight)
			{
			//此属性表明当前色温
			((ColorTemperatureLight)locadevice).ColorTemperature = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			@@ -510,10 +536,15 @@
			strValue = strValue.Substring(0, strValue.Length - 1);
			humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			//温度传感器
			//湿度传感器
			if (locadevice is TemperatureSensor)
			{
			((TemperatureSensor)locadevice).Humidity = humidity;
			}
			//新风的湿度传感器
			else if (locadevice is HumiditySensor)
			{
			((HumiditySensor)locadevice).Humidity = humidity;
			}
			//PM2.5传感器
			else if (locadevice is PMSensor)
			@@ -600,8 +631,7 @@
			/// <param name="receiveData"></param>
			private void DoorLockDeviceReportPush(JObject receiveData)
			{
			//只有徐梅的门锁界面没有打开的情况下,才会处理这个东西
			if (ControlCommonResourse.IsDoorLockPageOpen == false && UserCenterResourse.UserInfo.AuthorityNo == 1)
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
			if (device.Type != DeviceType.DoorLock)
			@@ -609,31 +639,27 @@
			//它不是门锁
			return;
			}

			var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
			if (info.Clusterid == 257)
			{
			//常开模式关闭
			if (info.AlarmCode == 217 \|\| info.AlarmCode == 219)
			//216：锁上设置的常开
			if (info.AlarmCode == 216)
			{
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			//温居城的要网关中是否有逻辑存在
			//参数:2-常开自动化;3-失效时间自动化
			var result = await Shared.Phone.Device.Logic.SkipView.Exist(2, (ZigBee.Device.DoorLock)device);
			HdlThreadLogic.Current.RunMain(() =>
			//更新门锁涉及的常开/常关的界面
			if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
			{
			//弹出徐梅的那个窗口
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
			result != 0 ? true : false, null);
			});
			UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr, true);
			}
			});
			}
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}

			#endregion

			#region ■ 设备在线状态更新反馈_______________
			@@ -642,7 +668,7 @@
			/// 设备在线状态更新反馈
			/// </summary>
			/// <param name="receiveData"></param>
			private void DeviceOnlineChangePush (JObject receiveData)
			private void DeviceOnlineChangePush(JObject receiveData)
			{
			if (this.dicDeviceEvent.Count == 0)
			{
			@@ -827,29 +853,40 @@
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();

			//这个东西暂时不处理
			////只有徐梅的门锁界面没有打开的情况下,才会处理这个东西
			//if (ControlCommonResourse.IsDoorLockPageOpen == false && UserCenterResourse.UserInfo.AuthorityNo == 1)
			//{
			// var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
			// if (device.Type != DeviceType.DoorLock)
			// {
			// return;
			// }
			// //自动化执行常开关闭
			// var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
			// if (data.ActionData != null && data.ActionData.Actiontype == 8
			// && data.ActionData.PassDataString == "055704010113")
			// {
			// HdlThreadLogic.Current.RunMain(() =>
			// {
			// //弹出徐梅的那个窗口
			// DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
			// });
			// }
			//}
			}
			// 逻辑执行常开模式失效的情况
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			//自动化执行常开关闭
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
			if (data != null && data.ActionData != null)
			{
			if (data.ActionData.Actiontype == 8 && data.ActionData.PassDataString == "055704010113")
			{
			var deviceAddr = data.ActionData.MacStr;
			var device = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr, false);
			if (device.Count > 0 && device[0].Type != DeviceType.DoorLock)
			{
			return;
			}

			HdlThreadLogic.Current.RunThread(async () =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//提示门锁已经失效
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

			//更新门锁涉及的常开/常关的界面
			if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
			{
			UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(deviceAddr, false);
			}
			});
			});
			}
			}
			}
			}
			#endregion

			#region ■ 场景触发上报_______________________