~wjc/HomeApp.git

			@@ -40,6 +40,7 @@
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.selection,
			IsBold = true,
			};
			topRowLayout.AddChidren(titleName);
			if (Common.Logic.CurrentLogic.LogicId != 0)
			@@ -83,7 +84,7 @@

			#endregion




			var middle = new VerticalScrolViewLayout
			{
			@@ -617,14 +618,24 @@
			{
			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (second != 0)
			if (minute != 0 && second != 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

			}
			else
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
			if (minute == 0 && second != 0)
			{
			devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

			}
			if (minute != 0 && second == 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);

			}

			}
			}
			}
			@@ -632,7 +643,6 @@
			case 21:
			case 22:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.logicopen;
			@@ -644,14 +654,24 @@

			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (second != 0)
			if (minute != 0 && second != 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

			}
			else
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
			if (minute == 0 && second != 0)
			{
			devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

			}
			if (minute != 0 && second == 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);

			}

			}

			}
			@@ -664,7 +684,6 @@
			break;
			case 40:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.smokescreen;
			@@ -674,7 +693,6 @@
			break;
			case 42:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.waterleakage;
			@@ -687,7 +705,6 @@
			break;
			case 43:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.gas;
			@@ -697,7 +714,6 @@
			break;
			case 277:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.callthepolice;
			@@ -707,7 +723,6 @@
			break;
			default:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
			if (intvalue == "1")
			{
			devicestatus.TextID = MyInternationalizationString.callthepolice;
			@@ -1156,7 +1171,7 @@
			{
			Y = Application.GetRealHeight(20),
			Height = Application.GetRealHeight(50),
			Width = Application.GetRealWidth(450),
			Width = Application.GetRealWidth(400),
			TextAlignment = TextAlignment.CenterLeft,
			Text = deviceinof.DeviceEpointName,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			@@ -1168,7 +1183,7 @@
			var btnregionname = new Button
			{
			Y = btndevicename.Bottom + Application.GetRealHeight(10),
			Width = Application.GetRealWidth(450),
			Width = Application.GetRealWidth(400),
			TextAlignment = TextAlignment.CenterLeft,
			Height = Application.GetRealHeight(50),
			Text = "",//Language.StringByID(MyInternationalizationString.customroom),
			@@ -1180,11 +1195,11 @@
			///显示设备条件状态控件
			var devicestatus = new Button
			{
			Width = Application.GetRealWidth(350),
			Width = Application.GetRealWidth(400),
			Height = Application.GetRealHeight(130),
			Gravity = Gravity.CenterVertical,
			TextAlignment = TextAlignment.CenterRight,
			X = Application.GetRealWidth(450),
			X = Application.GetRealWidth(400),
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			TextSize = 14,
			};
			@@ -1350,26 +1365,23 @@
			{
			continue;
			}
			string modetext = "", temperaturetext="", speedtext = "";
			string modetext = "", temperaturetext = "", speedtext = "";
			bool ifclose = false;
			foreach (var status in TaskList)
			{
			if (status["TaskType"].ToString() == "1")

			if (TaskList.Count == 1)
			{
			if (status["Data1"].ToString() == "0")
			{
			// devicestatus.Text = Language.StringByID(MyInternationalizationString.close);

			ifclose = false;
			}
			else if (status["Data1"].ToString() == "1")
			{
			//devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
			ifclose = true;
			}

			//数组只有一个元素说明当前空调状态为关；
			ifclose = false;
			//如果空调状态是关；直接跳出for循坏；
			break;
			}
			else if (status["TaskType"].ToString() == "5")
			else
			{
			ifclose = true;
			}
			if (status["TaskType"].ToString() == "5")
			{
			if (status["Data1"] == "3")
			{//3---设置工作模式(1:自动;3:制冷;4:制热;7:送风;8:除湿)
			@@ -1428,7 +1440,7 @@
			//4---设置加热度数;5---设置制冷、除湿度数;7---设置自动度数
			else if (status["Data1"] == "4" \|\| status["Data1"] == "5" \|\| status["Data1"] == "7")
			{
			var s = int.Parse(status["Data2"]) /100;
			var s = int.Parse(status["Data2"]) / 100;
			temperaturetext = s.ToString();
			}
			else if (status["Data1"] == "20")
			@@ -2246,14 +2258,7 @@
			flMain.RemoveFromParent();
			};

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

			var framelayout = new FrameLayout
			{
			Width = Application.GetRealWidth(1080),
			@@ -2263,6 +2268,7 @@
			Radius = (uint)Application.GetRealHeight(60),
			};
			flMain.AddChidren(framelayout);
			framelayout.SetCornerWithSameRadius(Application.GetRealHeight(58),HDLUtils.RectCornerTopLeft\|HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout