From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch

---
 HDL_ON/UI/MainPage.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 9ba4beb..6f43aa2 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string VersionString = "1.8.1";
+        public static string VersionString = "2.0.0";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -121,7 +121,8 @@
             SPK.AirSwitch,
             SPK.PanelSocket,SPK.ElectricSocket,
             SPK.MechanicalArm,SPK.IpCam_Imou,
-            SPK.GroupControl
+            SPK.GroupControl,
+            SPK.AvMusic,SPK.MusicStandard
         };
 
 
@@ -620,6 +621,7 @@
 #if DEBUG
             if (msg.Contains("鏀跺埌鏁版嵁")
                 || msg.Contains("鍙戦��")
+                || msg.Contains("鎺ユ敹鍒版帹閫�")
 
                 )
                 Console.WriteLine(msg);

--
Gitblit v1.8.0