~wjc/HomeApp.git

			@@ -39,11 +39,11 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			Width = Application.GetRealWidth(300),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.devicestate,
			@@ -89,6 +89,7 @@
			Y = Application.GetRealHeight(92),
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -120,16 +121,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()
			{
			@@ -138,18 +129,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(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);

			middle = new VerticalScrolViewLayout();
			middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
			middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
			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(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

			///目前支持的设备
			List<DeviceType> deviceTypeList = new List<DeviceType> {
			@@ -172,38 +165,75 @@
			{
			flMain.RemoveFromParent();
			};
			var foolrbjicon = new FrameLayout
			{

			Width = Application.GetRealWidth(450),
			Height = Application.GetRealHeight(780),
			X = Application.GetRealWidth(1080 - 468 - 35),
			Y = Application.GetRealHeight(184),
			BackgroundImagePath = "Item/SelectFloor_Right.png",
			};
			flMain.AddChidren(foolrbjicon);

			var btnfoolrtext = new Button
			{
			Width = Application.GetRealWidth(450),
			Height = Application.GetRealHeight(150),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			var foolrbj = new VerticalScrolViewLayout
			{

			Width = Application.GetRealWidth(400),
			Height = Application.GetRealHeight(600),
			X = Application.GetRealWidth(1080 - 400 - 60),
			Y = Application.GetRealHeight(184 + 50),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			Radius = (uint)Application.GetRealHeight(30),
			Width = Application.GetRealWidth(450),
			Height = foolrbjicon.Height - btnfoolrtext.Height,
			X = Application.GetRealWidth(80),
			Y = btnfoolrtext.Bottom,
			};
			flMain.AddChidren(foolrbj);
			foolrbjicon.AddChidren(foolrbj);

			foreach (var foolr in Config.Instance.Home.FloorDics)
			{

			var foolrRowLayout = new FrameLayout
			var foolrRowLayout = new RowLayout
			{
			Height = Application.GetRealHeight(150),
			LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			foolrbj.AddChidren(foolrRowLayout);

			var btnfoolricon = new Button
			{
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			UnSelectedImagePath = "Floor/Floor.png",
			Gravity = Gravity.CenterVertical,
			};
			foolrRowLayout.AddChidren(btnfoolricon);


			var btnfoolrname = new Button
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(160),
			Height = Application.GetRealHeight(150),
			Text = foolr.Value,
			TextAlignment = TextAlignment.Center,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			//SelectedTextColor=0xfffc744b,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);

			if (foolrname.Text == foolr.Value)
			{
			btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
			btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			}

			EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
			{
			@@ -214,6 +244,7 @@
			flMain.RemoveFromParent();
			var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
			AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);

			};
			foolrRowLayout.MouseUpEventHandler += foolrnameclick;
			btnfoolrname.MouseUpEventHandler += foolrnameclick;
			@@ -311,6 +342,16 @@
			}
			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);

			}
			@@ -337,6 +378,16 @@
			continue;
			}
			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);

			@@ -550,6 +601,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -628,14 +680,6 @@
			{
			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
			{
			@@ -644,9 +688,10 @@
			Height = Application.GetRealHeight(530 + 160),
			Y = Application.GetRealHeight(1920 - 530 - 160),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			Radius = (uint)Application.GetRealHeight(60),
			//Radius = (uint)Application.GetRealHeight(60),
			};
			flMain.AddChidren(devicefra);
			devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout
			@@ -663,6 +708,8 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,

			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -676,9 +723,9 @@
			TextID = MyInternationalizationString.security,
			TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
			Height = Application.GetRealHeight(140),
			Width = Application.GetRealWidth(320),
			Width = Application.GetRealWidth(420),
			TextAlignment = TextAlignment.Center,
			X = Btncancel.Right + Application.GetRealWidth(100),
			X = Btncancel.Right + Application.GetRealWidth(50),
			TextSize = 16,
			Text = common.DeviceEpointName,
			};
			@@ -690,7 +737,8 @@
			Height = Application.GetRealHeight(140),
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(100),
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

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

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

			@@ -835,6 +885,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

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

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

			@@ -1072,6 +1125,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

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

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

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

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

			@@ -1572,6 +1630,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

			@@ -1683,22 +1742,9 @@
			{

			#region ----初始化设备功能数据----
			Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
			Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
			Dictionary<string, string> modedictionary = new Dictionary<string, string>();
			Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
			taskListInfo.Add(switchdictionary);
			taskListInfo.Add(temperaturedictionary);
			taskListInfo.Add(modedictionary);
			taskListInfo.Add(speeddictionary);
			dictionary(switchdictionary, "TaskType", "1");
			dictionary(switchdictionary, "Data2", "0");
			dictionary(temperaturedictionary, "TaskType", "5");
			dictionary(modedictionary, "TaskType", "5");
			dictionary(modedictionary, "Data1", "3");
			dictionary(speeddictionary, "TaskType", "5");
			dictionary(speeddictionary, "Data1", "6");

			var temperaturedictionary = new Dictionary<string, string>();
			var modedictionary = new Dictionary<string, string>();
			var speeddictionary = new Dictionary<string, string>();
			#endregion

			#region 空调View
			@@ -1731,6 +1777,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

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

			@@ -1845,31 +1893,32 @@
			}
			};

			#endregion
			#endregion
			//默认26,自动,中风
			int indextemperature = 10, indexmode = 2, indexspeed = 1;
			if (edit && TaskList != null)
			{
			foreach (var value in TaskList)
			{
			if (value["TaskType"] == "1")
			if (TaskList.Count == 1)
			{
			dictionary(switchdictionary, "Data1", value["Data1"]);
			if (value["Data1"] == "1")
			{
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			pausePickerViewfra.Height = Application.GetRealHeight(0);
			}
			else if (value["Data1"] == "0")
			{
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			pausePickerViewfra.Height = Application.GetRealHeight(600);
			}
			//数组只有一个元素说明当前空调状态为关；
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			pausePickerViewfra.Height = Application.GetRealHeight(600);
			//如果空调状态是关；直接跳出for循坏；
			break;

			}
			else if (value["TaskType"] == "5")
			else
			{
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			pausePickerViewfra.Height = Application.GetRealHeight(0);
			}


			if (value["TaskType"] == "5")
			{
			if (value["Data1"] == "3")
			{//3---设置工作模式(1:自动;3:制冷;4:制热;7:送风;8:除湿)
			@@ -1957,11 +2006,21 @@
			///确认事件
			EventHandler<MouseEventArgs> openclick = (sender, e) =>
			{
			//清除之前数据；
			taskListInfo.Clear();
			//加载新数据；
			dictionary(temperaturedictionary, "TaskType", "5");
			dictionary(modedictionary, "TaskType", "5");
			dictionary(modedictionary, "Data1", "3");
			dictionary(speeddictionary, "TaskType", "5");
			dictionary(speeddictionary, "Data1", "6");
			taskListInfo.Add(temperaturedictionary);
			taskListInfo.Add(modedictionary);
			taskListInfo.Add(speeddictionary);
			pausePickerViewfra.Height = Application.GetRealHeight(0);
			SelectedDeviceStatusaction = "yes";
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			dictionary(switchdictionary, "Data1", "1");
			var temperature = mList1[indextemperature].Split(' ')[0];
			var modestring = mList2[indexmode].Split(' ')[0];
			var speedstring = mList3[indexspeed].Split(' ')[0];
			@@ -1980,12 +2039,18 @@
			///取消事件
			EventHandler<MouseEventArgs> closeclick = (sender, e) =>
			{
			//清除之前数据；
			taskListInfo.Clear();
			dictionary(modedictionary, "TaskType", "5");
			dictionary(modedictionary, "Data1", "3");
			dictionary(modedictionary, "Data2", "0");
			//加载新数据；
			taskListInfo.Add(modedictionary);
			pausePickerViewfra.Height = Application.GetRealHeight(600);

			SelectedDeviceStatusaction = "yes";
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			dictionary(switchdictionary, "Data1", "0");

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