From 488cf7d591dc7400ed5c7f116af7005396c666e2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 03 一月 2024 17:12:17 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch-2024
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 139 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c5fbf03..d1fc564 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -436,30 +436,43 @@
break;
case SPK.doorgate:
{
- string s = string.Empty;
- if (inputCondition.identifier == "door_call_cloud_event")
- {
- s = Language.StringByID(StringId.shipintonghuahujiao);
- }
- else
- {
- for (int b = 0; b < dicList.Count; b++)
- {
- var dic = dicList[b];
- var key = dic["key"].ToString();
- if (key != "user_id")
- {
- continue;
- }
- var userId = dic["value"].ToString();
- var FaceItem = this.GetFaceItem(userId, device.deviceId);
- s += FaceItem.userName;
- s += ",";
+ string s = string.Empty;
+ try
+ {
+ if (inputCondition.identifier == "door_call_cloud_event")
+ {
+ s = Language.StringByID(StringId.shipintonghuahujiao);
+ }
+ else
+ {
+ for (int b = 0; b < dicList.Count; b++)
+ {
+ var dic = dicList[b];
+ var key = dic["key"].ToString();
+ if (key != "user_id")
+ {
+ continue;
+ }
+ 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);
+ if (on_off == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
}
- else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
+
+ if (!string.IsNullOrEmpty(song_name))
{
- stateStr = stateStr.Substring(0, stateStr.Length - 3);
+ stateStr += "," + song_name;
}
+
+ if (!string.IsNullOrEmpty(volume))
+ {
+ stateStr += "," + volume;
+ }
+
}
break;
case SPK.ElectricalTvHisense:
@@ -2303,7 +2331,7 @@
foreach (var dic in dicList)
{
string value = dic["value"];
- if (value == "on"|| value == "open")
+ if (value == "on" || value == "open")
{
button1.Text = Language.StringByID(StringId.onLogic);
}
@@ -2494,38 +2522,61 @@
{
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;
- string tag = string.Empty;
- for (int b = 0; b < dicList.Count; b++)
+ try
{
- var dic = dicList[b];
- var key = dic["key"].ToString();
- if (key != "user_id")
+ string userNameStr = string.Empty;
+ string tag = string.Empty;
+ for (int b = 0; b < dicList.Count; b++)
{
- continue;
+ var dic = dicList[b];
+ var key = dic["key"].ToString();
+ if (key != "user_id")
+ {
+ continue;
+ }
+ 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 += "_";
+ }
+ }
}
- var userId = dic["value"].ToString();
- var FaceItem = this.GetFaceItem(userId, device.deviceId);
- s += FaceItem.userName;
- s += ",";
- tag += FaceItem.userId;
- tag += "_";
+ button2.Text = RemoveLastStr(userNameStr);
+ button2.Tag = tag;
}
- button2.Text = s;
- button2.Tag = tag;
+ catch { }
}
break;
case SPK.ElectricalTvHisense:
--
Gitblit v1.8.0