~xm/HomeApp.git

			@@ -8,6 +8,7 @@
			using Shared.Phone.Device.AC;
			using Shared.Phone.UserCenter.DoorLock;
			using Shared.Phone.Device.DeviceLogic;
			using Shared.Phone.UserCenter;

			namespace Shared.Phone.Device.Category
			{
			@@ -25,7 +26,7 @@
			/// <summary>
			/// low_High
			/// </summary>
			private const int low_High= 127;
			private const int low_High = 127;
			/// <summary>
			/// 功能
			/// </summary>
			@@ -119,10 +120,6 @@
			/// sceneList
			/// </summary>
			private List<SceneUI> sceneList;
			/// <summary>
			/// 当前选中房间
			/// </summary>
			private Common.Room curRoom;
			#endregion

			#region ◆ 接口____________________________
			@@ -262,7 +259,7 @@
			var attriButeList = common.DeviceStatusReport.AttriBute;
			var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
			ac.DeviceStatusReport = common.DeviceStatusReport;
			foreach(var attList in attriButeList)
			foreach (var attList in attriButeList)
			{
			var curTemp = (attList.AttriButeData / 100 < ACControlBase.Temperature_High && attList.AttriButeData / 100 > ACControlBase.Temperature_Low) ? attList.AttriButeData / 100 : ACControlBase.Temperature_Default;
			switch (attList.AttributeId)
			@@ -311,7 +308,7 @@
			var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
			var attriButeList = common.DeviceStatusReport.AttriBute;
			ac.DeviceStatusReport = common.DeviceStatusReport;
			foreach(var attList in attriButeList)
			foreach (var attList in attriButeList)
			{
			switch (attList.AttributeId)
			{
			@@ -363,6 +360,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;
			}
			@@ -519,7 +576,7 @@
			TextID = R.MyInternationalizationString.Category,
			TextSize = 24,
			TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
			IsBold=true
			IsBold = true
			};
			topView.AddChidren(title);

			@@ -563,7 +620,7 @@
			functionBtn.SetTitle(R.MyInternationalizationString.Function);
			functionBtn.X = sceneBtn.Right;
			//自动化
			automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20+50, 34);
			automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20 + 50, 34);
			automationBtn.Init();
			automationBtn.SetTitle(R.MyInternationalizationString.Automation);
			automationBtn.X = functionBtn.Right;
			@@ -581,8 +638,8 @@
			Gravity = Gravity.CenterVertical,
			TextAlignment = TextAlignment.CenterRight,
			TextColor = ZigbeeColor.Current.GXCTextBlackColor,
			TextSize=14,
			IsBold=true
			TextSize = 14,
			IsBold = true
			};

			selectFloorBtn = new Button()
			@@ -650,7 +707,7 @@
			addBtn.MouseUpEventHandler += AddBtn_MouseUpEventHandler;

			selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
			floorBtn.MouseUpEventHandler+= SelectedFloor_MouseUpEventHandler;
			floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;

			}

			@@ -661,13 +718,14 @@
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void SelectedFloor_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
			{
			var floors = new SelectFloor ();
			var floors = new SelectFloor();
			AddChidren(floors);
			floors.Init(580,330,Direction.Right);
			floors.Init(580, 330, Direction.Right);
			floors.changeFloor = true;
			floors.FloorAction += (floorId) =>
			{
			floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
			Common.Room.CurrentRoom = Common.Room.CurrentRoom.GetLoveRoom();
			RefreshBodyView();
			};
			}
			@@ -751,6 +809,10 @@
			UserView.HomePage.Instance.AddChidren(scene);
			UserView.HomePage.Instance.PageIndex += 1;
			scene.Show();
			scene.AddAction = () =>
			{
			ShowScene();
			};
			}

			/// <summary>
			@@ -860,10 +922,10 @@
			{
			var noFunction = new Button()
			{
			Y=Application.GetRealHeight(320),
			Width=Application.GetMinRealAverage(757),
			Y = Application.GetRealHeight(320),
			Width = Application.GetMinRealAverage(757),
			Height = Application.GetMinRealAverage(435),
			UnSelectedImagePath="Item/NoFunction.png",
			UnSelectedImagePath = "Item/NoFunction.png",
			Gravity = Gravity.CenterHorizontal
			};
			functionSceneBodyView.AddChidren(noFunction);
			@@ -874,10 +936,10 @@
			Height = Application.GetRealHeight(200),
			Width = Application.GetRealWidth(700),
			Gravity = Gravity.CenterHorizontal,
			Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}","\r\n"),
			Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			TextAlignment = TextAlignment.Center,
			IsMoreLines=true
			IsMoreLines = true
			};
			functionSceneBodyView.AddChidren(noFunctionTip);
			}
			@@ -931,7 +993,7 @@
			deviceListScrolView = new VerticalScrolViewLayout
			{
			X = Application.GetRealWidth(CommonFormResouce.X_Left),
			Y = Application.GetRealHeight(35+279),
			Y = Application.GetRealHeight(35 + 279),
			Width = Application.GetRealWidth(1028),
			Height = Application.GetRealHeight(942),
			BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
			@@ -940,7 +1002,7 @@
			deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

			tempFunctionTypeBtn = new FunctionButton();
			tempFunctionTypeBtn.Init("","");
			tempFunctionTypeBtn.Init("", "");

			foreach (var deviceType in typeIdDic)
			{
			@@ -996,43 +1058,14 @@
			{
			try
			{
			//删除设备
			EventHandler<MouseEventArgs> delEvent = (delSender, delE) =>
			var deviceTypeRowLayout = new RowLayout()
			{
			var alert = new CustomAlert();
			AddChidren(alert);
			alert.Show(Language.StringByID(R.MyInternationalizationString.DeleteFunction));
			alert.ResultEventHandler += (e2) =>
			{
			if (e2)
			{
			if(curRoom.IsLove)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
			sameTypeList.Remove(deviceUI);
			}
			else
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
			deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
			sameTypeList.Remove(deviceUI);
			}
			//if (sameTypeList.Count == 0)
			//{
			// RefreshBodyView();
			//}
			}
			};
			Height = Application.GetRealHeight(127 + 35),
			LineColor = ZigbeeColor.Current.GXCClearColor,
			Tag = deviceUI,
			SubViewWidth=Application.GetRealWidth(184)
			};
			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.action = RefreshBodyView;
			};
			deviceListScrolView.AddChidren(deviceTypeRowLayout);

			if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
			{
			@@ -1060,19 +1093,10 @@
			}
			})
			{ 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.SetOnLineStatu(light.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.IsSelected = light.OnOffStatus == 1;
			deviceTypeRowLayout.AddChidren(deviceRow);
			@@ -1108,7 +1132,6 @@
			}
			});
			};

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A开关)
			@@ -1117,7 +1140,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 +1148,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,26 +1156,43 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			}
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			Tag = deviceUI
			};
			var delBtn = new CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			}
			@@ -1182,22 +1222,12 @@
			})
			{ 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.SetOnLineStatu(airSwitch.IsOnline == 1);
			deviceRow.IsSelected = airSwitch.OnOffStatus == 1;
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			{
			zbGateway = deviceUI.CommonDevice.Gateway;
			@@ -1229,7 +1259,6 @@
			}
			});
			};

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{

			@@ -1237,25 +1266,42 @@
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, curRoom);
			lightControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			Tag = deviceUI
			};
			var delBtn = new CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			}
			@@ -1285,18 +1331,9 @@
			})
			{ 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.SetOnLineStatu(dimmableLight.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.IsSelected = dimmableLight.OnOffStatus == 1;
			deviceTypeRowLayout.AddChidren(deviceRow);
			@@ -1340,25 +1377,42 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//dimmableLightControl.action = RefreshBodyView;
			dimmableLightControl.Show(deviceUI, curRoom);
			dimmableLightControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			Tag = deviceUI
			};
			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;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			}
			@@ -1389,14 +1443,6 @@
			}
			})
			{ 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);
			@@ -1438,25 +1484,6 @@
			}
			});
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			var delBtn = new CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var acControl = new Phone.Device.AC.ACControl();
			@@ -1464,8 +1491,43 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//rollerShadeControl.action = RefreshBodyView;
			acControl.Show(deviceUI, curRoom);
			acControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			}
			}
			}
			else if (deviceUI.CommonDevice.Type == DeviceType.WindowCoveringDevice)
			@@ -1495,18 +1557,9 @@
			})
			{ IsBackground = true }.Start();

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			deviceListScrolView.AddChidren(deviceTypeRowLayout);

			var deviceRow = new CategoryFunctionForWinRow(0, 35);
			deviceRow.Init(deviceUI);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			//deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
			deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
			@@ -1529,24 +1582,6 @@
			{ IsBackground = true }.Start();
			}

			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			if (curRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
			@@ -1554,62 +1589,99 @@
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//rollerShadeControl.action = RefreshBodyView;
			rollerShadeControl.Show(deviceUI, curRoom);
			rollerShadeControl.Show(deviceUI, Common.Room.CurrentRoom);
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			}

			}
			}
			else if (deviceUI.CommonDevice.Type == DeviceType.DoorLock)
			{
			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.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.HideSwitchBtn(true);
			deviceTypeRowLayout.AddChidren(deviceRow);

			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();
			};

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			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.IASZone)
			{
			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);
			@@ -1618,61 +1690,210 @@
			deviceRow.HideSwitchBtn(true);
			deviceTypeRowLayout.AddChidren(deviceRow);

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			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 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);

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			}
			}
			}
			else
			{
			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.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.HideSwitchBtn(true);
			deviceTypeRowLayout.AddChidren(deviceRow);

			EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
			{
			var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
			detailInfo.EditAction += (curDevice, curRoom) =>
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceRow.RemoveFromParent();
			sameTypeList.Remove(deviceUI);
			if (sameTypeList.Count == 0)
			{
			RefreshFunction(Common.Room.CurrentRoom);
			}
			}
			else
			{
			deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			}
			};
			};
			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI
			};
			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI
			};
			if (curRoom.IsSharedRoom == false)
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			}
			catch
			{


			//删除设备
			EventHandler<MouseEventArgs> delEvent = (delSender, delE) =>
			{
			var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.DeleteFunction));
			alert.Show();
			alert.ConfirmClickEvent += () =>
			{
			if (Common.Room.CurrentRoom.IsLove)
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
			sameTypeList.Remove(deviceUI);
			}
			else
			{
			Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
			deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
			sameTypeList.Remove(deviceUI);
			if (Common.Room.CurrentRoom.GetLoveRoom().DeviceUIList.Find((obj) => obj.FileName == deviceUI.FileName) != null)
			{
			Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
			}
			}
			if (sameTypeList.Count == 0)
			{
			RefreshBodyView();
			}
			};
			};
			var delBtn = new CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI
			};
			if (Common.Room.CurrentRoom.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			catch { }
			});
			})
			{ IsBackground = true }.Start();
			@@ -1697,12 +1918,12 @@
			functionSceneBodyView = new FrameLayout()
			{
			Y = roomFL.Bottom,
			Height = Application.GetRealHeight(973+279),
			Height = Application.GetRealHeight(973 + 279),
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			functionSceneAutoBodyView.AddChidren(functionSceneBodyView);

			RoomButton curBtn = new RoomButton(0,0);
			RoomButton curBtn = new RoomButton(0, 0);
			foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
			{
			var row = new FrameLayout()
			@@ -1718,12 +1939,11 @@
			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)
			if (sceneBtn.IsSelected)
			{
			RefreshScene(room);
			}
			@@ -1732,16 +1952,17 @@
			RefreshFunction(room);
			}
			}

			roomBtn.ButtonClickEvent += (sender, e) =>
			{
			if (sender == curBtn)
			if (sender == curBtn)
			{
			return;
			}
			sender.IsSelected = true;
			curBtn.IsSelected = false;
			curBtn = sender;
			this.curRoom = room;
			Common.Room.CurrentRoom = room;
			if (sceneBtn.IsSelected)
			{
			RefreshScene(room);
			@@ -1812,7 +2033,7 @@
			Height = Application.GetRealHeight(200),
			Width = Application.GetRealWidth(700),
			Gravity = Gravity.CenterHorizontal,
			Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}","\r\n"),
			Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			TextAlignment = TextAlignment.Center,
			IsMoreLines = true
			@@ -1847,7 +2068,7 @@
			if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
			{
			sceneView.scene.RemainTime = delayScenesListResponseInfo.RemainTime;
			var remainTime= delayScenesListResponseInfo.RemainTime;
			var remainTime = delayScenesListResponseInfo.RemainTime;
			if (remainTime > 0)
			{
			new System.Threading.Thread(() =>
			@@ -2023,7 +2244,8 @@
			Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
			if (logiciocnBtn.Tag.ToString() == "3")
			{
			Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;// Language.StringByID(MyInternationalizationString.automation1);
			Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
			Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
			var addLogicPage = new Logic.AddLogicPage();
			HomePage.Instance.AddChidren(addLogicPage);
			HomePage.Instance.PageIndex += 1;
			@@ -2033,6 +2255,7 @@
			{

			Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
			Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
			Logic.TemplatePage templatePage = new Logic.TemplatePage();
			Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
			HomePage.Instance.AddChidren(templatePage);