Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.5.9";
        public static string VersionString = "1.6.1";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -36,6 +36,11 @@
        /// 
        /// </summary>
        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
        /// <summary>
        /// 城市天气信息antion
        /// </summary>
        public static Action CityWeatherAction = null;

        /// <summary>
        /// 天气刷新action
        /// </summary>
@@ -130,6 +135,7 @@
                    _RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
                }
@@ -465,6 +471,17 @@
        }


        /// <summary>
        /// 自定义日志输出
        /// </summary>
        public static void Log(string tag,string msg)
        {
#if DEBUG
            Console.WriteLine($"{tag}-->{msg}");
#endif
        }


    }

}