From fba3a6c55c4de790eaeee55f9897d668bb36dbb8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 13 十月 2022 13:55:21 +0800
Subject: [PATCH] 2022年10月13日13:55:00

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 286dbbe..5953a75 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1274,12 +1274,15 @@
                                 case SPK.MusicStandard:
                                 case SPK.AvMusic:
                                     {
-                                        foreach (var dic in 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 (dic["key"] == "song_name")
-                                            {
-                                                stateStr = dic["value"]?.ToString();
-                                            }
+                                            stateStr = stateStr.Substring(1, stateStr.Length - 1);
+                                        }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
+                                        {
+                                            stateStr = stateStr.Substring(0, stateStr.Length - 3);
                                         }
                                     }
                                     break;
@@ -2065,6 +2068,10 @@
                             {
                                 button1.Text = dic["value"]?.ToString();
                             }
+                            else if (dic["key"] == "volume")
+                            {
+                                button2.Text = dic["value"]?.ToString();
+                            }
                         }
                     }
                     break;

--
Gitblit v1.8.0