~wjc/HomeApp.git

			@@ -171,7 +171,9 @@
			case DeviceType.IASZone:
			{
			var iASZonedevice = deviceinof as IASZone;
			var intvalue = conditions["AttriButeData1"];
			//var intvalue = conditions["AttriButeData1"];
			string if_value = "5";
			var intvalue = conditions["Range"];
			icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
			switch (iASZonedevice.IasDeviceType)
			{
			@@ -183,7 +185,9 @@
			}
			else
			{
			if (conditions.ContainsKey("IgnoreTime"))


			if (conditions.ContainsKey("IgnoreTime")&& conditions["IgnoreTime"]!="0")
			{
			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			@@ -212,15 +216,14 @@
			state = Language.StringByID(MyInternationalizationString.someone);
			}
			}

			}
			break;
			case 21:
			case 22:
			{
			if (conditions.ContainsKey("IgnoreTime"))
			{

			if (conditions.ContainsKey("IgnoreTime")&&conditions["IgnoreTime"] != "0")
			{
			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (minute != 0 && second != 0)
			@@ -246,7 +249,7 @@
			}
			else
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state = Language.StringByID(MyInternationalizationString.logicopen);
			}
			@@ -261,7 +264,7 @@
			break;
			case 40:
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state =Language.StringByID(MyInternationalizationString.smokescreen);
			}
			@@ -270,7 +273,7 @@
			break;
			case 42:
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state =Language.StringByID( MyInternationalizationString.waterleakage);
			}
			@@ -282,7 +285,7 @@
			break;
			case 43:
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state =Language.StringByID( MyInternationalizationString.gas);
			}
			@@ -291,17 +294,16 @@
			break;
			case 277:
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state =Language.StringByID( MyInternationalizationString.callthepolice);
			}

			}
			break;

			default:
			{
			if (intvalue == "1")
			if (intvalue == if_value)
			{
			state =Language.StringByID(MyInternationalizationString.callthepolice);
			}
			@@ -531,7 +533,7 @@
			selecteddevice.del.MouseUpEventHandler += (sender, e) =>
			{

			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			@@ -540,10 +542,6 @@
			{
			Common.Logic.CurrentLogic.Conditions.Remove(conditions);
			selecteddevice.selecetdFrameLayout.RemoveFromParent();
			//var logicCommunalPage = new LogicCommunalPage();
			//UserView.HomePage.Instance.AddChidren(logicCommunalPage);
			//UserView.HomePage.Instance.PageIndex += 1;
			//logicCommunalPage.Show(() => { });
			};

			};
			@@ -923,7 +921,7 @@
			{
			var intvalue = int.Parse(tasks["Data1"]);
			var colorTemperatureValue = 1000000 / (intvalue * 100);
			state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
			state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "00K";
			}
			break;
			}
			@@ -1096,7 +1094,7 @@
			actiondevice.del.MouseUpEventHandler += (sender, e) =>
			{

			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();