~wxr/OnPro.git - Gitblit

			@@ -436,7 +436,10 @@
			break;
			case SPK.doorgate:
			{

			string s = string.Empty;
			try
			{
			if (inputCondition.identifier == "door_call_cloud_event")
			{
			s = Language.StringByID(StringId.shipintonghuahujiao);
			@@ -451,15 +454,25 @@
			{
			continue;
			}
			var userId = dic["value"].ToString();
			var FaceItem = this.GetFaceItem(userId, device.deviceId);
			var value = dic["value"].ToString();
			if (!string.IsNullOrEmpty(value))
			{
			var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
			for (int a = 0; a < list.Count; a++)
			{

			var FaceItem = this.GetFaceItem(list[a], device.deviceId);
			s += FaceItem.userName;
			s += ",";

			}
			}

			}

			}
			}
			catch { }
			inputView.btnState.Text = s;
			}
			break;
			@@ -1506,17 +1519,32 @@
			case SPK.MusicStandard:
			case SPK.AvMusic:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string song_name = GetKeyValue("song_name", dicList);
			string volume = GetKeyValue("volume", dicList);
			stateStr = song_name + ";" + Language.StringByID(StringId.volumeMusic) + volume;
			if (stateStr.StartsWith(";"))

			if (!string.IsNullOrEmpty(on_off))
			{
			stateStr = stateStr.Substring(1, stateStr.Length - 1);
			}
			else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
			if (on_off == "on")
			{
			stateStr = stateStr.Substring(0, stateStr.Length - 3);
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}

			if (!string.IsNullOrEmpty(song_name))
			{
			stateStr += "," + song_name;
			}

			if (!string.IsNullOrEmpty(volume))
			{
			stateStr += "," + volume;
			}

			}
			break;
			case SPK.ElectricalTvHisense:
			@@ -2494,20 +2522,33 @@
			{
			foreach (var dic in dicList)
			{
			if (dic["key"] == "song_name")
			if (dic["key"] == "on_off")
			{
			button1.Text = dic["value"]?.ToString();
			if (dic["value"] == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			}
			else if (dic["key"] == "song_name")
			{
			button2.Text = dic["value"]?.ToString();
			}
			else if (dic["key"] == "volume")
			{
			button2.Text = dic["value"]?.ToString();
			button3.Text = dic["value"]?.ToString();
			}
			}
			}
			break;
			case SPK.doorgate:
			{
			string s = string.Empty;
			try
			{
			string userNameStr = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			@@ -2517,16 +2558,26 @@
			{
			continue;
			}
			var userId = dic["value"].ToString();
			var FaceItem = this.GetFaceItem(userId, device.deviceId);
			s += FaceItem.userName;
			s += ",";
			var value = dic["value"].ToString();
			if (!string.IsNullOrEmpty(value))
			{
			var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
			for (int i = 0; i < list.Count; i++)
			{

			var FaceItem = this.GetFaceItem(list[i], device.deviceId);
			userNameStr += FaceItem.userName;
			userNameStr += ",";
			tag += FaceItem.userId;
			tag += "_";
			}
			button2.Text = s;
			}
			}
			button2.Text = RemoveLastStr(userNameStr);
			button2.Tag = tag;
			}
			catch { }
			}
			break;
			case SPK.ElectricalTvHisense:
			{