~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -274,7 +274,7 @@
			}
			#endregion

			#region ■ 空调数据
			#region ■ 空调和新风数据
			//空调数据
			else if (report.DeviceStatusReport.CluterID == 513)
			{
			@@ -339,40 +339,70 @@
			}
			//空调数据
			else if (report.DeviceStatusReport.CluterID == 514)
			{
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			foreach (var attData in report.DeviceStatusReport.AttriBute)
			{
			if (attData.AttributeId == 0)
			{
			//风扇模式
			((AC)locadevice).currentFanMode = attData.AttriButeData;
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			else if (attData.AttributeId == 4096)
			{
			//风扇扫风
			((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			else if (attData.AttributeId == 4097)
			{
			//转换为二进制
			var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
			//这个设置是放在后面的
			value = value.Substring(value.Length - 1, 1);
			//启用摆风功能
			((AC)locadevice).UseSwingFunction = value == "1";
			locadevice.ReSave();
			}
			{
			//区分是空调还是新风
			var device = Shared.Common.LocalDevice.Current.GetDevice(report.DeviceAddr, report.DeviceEpoint);

			if (device.Type == DeviceType.FreshAir)
			{
			if (attData.AttributeId == 0)
			{
			switch (attData.AttriButeData)
			{
			case 0:
			case 4:
			((FreshAir)locadevice).currentFanStatus = attData.AttriButeData;
			break;
			case 1:
			case 2:
			case 3:
			((FreshAir)locadevice).currentFanSpeed = attData.AttriButeData;
			break;
			case 5:
			case 7:
			((FreshAir)locadevice).currentFanMode = attData.AttriButeData;
			break;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			}
			else
			{
			if (attData.AttributeId == 0)
			{
			//风扇模式
			((AC)locadevice).currentFanMode = attData.AttriButeData;
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			else if (attData.AttributeId == 4096)
			{
			//风扇扫风
			((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			else if (attData.AttributeId == 4097)
			{
			//转换为二进制
			var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
			//这个设置是放在后面的
			value = value.Substring(value.Length - 1, 1);
			//启用摆风功能
			((AC)locadevice).UseSwingFunction = value == "1";
			locadevice.ReSave();
			}
			}
			}
			}
			}
			#endregion


			#region ■ 亮度数据
			//亮度数据
			//亮度数据
			else if (report.DeviceStatusReport.CluterID == 8)
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			@@ -512,7 +542,21 @@
			//常开模式开启
			if (info.AlarmCode == 216)
			{
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
			//温居城的要网关中是否有逻辑存在
			Application.RunOnMainThread(async () =>
			{
			var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();
			if (resTemp == 1)
			{
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, true, null);
			}
			else if (resTemp == 0)
			{
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, false, null);
			}


			});
			}
			}
			}
			@@ -528,7 +572,7 @@
			/// 设备在线状态更新反馈
			/// </summary>
			/// <param name="receiveData"></param>
			private void DeviceOnlineChangePush (JObject receiveData)
			private void DeviceOnlineChangePush(JObject receiveData)
			{
			if (this.dicDeviceEvent.Count == 0)
			{