Merge branch 'Dev-Branch' into wxr-2.1

wxr

2023-08-01 f65719b8d69c92bdb66005e41a2b1f2b32953312

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "2.0.0";
        public static string VersionString = "2.1.0";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -122,7 +122,7 @@
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            SPK.AvMusic,SPK.MusicStandard
            //SPK.AvMusic,SPK.MusicStandard
        };


@@ -623,7 +623,7 @@
            if (msg.Contains("收到数据")
                || msg.Contains("发送")
                || msg.Contains("接收到推送")

                || true
                )
                Console.WriteLine(msg);
#endif