~wjc/HomeApp.git

			@@ -23,6 +23,7 @@
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();

			public void Show()
			{

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

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

			var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			{
			Width = Application.GetRealWidth(1080 - 58 - 200),
			Height = Application.GetRealHeight(280),
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58 + 200),
			};
			this.AddChidren(devicetypehorizontalScrol1);
			///设备类型滑动控件
			var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
			{
			@@ -137,19 +130,20 @@
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			// Radius = (uint)Application.GetRealHeight(50),

			};
			this.AddChidren(devicetypehorizontalScrol);
			devicetypehorizontalScrol.SetCornerWithSameRadius(20,HDLUtils.RectCornerBottomLeft);

			middle = new VerticalScrolViewLayout();
			middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
			middle.Height =Application.GetRealHeight(1920-40) - devicetypehorizontalScrol.Bottom;
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			middle.X = Application.GetRealWidth(58);
			middle.Radius = (uint)Application.GetRealHeight(50);
			//middle.Radius = (uint)Application.GetRealHeight(50);
			this.AddChidren(middle);

			middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
			///目前支持的设备
			var deviceTypeList = new List<DeviceType> {
			DeviceType.IASZone,
			@@ -176,7 +170,7 @@
			Height = Application.GetRealHeight(780),
			X = Application.GetRealWidth(1080 - 468 - 35),
			Y = Application.GetRealHeight(184),
			BackgroundImagePath= "Item/SelectFloor_Right.png",
			BackgroundImagePath = "Item/SelectFloor_Right.png",
			};
			flMain.AddChidren(foolrbjicon);

			@@ -188,6 +182,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -195,7 +190,7 @@
			{

			Width = Application.GetRealWidth(450),
			Height =foolrbjicon.Height - btnfoolrtext.Height,
			Height = foolrbjicon.Height - btnfoolrtext.Height,
			X = Application.GetRealWidth(80),
			Y = btnfoolrtext.Bottom,
			};
			@@ -206,7 +201,7 @@
			var foolrRowLayout = new RowLayout
			{
			Height = Application.GetRealHeight(150),
			LineColor= ZigbeeColor.Current.LogicMiddleBackgroundColor,
			LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			foolrbj.AddChidren(foolrRowLayout);

			@@ -215,7 +210,7 @@
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			UnSelectedImagePath = "Floor/Floor.png",
			Gravity=Gravity.CenterVertical,
			Gravity = Gravity.CenterVertical,
			};
			foolrRowLayout.AddChidren(btnfoolricon);

			@@ -228,10 +223,12 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X= btnfoolricon.Right+Application.GetRealWidth(12),
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value) {
			if (foolrname.Text == foolr.Value)
			{
			btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
			btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			}
			@@ -245,7 +242,7 @@
			foolrname.Text = btnfoolrname.Text;
			flMain.RemoveFromParent();
			var list = Send.GetRoomList(btnfoolrname.Tag.ToString());


			AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			};
			foolrRowLayout.MouseUpEventHandler += foolrnameclick;
			@@ -303,20 +300,20 @@
			Width = Application.GetRealWidth(255),
			UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
			SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
			Y=Application.GetRealHeight(21),
			Y = Application.GetRealHeight(21),
			};
			fra.AddChidren(roombjBtn);

			var roomnameBtn= new Button
			var roomnameBtn = new Button
			{

			Height = Application.GetRealHeight(152-26-20),
			Width = Application.GetRealWidth(255-20-50),
			Height = Application.GetRealHeight(152 - 26 - 20),
			Width = Application.GetRealWidth(255 - 20 - 50),
			Text = room.Name,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			Y=Application.GetRealHeight(21 +13+10),
			X=Application.GetRealWidth(10+25),
			Y = Application.GetRealHeight(21 + 13 + 10),
			X = Application.GetRealWidth(10 + 25),

			};
			fra.AddChidren(roomnameBtn);
			@@ -334,7 +331,8 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice==null) {
			if (device.CommonDevice == null)
			{
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			@@ -343,7 +341,17 @@
			}
			list.Add(device);
			}

			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}

			AllDeviceTypeView(list, devicetypehorizontalScrol);

			}
			@@ -364,7 +372,8 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice==null) {
			if (device.CommonDevice == null)
			{
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			@@ -373,7 +382,18 @@
			}
			list.Add(device);
			}


			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}

			AllDeviceTypeView(list, devicetypehorizontalScrol);


			@@ -404,7 +424,7 @@
			devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
			}

			var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone\|\| device.CommonDevice.Type == DeviceType.TemperatureSensor);
			var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone \|\| device.CommonDevice.Type == DeviceType.TemperatureSensor);
			if (iASZonejosn != null)
			{
			devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
			@@ -574,7 +594,7 @@
			Height = Application.GetRealHeight(112),
			X = Application.GetRealWidth(58),
			Y = Application.GetRealHeight(30 + 9),
			Radius = (uint)Application.GetRealHeight(56),
			// Radius = (uint)Application.GetRealHeight(56),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			deviceFramelayout.AddChidren(bjFramelayout);
			@@ -605,6 +625,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -685,11 +706,11 @@
			/// 选中该设备功能作为条件的视图方法
			/// </summary>
			/// <param name="common">Common.</param>
			public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
			public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
			{
			//不让当前界面滑动
			UserView.HomePage.Instance.ScrollEnabled = false;
			List<Dictionary<string, string>> doorlockConditionsInfo= new List<Dictionary<string, string>>();
			List<Dictionary<string, string>> doorlockConditionsInfo = new List<Dictionary<string, string>>();
			Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
			dictionary(deviceConditionsInfo, "Type", "1");
			dictionary(deviceConditionsInfo, "IsValid", "1");
			@@ -700,18 +721,7 @@
			flMain.MouseUpEventHandler += (sender, e) =>
			{
			flMain.RemoveFromParent();


			};

			var devicefra1 = new FrameLayout
			{
			Width = Application.GetRealWidth(1080),
			Height = Application.GetRealHeight(100),
			Y = Application.GetRealHeight(1920 - 100),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			flMain.AddChidren(devicefra1);

			var devicefra = new FrameLayout
			{
			@@ -720,9 +730,10 @@
			Height = Application.GetRealHeight(530),
			Y = Application.GetRealHeight(1920 - 530),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			Radius = (uint)Application.GetRealHeight(60),
			// Radius = (uint)Application.GetRealHeight(60),
			};
			flMain.AddChidren(devicefra);
			devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft\|HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout
			@@ -739,6 +750,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -767,6 +779,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

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

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

			@@ -952,6 +967,7 @@
			Height = Application.GetRealHeight(180),
			//SelectedBackgroundColor = 0xfffe5e00,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -982,6 +998,7 @@
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(180),
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

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

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

			@@ -1151,7 +1170,7 @@
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");
			if (iASZonedevice.IasDeviceType == 13)
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1233,7 +1252,7 @@
			timeoutrowlayout.AddChidren(timeoutBtnSelected);
			EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1252,7 +1271,6 @@
			#endregion
			}
			break;

			case 40:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1292,7 +1310,6 @@
			openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
			}
			break;

			case 277:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1379,6 +1396,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
			TextSize = 14,
			//SelectedBackgroundColor = 0xfffe5e00,
			};
			buttonRow.AddChidren(button);
			@@ -1386,12 +1404,12 @@
			var buttonSelected = new SelectedButton();
			buttonRow.AddChidren(buttonSelected);
			EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
			{
			buttonSelected.Visible = true;
			SelectedDeviceStatuscondition = "OnOffSwitch";
			button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			{
			buttonSelected.Visible = true;
			SelectedDeviceStatuscondition = "OnOffSwitch";
			button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;

			};
			};
			buttonRow.MouseUpEventHandler += buttonclick;
			button.MouseUpEventHandler += buttonclick;
			buttonSelected.MouseUpEventHandler += buttonclick;
			@@ -1408,11 +1426,10 @@
			case DeviceType.DoorLock:
			{


			flMain.RemoveFromParent();
			var memberList = new MemberList();
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;
			MemberList.action += () => { flMain.RemoveFromParent(); };
			MemberList.edit = false;
			memberList.Show(common);
			}
			@@ -1431,6 +1448,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(80),
			Y = timetype.Bottom + Application.GetRealHeight(70),
			TextSize = 14,
			};
			devicefra.AddChidren(Btntemperaturevalue);

			@@ -1544,7 +1562,7 @@
			deviceConditionsInfo.Add(Key, Value);
			}




			}
			}