Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-09-14 9eec81850e418a3c16410b4870910bde142b06e3

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
    /// <summary>
    /// 版本号
    /// </summary>
    public static string VersionString = "1.5.9";
        public static string VersionString = "1.6.0";
    ///// <summary>
    ///// 客户端类型
    ///// </summary>
@@ -111,7 +111,6 @@
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.HvacCac
        };


@@ -131,9 +130,9 @@
          _RoomNotSupportFunctionList.Add(SPK.AvMusic);
          _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
          _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
          _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.PanelSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
        }
        return _RoomNotSupportFunctionList;
      }
@@ -145,6 +144,9 @@
      {
        Application.DesignWidth = 375;
        Application.DesignHeight = 667;
                //设置语言环境 防止string转 double出现逗号，todouble异常等问题
                System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");


        BaseView = Application.MainPage;
        Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -464,6 +466,17 @@
    }


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


  }

}