~wxr/OnPro.git - Gitblit

			@@ -48,6 +48,7 @@
			{
			case "1":
			{

			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			foreach (var dic in dicList)
			{
			@@ -129,12 +130,8 @@
			case "2":
			{
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
			}

			string value= this.GetKeyValue("timesection", dicList);
			inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
			}
			break;
			case "3":
			@@ -175,91 +172,56 @@
			case SPK.PanelSocket:
			case SPK.ElectricSocket:
			{//开关灯
			foreach (var dic in dicList)
			string value = this.GetKeyValue("on_off", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{

			string value = dic["value"];
			if (value == "on")
			{
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			}
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);
			}
			}
			break;
			//传感器
			case SPK.SensorHelp:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.qiujiu);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
			}
			inputView.btnState.Text = Language.StringByID(StringId.qiujiu);
			}
			}
			break;
			case SPK.SensorSmoke:
			case SPK.SensorGas:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuxieluo);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.xieluo);
			inputView.btnState.Text = Language.StringByID(StringId.xieluo);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuxieluo);
			}
			}
			}
			break;
			case SPK.SensorWater:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuluoshui);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.luoshui);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuluoshui);
			}
			inputView.btnState.Text = Language.StringByID(StringId.luoshui);
			}
			}
			break;
			case SPK.SensorDryContact:
			case SPK.SensorDryContact2:
			{
			foreach (var dic in dicList)

			string value = this.GetKeyValue("on_off", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{

			string value = dic["value"];
			if (value == "on")
			{
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			}
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);
			}
			}
			break;
			@@ -267,77 +229,52 @@
			case SPK.SensorDuiShe:
			case SPK.SensorPir:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("people_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			string value = dic["value"];
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			}
			}
			}
			break;
			case SPK.SensorDoorWindow:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("contact_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.bihe);
			if (value == "open")
			{

			string value = dic["value"];
			if (value == "open")
			{
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.bihe);
			}
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}

			}
			break;
			case SPK.SensorUtrasonic:
			{
			string key = this.GetKey(dicList);
			string value = this.GetValue(dicList);
			string str = "";
			foreach (var dic in dicList)
			switch (key)
			{
			string value = dic["value"];
			switch (dic["key"])
			{
			case "status":
			case "people_status":
			case "status":
			case "people_status":
			{
			str = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			if (value == "true")
			{
			str = Language.StringByID(StringId.youren);
			}
			else
			{
			str = Language.StringByID(StringId.wuren);
			}


			str = Language.StringByID(StringId.youren);
			}
			break;
			case "dismantle":
			}
			break;
			case "dismantle":
			{
			str = Language.StringByID(StringId.buzaixian);
			if (value == "true")
			{
			if (value == "true")
			{
			str = Language.StringByID(StringId.zaixian);
			}
			else
			{
			str = Language.StringByID(StringId.buzaixian);
			}
			str = Language.StringByID(StringId.zaixian);
			}
			break;

			}
			}
			break;

			}
			inputView.btnState.Text = str;
			@@ -345,50 +282,31 @@
			break;
			case SPK.SenesorMegahealth:
			{
			foreach (var dic in dicList)
			string key = this.GetKey(dicList);
			string value = this.GetValue(dicList);
			if (key == "people_status")
			{
			string value = dic["value"];
			switch (dic["key"])
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			case "people_status":
			{
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);
			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			}

			}
			break;
			case "target_status":
			{
			if (value == "4")
			{
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			}
			break;
			inputView.btnState.Text = Language.StringByID(StringId.youren);
			}

			}
			else if (key == "target_status")
			{
			if (value == "4")
			{
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			}
			}
			break;
			case SPK.SenesorMegahealth2:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "fall")
			{
			inputView.btnState.Text = Language.StringByID(StringId.diedao);
			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			}
			string value = this.GetValue(dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "fall") {
			inputView.btnState.Text = Language.StringByID(StringId.diedao);
			}
			}
			break;
			@@ -456,7 +374,7 @@
			case SPK.SensorTemperature:
			{

			string str = new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
			string str =this.GetText(dicList, "temperature");
			inputView.btnState.Text = str;
			}
			break;
			@@ -472,26 +390,17 @@
			case SPK.SensorTVOC:
			case SPK.SensorHcho:
			{
			string strvalue = "";
			foreach (var dic in dicList)
			{
			strvalue = dic["value"];
			break;
			}
			string str = new PublicInterface().GetSensorLevelText(device, strvalue, true);
			string value = this.GetValue(dicList);
			string str = new PublicInterface().GetSensorLevelText(device, value, true);
			inputView.btnState.Text = str;
			}
			break;
			case SPK.DoorLock:
			{
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			if (value == "open")
			{
			string value = dic["value"];
			if (value == "open")
			{
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}

			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}
			}
			break;
			@@ -503,19 +412,9 @@
			}
			else
			{

			foreach (var dic in dicList)
			{
			string key = dic["key"];
			if (key == "user_id")
			{
			string userId = dic["value"];
			var FaceItem = this.FaceItem(userId, device.deviceId);
			inputView.btnState.Text = FaceItem.userName;
			// Language.StringByID(StringId.kaiqi);
			}

			}
			string userId = this.GetKeyValue("user_id",dicList);
			var FaceItem = this.GetFaceItem(userId, device.deviceId);
			inputView.btnState.Text = FaceItem.userName;
			}
			}
			break;
			@@ -639,26 +538,18 @@
			case "8":
			{
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			if (value == "arrive")
			{
			string strtext = "";
			string value = dic["value"];
			switch (value)
			{
			case "arrive":
			{
			strtext = Language.StringByID(StringId.daoda);
			}
			break;
			case "leave":
			{
			strtext = Language.StringByID(StringId.likai);
			}
			break;
			}
			inputView.btnText.TextID = StringId.likiadaoda;
			inputView.btnState.Text = strtext;
			value = Language.StringByID(StringId.daoda);
			}
			else if (value == "leave")
			{
			value = Language.StringByID(StringId.likai);
			}

			inputView.btnText.TextID = StringId.likiadaoda;
			inputView.btnState.Text = value;
			}
			break;
			case "10":
			@@ -775,8 +666,6 @@
			\|\| device.spk == SPK.SensorEnvironment3
			)
			{
			//这个设备比较特殊
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			///当前的索引值数据对象
			Input inputedit = Logic.currlogic.input[indexVulae];
			///状态值
			@@ -800,7 +689,7 @@
			{
			titleInt = StringId.wendudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "humidity":
			@@ -814,27 +703,27 @@
			{
			titleInt = StringId.shidudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "co2":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			}
			break;
			case "pm25":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			}
			break;
			case "tvoc":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			}
			break;
			case "hcho":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			}
			break;
			}
			@@ -844,37 +733,37 @@
			else if (device.spk == SPK.SensorTemperature)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);
			this.SensorView(thisView, device, "temperature", indexVulae);

			}
			else if (device.spk == SPK.SensorHumidity)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "humidity", indexVulae);
			this.SensorView(thisView, device, "humidity", indexVulae);

			}
			else if (device.spk == SPK.SensorCO2)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "co2", indexVulae);
			this.SensorView(thisView, device, "co2", indexVulae);

			}
			else if (device.spk == SPK.SensorPm25)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "pm25", indexVulae);
			this.SensorView(thisView, device, "pm25", indexVulae);

			}
			else if (device.spk == SPK.SensorTVOC)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "tvoc", indexVulae);
			this.SensorView(thisView, device, "tvoc", indexVulae);

			}
			else if (device.spk == SPK.SensorHcho)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "hcho", indexVulae);
			this.SensorView(thisView, device, "hcho", indexVulae);

			}
			else
			@@ -1442,11 +1331,11 @@

			if (outputTarget.target_type == "1" \|\| outputTarget.target_type == "3")
			{
			targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			targetView.btnText.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			//再次编辑条件状态点击事件
			targetView.btnClick.MouseUpEventHandler += (sen, e) =>
			@@ -1503,20 +1392,18 @@
			//延时点击事件
			targetView.btnDelay.MouseUpEventHandler += (sen, e) =>
			{

			InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
			inpOrOutLogicMethod.Delayed(thisView, outputTarget.delay, (value) =>
			{
			outputTarget.delay = value.ToString();
			if (outputTarget.target_type == "1")
			{
			targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			}
			});
			this.Delayed(thisView, outputTarget.delay, (value) =>
			{
			outputTarget.delay = value.ToString();
			if (outputTarget.target_type == "1")
			{
			targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			});

			};
			///删除控件
			@@ -2183,13 +2070,8 @@
			break;
			case SPK.doorgate:
			{
			foreach (var dic in dicList)
			{
			if (dic["key"] == "user_id")
			{
			button2.Text = dic["value"]?.ToString();
			}
			}
			string value = this.GetKeyValue("user_id", dicList);
			button2.Text = this.GetFaceItem(value, device.deviceId).userName;
			}
			break;
			}
			@@ -2214,6 +2096,32 @@

			}
			return valueStr;
			}
			/// <summary>
			/// 获取Key值
			/// </summary>
			/// <param name="dicList">注意:永远默认第一个元素</param>
			/// <returns></returns>
			public string GetKey(List<Dictionary<string, string>> dicList)
			{
			if (dicList.Count == 0)
			{
			return "";
			}
			return dicList[0]["key"].ToString();
			}
			/// <summary>
			/// 获取value值
			/// </summary>
			/// <param name="dicList">注意:永远默认第一个元素</param>
			/// <returns></returns>
			public string GetValue(List<Dictionary<string, string>> dicList)
			{
			if (dicList.Count == 0)
			{
			return "";
			}
			return dicList[0]["value"].ToString();
			}
			/// <summary>
			///获取自动化名称
			@@ -2277,19 +2185,12 @@
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			{//开关灯

			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			stateStr = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{
			string value = dic["value"];
			if (value == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			stateStr = Language.StringByID(StringId.onLogic);

			}
			else
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}
			}
			break;
			@@ -2351,18 +2252,12 @@
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			{
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			stateStr = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{
			string value = dic["value"];
			if (value == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			stateStr = Language.StringByID(StringId.onLogic);

			}
			else if (value == "off")
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}

			}
			@@ -2567,7 +2462,6 @@
			private void SensorView(FrameLayout thisView, Function device, string key, int indexVulae)
			{
			//这个设备比较特殊
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			///当前的索引值数据对象
			Input inputedit = Logic.currlogic.input[indexVulae];
			///状态值
			@@ -2590,7 +2484,7 @@
			{
			titleInt = StringId.wendudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "humidity":
			@@ -2604,27 +2498,27 @@
			{
			titleInt = StringId.shidudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "co2":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			}
			break;
			case "pm25":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			}
			break;
			case "tvoc":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			}
			break;
			case "hcho":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			}
			break;
			}
			@@ -2634,8 +2528,8 @@
			/// 查找指定userId
			/// </summary>
			/// <param name="userId"></param>
			/// <returns></returns>
			public Face FaceItem(string userId, string deviceId)
			/// <returns></returns>
			public Face GetFaceItem(string userId, string deviceId)
			{
			if (Send.Current.faceList.Count == 0)
			{