~wjc/HomeApp.git

			@@ -119,10 +119,6 @@
			/// sceneList
			/// </summary>
			private List<SceneUI> sceneList;
			/// <summary>
			/// 当前选中房间
			/// </summary>
			private Common.Room curRoom;
			#endregion

			#region ◆ 接口____________________________
			@@ -363,6 +359,66 @@
			{
			deviceUI.CommonDevice.IsOnline = 1;
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			}
			break;

			case DeviceType.TemperatureSensor:
			//温度
			if (common.DeviceStatusReport.CluterID == 1026)
			{
			var tempera = deviceUI.CommonDevice as TemperatureSensor;
			foreach (var data in common.DeviceStatusReport.AttriBute)
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			if (data.AttriButeData == 0)
			{
			tempera.Temperatrue = 0;
			}
			else if (data.AttriButeData > 32767)
			{
			//负数(特殊处理)
			string strValue = (data.AttriButeData - 65536).ToString();
			//小数点需要一位
			strValue = strValue.Substring(0, strValue.Length - 1);
			tempera.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			else
			{
			//小数点需要一位
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			tempera.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatuText(deviceUI.GetDeviceStatu());
			}
			}
			}
			//湿度
			if (common.DeviceStatusReport.CluterID == 1029)
			{
			var tempera = deviceUI.CommonDevice as TemperatureSensor;
			foreach (var data in common.DeviceStatusReport.AttriBute)
			{
			if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
			{
			if (data.AttriButeData == 0)
			{
			tempera.Humidity = 0;
			}
			else
			{
			//小数点需要一位(湿度没有负数)
			string strValue = data.AttriButeData.ToString();
			strValue = strValue.Substring(0, strValue.Length - 1);
			tempera.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			tempera.LastDateTime = DateTime.Now;
			}
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatuText(deviceUI.GetDeviceStatu());
			}
			}
			}
			break;
			}
			@@ -668,6 +724,7 @@
			floors.FloorAction += (floorId) =>
			{
			floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
			Common.Room.CurrentRoom = Common.Room.CurrentRoom.GetLoveRoom();
			RefreshBodyView();
			};
			}
			@@ -1006,7 +1063,7 @@
			{
			if (e2)
			{
			if(curRoom.IsLove)
			if(Common.Room.CurrentRoom.IsLove)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
			@@ -1117,7 +1174,7 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			}
			else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A插座)
			{
			@@ -1125,7 +1182,7 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			}
			else
			{
			@@ -1133,7 +1190,7 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			}
			};

			@@ -1147,7 +1204,7 @@
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1237,7 +1294,7 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1250,7 +1307,7 @@
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1340,7 +1397,7 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//dimmableLightControl.action = RefreshBodyView;
			dimmableLightControl.Show(deviceUI, curRoom);
			dimmableLightControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1353,7 +1410,7 @@
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1449,7 +1506,7 @@
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1464,7 +1521,7 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//rollerShadeControl.action = RefreshBodyView;
			acControl.Show(deviceUI, curRoom);
			acControl.Show(deviceUI, Common.Room.CurrentRoom);
			};
			}
			}
			@@ -1532,14 +1589,12 @@
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1554,7 +1609,7 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//rollerShadeControl.action = RefreshBodyView;
			rollerShadeControl.Show(deviceUI, curRoom);
			rollerShadeControl.Show(deviceUI, Common.Room.CurrentRoom);
			};
			}
			}
			@@ -1578,7 +1633,7 @@

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
			var userDoorLockPage = new UserDoorLockPage(Common.Room.CurrentRoom, deviceUI);
			HomePage.Instance.AddChidren(userDoorLockPage);
			HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			@@ -1592,7 +1647,7 @@
			{
			Tag = deviceUI
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1618,14 +1673,6 @@
			deviceRow.HideSwitchBtn(true);
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
			HomePage.Instance.AddChidren(userDoorLockPage);
			HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			@@ -1634,12 +1681,84 @@
			{
			Tag = deviceUI
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			else if (deviceUI.CommonDevice.Type == DeviceType.TemperatureSensor)
			{
			var tempera = deviceUI.CommonDevice as TemperatureSensor;
			if (tempera.Gateway != null)
			{
			new System.Threading.Thread(() =>
			{
			System.Threading.Thread.Sleep(100 * i);
			if (tempera.Gateway.IsVirtual)
			{
			UserHomeView.ReadStatus(tempera, () =>
			{
			if (tempera.SensorDiv == 1)
			{
			ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(deviceUI.CommonDevice);
			}
			else if (tempera.SensorDiv == 2)
			{
			ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(deviceUI.CommonDevice);
			}
			});
			}
			else
			{
			if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - tempera.LastDateTime).TotalSeconds)
			{
			if (tempera.SensorDiv == 1)
			{
			ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(deviceUI.CommonDevice);
			}
			else if (tempera.SensorDiv == 2)
			{
			ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(deviceUI.CommonDevice);
			}
			}
			}
			})
			{ IsBackground = true }.Start();
			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			deviceListScrolView.AddChidren(deviceTypeRowLayout);

			var deviceRow = new CategoryFunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.IsSelected = false;
			deviceRow.HideSwitchBtn(true);
			deviceTypeRowLayout.AddChidren(deviceRow);

			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI
			};
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			}
			}
			else
			@@ -1668,7 +1787,7 @@
			{
			Tag = deviceUI
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			@@ -1726,10 +1845,9 @@
			roomBtn.SetTitle(room.Name);
			row.AddChidren(roomBtn);

			if (room.IsLove)
			if (room.Id == Common.Room.CurrentRoom.Id)
			{
			roomBtn.IsSelected = true;
			this.curRoom = room;
			curBtn = roomBtn;
			if(sceneBtn.IsSelected)
			{
			@@ -1740,6 +1858,7 @@
			RefreshFunction(room);
			}
			}

			roomBtn.ButtonClickEvent += (sender, e) =>
			{
			if (sender == curBtn)
			@@ -1749,7 +1868,7 @@
			sender.IsSelected = true;
			curBtn.IsSelected = false;
			curBtn = sender;
			this.curRoom = room;
			Common.Room.CurrentRoom = room;
			if (sceneBtn.IsSelected)
			{
			RefreshScene(room);