~xm/HomeApp.git

			@@ -40,7 +40,7 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			@@ -90,6 +90,7 @@
			Y = Application.GetRealHeight(92),
			// TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -187,6 +188,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -228,6 +230,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value)
			@@ -634,6 +637,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -753,6 +757,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -781,6 +786,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

			};
			timetype.AddChidren(Btncomplete);
			@@ -806,254 +812,6 @@
			}
			switch (common.Type)
			{
			///灯光
			case DeviceType.OnOffOutput:
			{
			dictionary(deviceConditionsInfo, "Cluster_ID", "6");
			dictionary(deviceConditionsInfo, "AttriButeId", "0");
			dictionary(deviceConditionsInfo, "Range", "1");
			dictionary(deviceConditionsInfo, "AttriButeData2", "0");

			#region 灯光View



			var openframelayout = new FrameLayout
			{
			Height = Application.GetRealHeight(160),
			Y = timetype.Bottom + Application.GetRealHeight(20),
			};
			devicefra.AddChidren(openframelayout);

			var openrowlayout = new RowLayout
			{
			Y = Application.GetRealHeight(30),
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(130),
			X = Application.GetRealWidth(80),
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			};
			openframelayout.AddChidren(openrowlayout);

			var btnopen = new Button
			{
			Width = Application.GetRealWidth(600),
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			};
			openrowlayout.AddChidren(btnopen);

			var openBtnSelected = new SelectedButton();
			openrowlayout.AddChidren(openBtnSelected);


			var closeframelayout = new FrameLayout
			{
			Height = Application.GetRealHeight(160),
			Y = openframelayout.Bottom,
			};
			devicefra.AddChidren(closeframelayout);
			var closerowlayout = new RowLayout
			{
			Y = Application.GetRealHeight(30),
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(130),
			X = Application.GetRealWidth(80),
			LineColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			closeframelayout.AddChidren(closerowlayout);

			var btnclose = new Button
			{
			//Text = "关",
			TextID = MyInternationalizationString.close,
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			};
			closerowlayout.AddChidren(btnclose);

			var closeBtnSelected = new SelectedButton();
			closerowlayout.AddChidren(closeBtnSelected);
			#endregion

			///点击确认事件
			EventHandler<MouseEventArgs> openclick = (sender, e) =>
			{
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			SelectedDeviceStatuscondition = "OnOffOutput";
			dictionary(deviceConditionsInfo, "AttriButeData1", "1");//默认值


			};
			openrowlayout.MouseUpEventHandler += openclick;
			btnopen.MouseUpEventHandler += openclick;
			openBtnSelected.MouseUpEventHandler += openclick;
			openframelayout.MouseUpEventHandler += openclick;
			///点击取消事件
			EventHandler<MouseEventArgs> closeclick = (sender, e) =>
			{
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			SelectedDeviceStatuscondition = "OnOffOutput";
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");//默认值

			};
			closerowlayout.MouseUpEventHandler += closeclick;
			btnclose.MouseUpEventHandler += closeclick;
			closeBtnSelected.MouseUpEventHandler += closeclick;
			closeframelayout.MouseUpEventHandler += closeclick;
			if (edit && devices != null)
			{
			if (devices["AttriButeId"] == "0")
			{
			if (devices["AttriButeData1"] == "1")
			{
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			}
			else
			{
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;

			}
			}
			}
			}
			break;
			case DeviceType.WindowCoveringDevice:
			{

			dictionary(deviceConditionsInfo, "Cluster_ID", "258");
			dictionary(deviceConditionsInfo, "AttriButeId", "8");
			dictionary(deviceConditionsInfo, "Range", "0");
			dictionary(deviceConditionsInfo, "AttriButeData2", "0");

			#region 窗帘View
			devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
			devicefra.Height = Application.GetRealHeight(720);
			var windowCoveringfra = new FrameLayout
			{
			Y = Application.GetRealHeight(180),
			Height = Application.GetRealHeight(180 * 2 + 30),
			};
			devicefra.AddChidren(windowCoveringfra);

			var openrowlayout = new RowLayout
			{
			Height = Application.GetRealHeight(180),
			};
			windowCoveringfra.AddChidren(openrowlayout);

			var btnopen = new Button
			{
			//Text = "开",
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(50),
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(180),
			//SelectedBackgroundColor = 0xfffe5e00,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			};
			openrowlayout.AddChidren(btnopen);

			var openBtnSelected = new Button
			{
			X = Application.GetRealWidth(1000 - 150),
			Width = Application.GetMinRealAverage(110),
			Height = Application.GetMinRealAverage(110),
			UnSelectedImagePath = "Item/YesSelected.png",
			Visible = false,
			Gravity = Gravity.CenterVertical
			};
			openrowlayout.AddChidren(openBtnSelected);

			var closerowlayout = new RowLayout
			{
			Y = openrowlayout.Bottom,
			Height = Application.GetRealHeight(180),
			};
			windowCoveringfra.AddChidren(closerowlayout);

			var btnclose = new Button
			{
			//Text = "关",
			TextID = MyInternationalizationString.close,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(50),
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(180),
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			};
			closerowlayout.AddChidren(btnclose);

			var closeBtnSelected = new Button
			{
			X = Application.GetRealWidth(1000 - 150),
			Width = Application.GetMinRealAverage(110),
			Height = Application.GetMinRealAverage(110),
			UnSelectedImagePath = "Item/YesSelected.png",
			Visible = false,
			Gravity = Gravity.CenterVertical
			};
			closerowlayout.AddChidren(closeBtnSelected);
			#endregion

			///点击确认事件
			EventHandler<MouseEventArgs> openclick = (sender, e) =>
			{
			SelectedDeviceStatuscondition = "WindowCoveringDevice";
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			dictionary(deviceConditionsInfo, "AttriButeData1", "95");//默认值

			};
			openrowlayout.MouseUpEventHandler += openclick;
			btnopen.MouseUpEventHandler += openclick;
			openBtnSelected.MouseUpEventHandler += openclick;
			///点击取消事件
			EventHandler<MouseEventArgs> closeclick = (sender, e) =>
			{
			SelectedDeviceStatuscondition = "WindowCoveringDevice";
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			dictionary(deviceConditionsInfo, "AttriButeData1", "5");//默认值

			};
			closerowlayout.MouseUpEventHandler += closeclick;
			btnclose.MouseUpEventHandler += closeclick;
			closeBtnSelected.MouseUpEventHandler += closeclick;

			if (edit && devices != null)
			{
			if (devices["AttriButeId"] == "8")
			{
			if (int.Parse(devices["AttriButeData1"]) > 5)
			{
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			}
			else
			{
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			}
			}
			}
			}
			break;
			case DeviceType.IASZone:
			{

			@@ -1092,6 +850,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1122,6 +881,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1357,75 +1117,6 @@

			}

			}
			break;
			case DeviceType.OnOffSwitch:
			{

			dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
			dictionary(deviceConditionsInfo, "AttriButeId", "1283");
			dictionary(deviceConditionsInfo, "Range", "0");//按键特殊
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");
			dictionary(deviceConditionsInfo, "AttriButeData2", "0");

			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
			var OnOffOutputfra = new FrameLayout
			{
			Height = Application.GetRealHeight(160),
			Y = timetype.Bottom + Application.GetRealHeight(20),
			};
			devicefra.AddChidren(OnOffOutputfra);

			var buttonRow = new RowLayout
			{
			Y = Application.GetRealHeight(30),
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(130),
			X = Application.GetRealWidth(80),
			LineColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			OnOffOutputfra.AddChidren(buttonRow);

			var button = new Button
			{
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
			//SelectedBackgroundColor = 0xfffe5e00,
			};
			buttonRow.AddChidren(button);

			var buttonSelected = new SelectedButton();
			buttonRow.AddChidren(buttonSelected);
			EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
			{
			buttonSelected.Visible = true;
			SelectedDeviceStatuscondition = "OnOffSwitch";
			button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;

			};
			buttonRow.MouseUpEventHandler += buttonclick;
			button.MouseUpEventHandler += buttonclick;
			buttonSelected.MouseUpEventHandler += buttonclick;
			OnOffOutputfra.MouseUpEventHandler += buttonclick;

			if (edit && devices != null)
			{
			buttonSelected.Visible = true;
			button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			}

			}
			break;
			case DeviceType.DoorLock:
			{
			flMain.RemoveFromParent();
			var memberList = new MemberList();
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;
			memberList.Show(common);
			}
			break;