Merge branch 'wxr-2.0' into Dev-Branch

wxr

2023-09-06 fdbcb1f7463cb766f90bd29dd715485ba9d88524

 HDL_ON/UI/MainPage.cs

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


@@ -629,8 +631,10 @@
        {
#if DEBUG
            if (msg.Contains("收到数据")
                || msg.Contains("api功能控制")
                //|| msg.Contains("接收到推送")
                || msg.Contains("发送")
                || msg.Contains("接收到推送")
                   || msg.Contains("api")
                || msg.Contains("读取功能状态")
                //|| true
                )
                Console.WriteLine(msg);