wxr
2024-09-11 9bc0ea236cad9e5c86d0d6fe03eabb327b693096
HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "2.4.8";
        public static string VersionString = "2.6.0";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -116,7 +116,7 @@
            SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
            SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,SPK.CurtainDream,
            SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,SPK.HvacFloorHeatPanel,
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
@@ -124,7 +124,6 @@
            SPK.GroupControl,
            SPK.AvMusic,
            SPK.MusicStandard,
            SPK.ElectricalTvHisense,
            SPK.OtherCommon,
            
        };
@@ -149,6 +148,10 @@
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                    _RoomNotSupportFunctionList.Add(SPK.AcstParent);
                    _RoomNotSupportFunctionList.Add(SPK.AcstSub);
                    _RoomNotSupportFunctionList.Add(SPK.WaterHeaterJinmao);
                    _RoomNotSupportFunctionList.Add(SPK.InverterJinmao);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
                }
@@ -492,11 +495,11 @@
                        UserBasePage.LoadPage();
                        BasePageView.PageIndex = 0;
                        if (isFirstOpen)
                        {
                            //启动密码验证
                            new AppUnlockPage().LoadPage(isFirstOpen);
                        }
                        //if (isFirstOpen)
                        //{
                        //    //启动密码验证
                        //    new AppUnlockPage().LoadPage(isFirstOpen);
                        //}
                        //主页加载完成,回调事件
                        pageShowEvent?.Invoke();
                        pageShowEvent = null;
@@ -649,6 +652,7 @@
        {
#if DEBUG
            Console.WriteLine($"{tag}-->{msg}");
#endif
            if (tag == "error")
            {
                new System.Threading.Thread(async () =>
@@ -657,7 +661,6 @@
                })
                { IsBackground = true }.Start();
            }
#endif
        }