~wjc/HomeApp.git

			@@ -20,7 +20,6 @@
			Button roomTextButton = new Button();
			Button devicetypeButton = new Button();
			VerticalScrolViewLayout middle;
			HorizontalScrolViewLayout devicetypehorizontalScrol1;
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();
			@@ -122,16 +121,6 @@
			};
			this.AddChidren(roomhorizontalScrol);


			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()
			{
			@@ -140,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 - 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> {
			@@ -353,14 +344,12 @@
			}
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;
			devicetypehorizontalScrol.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);
			@@ -393,13 +382,11 @@
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);
			@@ -693,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
			{
			@@ -709,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
			@@ -1762,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
			@@ -1926,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:除湿)
			@@ -2038,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];
			@@ -2061,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;