Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

 HDL_ON/UI/MainPage.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL;
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
@@ -24,7 +25,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.2.0629";
        public static string VersionString = "1.2.0702";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -97,6 +98,25 @@
#endif
            }
        }

        /// <summary>
        /// 场景支持的功能列表
        /// </summary>
        public static List<string> SceneSupportFunctionList = new List<string> {
            SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
            SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
            SPK.AcIr,SPK.AcStandard,
            SPK.FloorHeatStandard,

        };
        /// <summary>
        /// 房间功能列表不加载的功能列表
        /// </summary>
        public static List<string> RoomNotSupportFunctionList = new List<string>
        {
            SPK.EnergyStandard,
        };



        public static void Show()
@@ -335,6 +355,7 @@
                    {
                        if (downloadData)
                        {
                            DB_ResidenceData.Instance.EixtAccount();
                            ///初始化app数据
                            Common.ApiUtlis.Ins.DownloadData();
                        };