~wjc/HomeApp.git

			@@ -101,7 +101,7 @@
			addconditionview.iconBtn.Visible = true;
			addconditionview.titleBtn.TextID = MyInternationalizationString.ifcondition;
			middle.AddChidren(addconditionview.AddDeviceView());


			///添加条件的点击事件
			addconditionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
			{
			@@ -162,7 +162,6 @@
			LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
			addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
			middle.AddChidren(addflview.AddFl());

			addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
			{
			if (Common.Logic.CurrentLogic.Conditions.Count == 1)
			@@ -313,11 +312,7 @@
			{
			case 13:
			{
			if (intvalue == "1")
			{
			state=Language.StringByID( MyInternationalizationString.someone);
			}
			else
			if (conditions.ContainsKey("IgnoreTime"))
			{
			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			@@ -341,48 +336,55 @@

			}
			}
			else
			{
			state = Language.StringByID(MyInternationalizationString.someone);
			}

			}
			break;
			case 21:
			case 22:
			{
			if (intvalue == "1")
			if (conditions.ContainsKey("IgnoreTime"))
			{
			state =Language.StringByID( MyInternationalizationString.logicopen);
			}
			else
			{
			if (conditions.ContainsKey("IgnoreTime"))

			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (minute != 0 && second != 0)
			{

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

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

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

			}

			}
			state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);

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

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

			}

			}

			}
			else
			{
			if (intvalue == "1")
			{
			state = Language.StringByID(MyInternationalizationString.logicopen);
			}
			else
			{
			state = Language.StringByID(MyInternationalizationString.logicclose);
			}

			}

			}
			break;
			case 40:
			@@ -500,16 +502,18 @@
			s = "≤";
			}
			break;
			}
			}
			///转换温度值/100
			string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
			if (conditions["Cluster_ID"] == "1026")
			{
			icon = "ZigeeLogic/temperature.png";
			state = s + conditions["AttriButeData1"] + "℃";
			state = s + srtValue + "℃";
			}
			else
			{
			icon = "ZigeeLogic/humidity.png";
			state = s + conditions["AttriButeData1"] + "%";
			state = s + srtValue + "%";
			}
			break;

			@@ -562,11 +566,11 @@
			{
			if (conditions["AtHome"] == "1")
			{
			state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + "米";
			state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
			}
			else
			{
			state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + "米";
			state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
			}
			}
			}
			@@ -682,7 +686,6 @@
			addactionview.iconBtn.Visible = true;
			addactionview.titleBtn.TextID = MyInternationalizationString.execute;
			middle.AddChidren(addactionview.AddDeviceView());


			addactionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
			{
			@@ -695,8 +698,6 @@
			ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
			ListActions.Add(new Dictionary<string, object>());



			for (int i = 0; i < ListActions.Count; i++)
			{
			if (i == (ListActions.Count - 1))
			@@ -705,8 +706,6 @@
			LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
			addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
			middle.AddChidren(addflview.AddFl());


			addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
			{
			Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();