~wjc/HomeApp.git

			@@ -22,7 +22,7 @@
			completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
			EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
			{
			if (edit)
			if (!edit)
			{
			UserView.HomePage.Instance.ScrollEnabled = true;
			}
			@@ -323,9 +323,8 @@
			closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openView.selectedIconBtn.Visible = true;
			closeView.selectedIconBtn.Visible = false;
			if (iASZonedevice.IasDeviceType == 13)
			if (iASZonedevice.IasDeviceType == 13\|\|iASZonedevice.IasDeviceType == 541)
			{

			closeView.selectedIconBtn.Visible = true;
			}
			Send.dictionary(deviceConditionsInfo, "Range", "5");
			@@ -356,74 +355,13 @@
			{
			case 13:
			{

			if (common.ModelIdentifier == "MSPIRB-ZB.10")
			{
			int _height = 3;
			if (edit)
			{
			_height = 2;
			}
			var view = completeView.Show(_height);
			openView.titleBtn.TextID = MyInternationalizationString.someone;
			closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
			closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			closeView.selectedIconBtn.Visible = true;
			view.AddChidren(openView.Show());
			view.AddChidren(closeView.Show());

			takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			takebackView.selectedIconBtn.Visible = true;
			takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
			takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			if (edit)
			{

			if (devices["Cluster_ID"] == "1024")
			{
			flMain.RemoveFromParent();
			var illumination = new Illumination();
			UserView.HomePage.Instance.AddChidren(illumination);
			UserView.HomePage.Instance.PageIndex += 1;
			illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
			}
			else
			{
			closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			}
			}
			else
			{
			view.AddChidren(takebackView.Show());

			}


			takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			SelectedDeviceStatus = "";
			openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openView.selectedIconBtn.Visible = false;
			var illumination = new Illumination();
			UserView.HomePage.Instance.AddChidren(illumination);
			UserView.HomePage.Instance.PageIndex += 1;
			illumination.Show(common, takebackView.titleBtn.Text, 0, false);

			};

			}
			else
			{

			openView.titleBtn.TextID = MyInternationalizationString.someone;
			closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
			closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			closeView.selectedIconBtn.Visible = true;
			completeView.Show(2).AddChidren(openView.Show());
			completeView.Show(2).AddChidren(closeView.Show());

			}
			openView.titleBtn.TextID = MyInternationalizationString.someone;
			closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
			closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			closeView.selectedIconBtn.Visible = true;
			completeView.Show(2).AddChidren(openView.Show());
			completeView.Show(2).AddChidren(closeView.Show());
			}
			break;
			case 21:
			@@ -497,6 +435,61 @@
			completeView.Show(1).AddChidren(openView.Show());
			}
			break;
			case 541:
			{
			int _height = 3;
			if (edit)
			{
			_height = 2;
			}
			var view = completeView.Show(_height);
			openView.titleBtn.TextID = MyInternationalizationString.someone;
			closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
			closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			closeView.selectedIconBtn.Visible = true;
			view.AddChidren(openView.Show());
			view.AddChidren(closeView.Show());

			takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			takebackView.selectedIconBtn.Visible = true;
			takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
			takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
			if (edit)
			{

			if (devices["Cluster_ID"] == "1024")
			{
			flMain.RemoveFromParent();
			var illumination = new Illumination();
			UserView.HomePage.Instance.AddChidren(illumination);
			UserView.HomePage.Instance.PageIndex += 1;
			illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
			}
			else
			{
			closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			}
			}
			else
			{
			view.AddChidren(takebackView.Show());

			}


			takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			SelectedDeviceStatus = "";
			openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openView.selectedIconBtn.Visible = false;
			var illumination = new Illumination();
			UserView.HomePage.Instance.AddChidren(illumination);
			UserView.HomePage.Instance.PageIndex += 1;
			illumination.Show(common,takebackView.titleBtn.Text, 0, false);

			};
			}
			break;
			default:
			{
			openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
			@@ -551,7 +544,6 @@

			completeView.Show(l).AddChidren(openView.Show());
			openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
			//openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
			openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{