~wjc/HomeApp.git

			@@ -13,10 +13,6 @@
			/// Room
			/// </summary>
			private Common.Room room;
			/// <summary>
			/// action
			/// </summary>
			public Action action;

			FrameLayout roomNameBackground;

			@@ -24,7 +20,7 @@

			Button roomListBtn;

			Button temperatureText;
			Button temperatureText;

			Button humidityText;

			@@ -33,31 +29,7 @@
			CommonDevice humidDevice;

			#region ◆ 接口__________________________
			/// <summary>
			/// 处理变化事件 --将弃用改用DeviceInfoChange()
			/// </summary>
			/// <returns>The changed.</returns>
			/// <param name="common">Common.</param>
			public void Changed(CommonDevice common)
			{

			}
			/// <summary>
			/// Changeds the IL ogic status.
			/// </summary>
			/// <param name="logic">Logic.</param>
			public void ChangedILogicStatus(ZigBee.Device.Logic logic)
			{
			//throw new NotImplementedException();
			}
			/// <summary>
			/// Changeds the IS cene status.
			/// </summary>
			/// <param name="scene">Scene.</param>
			public void ChangedISceneStatus(Scene scene)
			{
			//throw new NotImplementedException();
			}

			/// <summary>
			/// 设备状态更新接口
			/// <para>type：如果为 DeviceInComingRespon:设备新上报</para>
			@@ -83,57 +55,66 @@
			//是否为当前设备
			if ((temperDevice?.DeviceEpoint != common.DeviceEpoint \|\| temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint \|\| humidDevice?.DeviceAddr != common.DeviceAddr) )
			{
			//return;
			return;
			}


			//if (common.Type == DeviceType.TemperatureSensor)
			//{
			if (common.DeviceStatusReport.CluterID == 1026)
			if (common.DeviceStatusReport.CluterID == 1026)
			{
			foreach (var data in common.DeviceStatusReport.AttriBute)
			{
			foreach (var data in common.DeviceStatusReport.AttriBute)
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			if (data.AttriButeData == 0)
			{
			if (data.AttriButeData == 0)
			{
			//0
			humidityText.Text = "--%";
			room.Humidity = 0;
			}
			else
			{
			//小数点需要一位(湿度没有负数)
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
			room.Humidity = int.Parse(strValue) * 0.1;
			}
			//0℃
			temperatureText.Text = "0.0℃";
			room.Temperatrue = 0;
			}
			else if (data.AttriButeData > 32767)
			{
			//负数(特殊处理)
			string strValue = (data.AttriButeData - 65536).ToString();
			//小数点需要一位
			strValue = strValue.Substring(0, strValue.Length - 1);
			temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
			room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			else
			{
			//小数点需要一位
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
			room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			}
			}
			else if (common.DeviceStatusReport.CluterID == 1029)
			}
			else if (common.DeviceStatusReport.CluterID == 1029)
			{
			foreach (var data in common.DeviceStatusReport.AttriBute)
			{
			foreach (var data in common.DeviceStatusReport.AttriBute)
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			if (data.AttriButeData == 0)
			{
			if (data.AttriButeData == 0)
			{
			//0
			humidityText.Text = "--%";
			room.Humidity = 0;
			}
			else
			{
			//小数点需要一位(湿度没有负数)
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
			room.Humidity = int.Parse(strValue) * 0.1;
			}
			//0
			humidityText.Text = "--%";
			room.Humidity = 0;
			}
			else
			{
			//小数点需要一位(湿度没有负数)
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
			room.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			}
			}
			}
			//}
			}
			catch (Exception ex)
			@@ -171,16 +152,19 @@
			/// <param name="r"></param>
			public void Init(Common.Room r)
			{
			this.RemoveAll();

			this.room = r;

			this.temperDevice= Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
			this.temperDevice = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);

			this.humidDevice= Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
			this.humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);

			var roomBackView = new FrameLayout()
			{
			Width = Application.GetRealWidth(717),
			Height = Application.GetRealHeight(478)
			Height = Application.GetRealHeight(478),
			Radius = (uint)Application.GetRealHeight(17)
			};
			AddChidren(roomBackView);

			@@ -190,6 +174,14 @@
			Radius = (uint)Application.GetRealHeight(17)
			};
			roomBackView.AddChidren(roomImg);

			//加个特殊的遮罩
			var frameBackGroudTemp = new FrameLayout();
			frameBackGroudTemp.Width = roomBackView.Width;
			frameBackGroudTemp.Height = roomBackView.Height;
			frameBackGroudTemp.Radius = roomBackView.Radius;
			frameBackGroudTemp.BackgroundColor = 0x12000000;
			roomBackView.AddChidren(frameBackGroudTemp);

			roomNameBackground = new FrameLayout
			{
			@@ -204,15 +196,17 @@

			var roomName = new Button()
			{
			X = Application.GetRealWidth(5),
			X = Application.GetRealWidth(29),
			Width = Application.GetRealWidth(190),
			Text = room.Name,
			TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
			TextSize=10,
			IsBold=true
			TextSize = 10,
			TextAlignment=TextAlignment.CenterLeft,
			IsBold = true
			};
			roomNameBackground.AddChidren(roomName);

			roomNameBackground.Width = (roomName.GetTextWidth() + Application.GetRealWidth(100)) > Application.GetRealWidth(600) ? Application.GetRealWidth(600) : roomName.GetTextWidth() + Application.GetRealWidth(100);
			roomName.Width = roomNameBackground.Width - Application.GetRealWidth(40);

			roomTemperatureBackground = new FrameLayout
			{
			@@ -239,16 +233,20 @@
			{
			X = Application.GetRealWidth(69),
			Width = Application.GetRealWidth(120),
			Height = Application.GetRealHeight(58),
			Gravity = Gravity.CenterVertical,
			Text = Math.Abs(room.Temperatrue) <= 0 ? "--℃" : $"{room.Temperatrue}℃",
			TextSize=14
			Text = "--℃",
			TextSize = 14,
			TextAlignment=TextAlignment.CenterLeft
			};
			if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
			{
			temperatureText.Text = room.Temperatrue == 0 ? "0.0℃" : room.Temperatrue.ToString() + "℃";
			}
			roomTemperatureBackground.AddChidren(temperatureText);
			temperatureText.Width = temperatureText.GetTextWidth() + Application.GetRealWidth(60);

			var humidityIcon = new Button
			{
			X = Application.GetRealWidth(200),
			X = temperatureText.Right,
			Width = Application.GetMinRealAverage(58),
			Height = Application.GetMinRealAverage(58),
			Gravity = Gravity.CenterVertical,
			@@ -258,18 +256,22 @@

			humidityText = new Button
			{
			X = Application.GetRealWidth(260),
			X = humidityIcon.Right,
			Width = Application.GetRealWidth(120),
			Height = Application.GetRealHeight(58),
			Gravity = Gravity.CenterVertical,
			Text = Math.Abs(room.Temperatrue) <= 0 ? "--%" : $"{room.Humidity}%",
			TextSize=14
			Text = "--%",
			TextSize = 14,
			TextAlignment = TextAlignment.CenterLeft
			};
			if (string.IsNullOrEmpty(room.HumidityDevice) == false)
			{
			humidityText.Text = room.Humidity == 0 ? "0.0%" : room.Humidity.ToString() + "%";
			}
			roomTemperatureBackground.AddChidren(humidityText);

			humidityText.Width = humidityText.GetTextWidth() + Application.GetRealWidth(60);
			roomTemperatureBackground.Width = (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150)) > Application.GetRealWidth(600) ? Application.GetRealWidth(600) : (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150));

			if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
			{
			{
			//发送获取温度的命令
			var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
			ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
			@@ -280,7 +282,6 @@
			var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
			ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
			}


			roomListBtn = new Button()
			{
			@@ -295,13 +296,13 @@
			roomListBtn.MouseUpEventHandler += (send, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var editRoom = new Device.Room.EditRoom();
			HomePage.Instance.AddChidren(editRoom);
			HomePage.Instance.PageIndex += 1;
			editRoom.Show(room);
			editRoom.action += () =>
			{
			action?.Invoke();

			var form = new UserCenter.Residence.EditorRoomInforForm();
			form.AddForm(room);
			form.FinishEditorEvent += (roomName2) =>
			{
			//重新刷新控件
			this.Init(this.room);
			};
			};
			}