From d616b67bd6ea95562af73a00bf0aab38eec935df Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 13:37:26 +0800
Subject: [PATCH] 2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
---
HDL_ON/UI/MainPage.cs | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4d6eb1a..1774eb6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -111,18 +111,12 @@
GoUserPage();
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage();
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
-#if DEBUG
- //Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
- //Entity.DB_ResidenceData.residenceData.GatewayType = 0;
- Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "123456789AAAAAAA";
- Entity.DB_ResidenceData.residenceData.GatewayType = 1;
-#endif
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ ///鍒濆鍖朼pp鏁版嵁
+ InitializationData();
}
+
+
}
catch (Exception ex)
{
@@ -184,25 +178,45 @@
BasePageView.PageIndex = 0;
}
- public static void GetRoomList()
+ /// <summary>
+ /// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
+ /// </summary>
+ public static void InitializationData()
{
- var pm = new DAL.Server.HttpServerRequest();
- var packNew = pm.GetRoomList();//鍒锋柊鎴块棿鍒楄〃
- var floorPack = pm.GetRoomList("FLOOR");
- var rooms = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString());
- var floors = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString());
- MainPage.Log(packNew.Data.ToString());
- MainPage.Log(floorPack.Data.ToString());
- }
+ new System.Threading.Thread(() =>
+ {
+ while (true)
+ {
+ if (Entity.DB_ResidenceData.residenceData == null ||
+ Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ {
+ System.Threading.Thread.Sleep(100);
+ }
+ else
+ {
+ break;
+ }
+ }
+ #region 璇诲彇浜戠鏁版嵁--
+ //todo鏁版嵁瑕嗙洊澶勭悊
+ //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
+ Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
+ //璇诲彇浜戠璁惧鏁版嵁
+ Entity.FunctionList.List.DownloadFunctionList();
+ //璇诲彇浜戠鍦烘櫙鏁版嵁
+ Entity.FunctionList.List.DownloadSceneList();
+ #endregion
- public static void GetDeviceList()
- {
- var pm = new DAL.Server.HttpServerRequest();
- var packNew = pm.GetDeviceList();
- var functions = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.DevcieApiPack>(packNew.Data.ToString());
- MainPage.Log(packNew.Data.ToString());
- }
+ })
+ { IsBackground = true }.Start();
+ #region 璇诲彇鏈湴鏁版嵁
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ #endregion
+ }
/// <summary>
/// 鑷畾涔夋棩蹇楄緭鍑�
--
Gitblit v1.8.0