From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/MainPage.cs | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 1a295d4..0a502ab 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
+using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
@@ -18,9 +19,13 @@
/// </summary>
public static PageLayout BasePageView { get; set; }
/// <summary>
+ /// 鐢ㄦ埛鎺у埗鐖跺鍣�
+ /// </summary>
+ public static UserPage UserBasePage;
+ /// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0617";
+ public static string VersionString = "1.2.0708";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -93,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()
@@ -272,7 +296,7 @@
if (NoLoginMode)
{
//璺宠浆椤甸潰----
- var UserBasePage = new UserPage();
+ UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
@@ -294,20 +318,20 @@
addResidencePage.LoadView();
return;
}
- new System.Threading.Thread(() =>
+ new System.Threading.Thread(async () =>
{
try
{
Entity.FunctionList.List.Clear();
Entity.SpatialInfo.CurrentSpatial.Clear();
///绛夊緟鑾峰彇浣忓畢淇℃伅
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread( () =>
{
waitPage.Hide();
waitPage.RemoveFromParent();
//璺宠浆椤甸潰----
- var UserBasePage = new UserPage();
+ UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
@@ -331,6 +355,7 @@
{
if (downloadData)
{
+ DB_ResidenceData.Instance.EixtAccount();
///鍒濆鍖朼pp鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
};
--
Gitblit v1.8.0