~wxr/OnPro.git - Gitblit

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


			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			foreach (var dic in dicList)
			{
			@@ -130,7 +130,7 @@
			case "2":
			{
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			string value= this.GetKeyValue("timesection", dicList);
			string value = this.GetKeyValue("timesection", dicList);
			inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
			}
			break;
			@@ -181,7 +181,7 @@
			}
			}
			break;
			//传感器
			//紧急求助传感器
			case SPK.SensorHelp:
			{
			string value = this.GetKeyValue("alarm_status", dicList);
			@@ -218,9 +218,9 @@
			case SPK.SensorDryContact2:
			{

			string value = this.GetKeyValue("on_off", dicList);
			string value = this.GetKeyValue("contact_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			if (value == "on")
			if (value == "open")
			{
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);
			}
			@@ -418,7 +418,7 @@
			break;
			case SPK.VideoDoorLock:
			{
			string s = string.Empty;
			string userName = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			@@ -429,11 +429,9 @@
			//s += ",";
			//tag += FaceItem.userId;
			//tag += "_";
			var userName = dic["value"].ToString();
			s += userName;
			s += ",";
			userName = dic["value"].ToString();
			}
			inputView.btnState.Text = s;
			inputView.btnState.Text = RemoveLastStr(userName);
			}
			break;
			case SPK.doorgate:
			@@ -475,7 +473,7 @@
			}
			break;
			case SPK.Ev_Ipcam:
			if (inputCondition.identifier == "motiondetect_event")
			if (inputCondition.identifier == Constant.intelligentDetection_event)
			{
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			@@ -491,11 +489,11 @@
			string value = this.GetKeyValue("people_status", dicList);
			if (string.IsNullOrEmpty(value))
			{
			inputView.btnState.Text = inputCondition.hold_time + "s";
			inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
			break;

			}


			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			@@ -504,8 +502,19 @@
			}
			if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
			{

			inputView.btnState.Text += "持续" + inputCondition.hold_time + "s";
			int time = int.Parse(inputCondition.hold_time);
			inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
			}
			if (!string.IsNullOrEmpty(inputCondition.detect_type))
			{
			if (inputCondition.detect_type == "1")
			{
			inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
			}
			else
			{
			inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
			}
			}


			@@ -841,7 +850,7 @@
			else if (device.spk == SPK.SensorTemperature)
			{

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

			}
			else if (device.spk == SPK.SensorHumidity)
			@@ -1045,7 +1054,8 @@
			//插座(有USB)
			case SPK.PanelSocket:
			{
			string on_off = GetKeyValue("on_off_master", dicList);
			//string on_off = GetKeyValue("on_off_master", dicList);
			string on_off = GetKeyValue("on_off", dicList);
			if (on_off == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			@@ -1056,6 +1066,7 @@
			}
			}
			break;
			case SPK.OtherCommon:
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			//插座
			@@ -1501,7 +1512,8 @@
			if (stateStr.StartsWith(";"))
			{
			stateStr = stateStr.Substring(1, stateStr.Length - 1);
			} else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
			}
			else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
			{
			stateStr = stateStr.Substring(0, stateStr.Length - 3);
			}
			@@ -1509,22 +1521,21 @@
			break;
			case SPK.ElectricalTvHisense:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string on = GetKeyValue("wol", dicList);
			string off = GetKeyValue("on_off", dicList);
			string volumet = GetKeyValue("set_volume", dicList);
			string signal = GetKeyValue("signal", dicList);
			if (!string.IsNullOrEmpty(on_off))
			{
			if (on_off == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else
			{
			stateStr = Language.StringByID(StringId.offLogic);
			//如果关了，其它属性不显示
			break;
			}

			if (!string.IsNullOrEmpty(off))
			{
			stateStr = Language.StringByID(StringId.offLogic);
			//如果关了，其它属性不显示
			break;
			}

			if (!string.IsNullOrEmpty(on))
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			if (!string.IsNullOrEmpty(stateStr))
			{
			@@ -1716,6 +1727,7 @@
			break;
			case SPK.ElectricSocket:
			//开关灯光
			case SPK.OtherCommon:
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			//机械手
			@@ -2291,7 +2303,7 @@
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "on")
			if (value == "on"\|\| value == "open")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			@@ -2459,7 +2471,7 @@
			break;
			case SPK.VideoDoorLock:
			{
			string s = string.Empty;
			string userName = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			@@ -2470,11 +2482,10 @@
			//s += ",";
			//tag += FaceItem.userId;
			//tag += "_";
			var userName = dic["value"].ToString();
			s += userName;
			s += ",";
			userName = dic["value"].ToString();

			}
			button1.Text = s;
			button1.Text = RemoveLastStr(userName);
			button1.Tag = tag;
			}
			break;
			@@ -2526,22 +2537,25 @@
			{
			case "on_off":
			{
			switch (value)
			if (value == "off")
			{
			case "on":
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			break;
			case "off":
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			break;
			button1.Text = Language.StringByID(StringId.offLogic);

			}

			}
			break;

			case "wol":
			{
			if (value == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);

			}

			}
			break;

			case "set_volume":
			{
			if (button2 == null)
			@@ -2890,29 +2904,30 @@
			string state = "";
			var minutes = timeValue / 60;
			var seconds = timeValue % 60;
			if (minutes != 0)
			{
			if (seconds == 0)
			{
			state = minutes.ToString() + Language.StringByID(StringId.minute);
			}
			else
			{
			state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
			}
			}
			else
			{
			if (seconds != 0)
			{
			state = seconds.ToString() + Language.StringByID(StringId.s);
			}
			}
			if (!string.IsNullOrEmpty(state))
			{
			state = Language.StringByID(StringId.delayLogic) + state;
			}
			return state;
			return LogicMethod.Current.getTimeStr(strTimeValue).Replace("0s","");
			//if (minutes != 0)
			//{
			// if (seconds == 0)
			// {
			// state = minutes.ToString() + Language.StringByID(StringId.minute);
			// }
			// else
			// {
			// state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
			// }
			//}
			//else
			//{
			// if (seconds != 0)
			// {
			// state = seconds.ToString() + Language.StringByID(StringId.s);
			// }
			//}
			//if (!string.IsNullOrEmpty(state))
			//{
			// state = Language.StringByID(StringId.delayLogic) + state;
			//}
			//return state;
			}
			/// <summary>
			/// 获取显示面熟文本
			@@ -3004,7 +3019,7 @@
			Input inputedit = Logic.currlogic.input[indexVulae];
			///状态值
			string stateValue = "";
			for (int i=0;i<inputedit.condition.Count;i++)
			for (int i = 0; i < inputedit.condition.Count; i++)
			{
			var dic = inputedit.condition[i];
			string comparator = dic["comparator"];
			@@ -3105,6 +3120,20 @@
			return face;
			}

			/// <summary>
			/// 删除最后一个 ","
			/// </summary>
			/// <param name="s">字符串</param>
			/// <returns></returns>
			public string RemoveLastStr(string s)
			{
			if (string.IsNullOrEmpty(s))
			{
			return string.Empty;
			}
			return s.Replace("[","").Replace("]","").Replace("\"","").TrimEnd(',');
			}

			}
			}