From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/MainPage.cs | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 9988c55..6caaac3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -27,10 +27,11 @@
/// 鐗堟湰鍙�
/// </summary>
public static string VersionString = "1.0.0924";
- /// <summary>
- /// 瀹㈡埛绔被鍨�
- /// </summary>
- public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+ ///// <summary>
+ ///// 瀹㈡埛绔被鍨�
+ ///// </summary>
+ //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+
/// <summary>
///
/// </summary>
@@ -95,24 +96,30 @@
{
new System.Threading.Thread(() =>
{
- var pm =new DAL.Server.HttpServerRequest();
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.RefreshToken();//鍒锋柊Token
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
})
{ IsBackground = true }.Start();
new System.Threading.Thread(() =>
{
- var pm = new DAL.Server.HttpServerRequest();
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ var pm =new DAL.Server.HttpServerRequest();
+ pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
})
{ IsBackground = true }.Start();
+
GoUserPage();
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage();
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+
#if DEBUG
- //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
-#endif
+ Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
+ Entity.DB_ResidenceData.residenceData.GatewayType = 0;
+#endif
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
}
catch (Exception ex)
--
Gitblit v1.8.0