~xm/HomeApp.git

			@@ -18,7 +18,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 楼层主键
			/// </summary>
			@@ -54,21 +54,43 @@
			//清空bodyFrame
			this.ClearBodyFrame();

			var listBackControl = new VerticalFrameControl();
			listBackControl.Height = bodyFrameLayout.Height;
			bodyFrameLayout.AddChidren(listBackControl);

			//加一个白色背景
			var frameBack1 = new FrameLayout();
			frameBack1.Height = Application.GetRealHeight(750);
			frameBack1.Y = Application.GetRealHeight(196);
			frameBack1.BackgroundColor = UserCenterColor.Current.White;
			frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerTopRight);
			listBackControl.frameTable.AddChidren(frameBack1);

			//房间图片底部阴影
			var btnShadow = new PicViewControl(853, 593);
			btnShadow.Y = Application.GetRealHeight(58);
			btnShadow.Gravity = Gravity.CenterHorizontal;
			btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
			listBackControl.frameTable.AddChidren(btnShadow);
			//房间图片
			var btnPic = new ImageView();
			btnPic.Y = Application.GetRealHeight(60);
			btnPic.Width = Application.GetMinRealAverage(887);
			btnPic.Height = Application.GetMinRealAverage(444);
			btnPic.Width = this.GetPictrueRealSize(824);
			btnPic.Height = this.GetPictrueRealSize(549);
			btnPic.Radius = (uint)Application.GetRealHeight(17);
			btnPic.Gravity = Gravity.CenterHorizontal;
			btnPic.ImagePath = "RoomIcon/0.JPG";
			bodyFrameLayout.AddChidren(btnPic);
			var btnShadow = new PicViewControl(916, 487);
			btnShadow.Y = btnPic.Y;
			btnShadow.Gravity = Gravity.CenterHorizontal;
			btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
			bodyFrameLayout.AddChidren(btnShadow);
			btnShadow.MouseUpEventHandler += (sender, e) =>
			btnPic.ImagePath = "RoomIcon/0.jpg";
			listBackControl.frameTable.AddChidren(btnPic);
			//图片遮罩
			var btnZhezhao = new FrameLayout();
			btnZhezhao.Width = btnPic.Width;
			btnZhezhao.Height = btnPic.Height;
			btnZhezhao.Y = btnPic.Y;
			btnZhezhao.Gravity = Gravity.CenterHorizontal;
			btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
			btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
			listBackControl.frameTable.AddChidren(btnZhezhao);
			btnZhezhao.MouseUpEventHandler += (sender, e) =>
			{
			//房间图片选择
			this.RoomPictrueSelect(btnPic);
			@@ -78,9 +100,9 @@
			newRoom.FloorId = this.floorKeys;
			newRoom.BackgroundImage = btnPic.ImagePath;

			//初始化桌布
			//初始化信息桌布
			var tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);

			//添加全部菜单
			this.AddAllMenuRow(tableContr, btnPic);
			@@ -98,6 +120,7 @@
			//【房间名称】
			var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), string.Empty, this.listview.rowSpace / 2);
			txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
			txtRoomName.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(txtRoomName);
			txtRoomName.InitControl();
			//底线
			@@ -152,7 +175,7 @@
			};

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr.FinishInitControl();
			tableContr = null;
			//保存
			var btnFinish = new BottomClickButton();
			@@ -178,18 +201,14 @@
			}

			newRoom.FloorId = this.floorKeys;
			var result = newRoom.AddRoom(newRoom);
			if (result == false)
			{
			//提示用户添加失败
			this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.FAIL));
			}
			else
			{
			this.FinishEditorEvent?.Invoke();

			this.CloseForm();
			}
			//添加房间,主页需要重新刷新
			UserView.UserPage.Instance.RefreshAllForm = true;

			HdlRoomLogic.Current.AddRoom(newRoom);
			this.FinishEditorEvent?.Invoke();

			this.CloseForm();
			};
			}

			@@ -203,7 +222,7 @@
			/// <param name="control"></param>
			private void ShowSelectFloor(FrameCaptionViewControl control)
			{
			var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
			var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

			var listKeys = new List<string>();
			var listName = new List<string>();
			@@ -247,6 +266,11 @@
			{
			listDevice.Add(device);
			}
			//PM2.5是温度和湿度合在同一个端点
			else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
			{
			listDevice.Add(device);
			}
			}
			var listSelect = new List<string>() { newRoom.TemperatrueDevice };
			var form = new SelectDeviceForm();
			@@ -277,52 +301,81 @@
			{
			return;
			}
			//获取中...
			btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
			//获取中
			btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);

			bool receiveData = false;
			HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A设备属性上报, ((report) =>
			{
			string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
			if (newRoom.TemperatrueDevice != mainKeys \|\| btnTemper == null)
			if (newRoom.TemperatrueDevice != mainKeys \|\| btnTemper == null
			\|\| report.DeviceStatusReport.CluterID != 1026)
			{
			return;
			}
			//移除掉事件
			HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
			receiveData = true;

			foreach (var data in report.DeviceStatusReport.AttriBute)
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);
			if (temperatrue == 0)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (data.AttriButeData == 0)
			{
			//0℃
			btnTemper.Text = "0.0℃";
			}
			else if (data.AttriButeData > 32767)
			{
			//负数(特殊处理)
			string strValue = (data.AttriButeData - 65536).ToString();
			//小数点需要一位
			strValue = strValue.Substring(0, strValue.Length - 1);
			btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
			}
			else
			{
			//小数点需要一位
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
			}
			});
			//0
			btnTemper.Text = "0.0℃";
			}
			}
			else
			{
			btnTemper.Text = temperatrue + "℃";
			}

			}, ShowErrorMode.NO);

			}));
			//发送获取温度的命令
			((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
			device.ReadAttri(ZigBee.Device.Cluster_ID.TemperatureMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);

			HdlThreadLogic.Current.RunThread(() =>
			{
			//去获取设备列表的信息
			System.Threading.Thread.Sleep(1500);
			var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
			if (result != null)
			{
			device.AttributeStatus.Clear();
			device.AttributeStatus.AddRange(result.AttributeStatus);
			device.ReSave();
			}
			if (receiveData == true)
			{
			//已经读取到数据
			return;
			}

			foreach (var data in device.AttributeStatus)
			{
			if (data.ClusterId == 1026
			&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			//处理网关返回的温度值
			decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);

			device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });
			device.ReSave();

			//制作虚假的属性上报
			var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
			report.DeviceStatusReport.CluterID = 1026;
			HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A设备属性上报);

			HdlThreadLogic.Current.RunMain(() =>
			{
			btnTemper.Text = temperatrue == 0 ? "0.0℃" : temperatrue.ToString() + "℃";
			});
			break;
			}
			}
			});
			}

			#endregion
			@@ -340,6 +393,16 @@
			{
			//获取湿度传感器
			if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
			{
			listDevice.Add(device);
			}
			//新风
			else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
			{
			listDevice.Add(device);
			}
			//PM2.5是温度和湿度合在同一个端点
			else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
			{
			listDevice.Add(device);
			}
			@@ -373,43 +436,80 @@
			{
			return;
			}
			//获取中...
			btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
			//获取中
			btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);

			bool receiveData = false;
			HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A设备属性上报, (report) =>
			{
			string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
			if (newRoom.HumidityDevice != mainKeys \|\| btnHumi == null)
			if (newRoom.HumidityDevice != mainKeys \|\| btnHumi == null
			\|\| report.DeviceStatusReport.CluterID != 1029)
			{
			return;
			}
			//移除掉事件
			HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
			foreach (var data in report.DeviceStatusReport.AttriBute)
			receiveData = true;
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			decimal humidity = (decimal)device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, device, null);
			if (humidity == 0)
			{
			//0
			btnHumi.Text = "0.0%";
			}
			else
			{
			btnHumi.Text = humidity.ToString() + "%";
			}

			}, ShowErrorMode.NO);
			});
			//发送获取湿度的命令
			device.ReadAttri(ZigBee.Device.Cluster_ID.RelativeHumidityMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);

			HdlThreadLogic.Current.RunThread(() =>
			{
			//去获取设备列表的信息
			System.Threading.Thread.Sleep(1500);
			var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
			if (result != null)
			{
			device.AttributeStatus.Clear();
			device.AttributeStatus.AddRange(result.AttributeStatus);
			device.ReSave();
			}
			if (receiveData == true)
			{
			//已经读取到数据
			return;
			}

			//初始值,取缓存数据
			foreach (var data in device.AttributeStatus)
			{
			if (data.ClusterId == 1029
			&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			//处理网关返回的湿度值
			decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);

			device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });
			device.ReSave();

			//制作虚假的属性上报
			var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
			report.DeviceStatusReport.CluterID = 1029;
			HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A设备属性上报);

			HdlThreadLogic.Current.RunMain(() =>
			{
			if (data.AttriButeData == 0)
			{
			//0
			btnHumi.Text = "0.0%";
			}
			else
			{
			//小数点需要一位(湿度没有负数)
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
			}
			btnHumi.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
			});
			break;
			}
			}
			});
			//发送获取湿度的命令
			((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
			}

			#endregion
			@@ -427,11 +527,9 @@
			//默认图库
			menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
			{
			var localPic = new Phone.Device.Room.AddRoomSelectPicByLocal();
			Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			localPic.Show();
			localPic.action = (imgPath) =>
			var form = new SelectLocalRoomImageForm();
			form.AddForm();
			form.FinishSelectEvent = (imgPath) =>
			{
			if (string.IsNullOrEmpty(imgPath) == true)
			{
			@@ -511,7 +609,8 @@
			}
			if (string.IsNullOrEmpty(this.floorKeys) == true)
			{
			if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
			var listRoom = HdlRoomLogic.Current.GetAllListRooms();
			if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
			{
			this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
			return false;
			@@ -519,7 +618,7 @@
			}
			else
			{
			var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
			var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
			if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
			{
			this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));