From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/UI/MainPage.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 625496a..96dbd6a 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.4.8";
+ public static string VersionString = "2.5.1";
///// <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,
@@ -149,6 +149,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());
}
@@ -211,7 +215,7 @@
}
catch (Exception ex)
{
- Log("root erorr : " + ex.Message);
+ Log("Error", "root erorr : " + ex.StackTrace);
}
finally
{
@@ -492,11 +496,11 @@
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
- if (isFirstOpen)
- {
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage(isFirstOpen);
- }
+ //if (isFirstOpen)
+ //{
+ // //鍚姩瀵嗙爜楠岃瘉
+ // new AppUnlockPage().LoadPage(isFirstOpen);
+ //}
//涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
pageShowEvent?.Invoke();
pageShowEvent = null;
@@ -649,6 +653,7 @@
{
#if DEBUG
Console.WriteLine($"{tag}-->{msg}");
+#endif
if (tag == "error")
{
new System.Threading.Thread(async () =>
@@ -657,7 +662,6 @@
})
{ IsBackground = true }.Start();
}
-#endif
}
--
Gitblit v1.8.0