From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/UI/MainPage.cs | 87 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5b1c7ba..1454ea6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -9,32 +9,15 @@
{
public static class MainPage
{
- /// <summary>
- /// BaseView
- /// </summary>
public static FrameLayout BaseView { get; internal set; }
- /// <summary>
- /// BasePageView
- /// </summary>
public static PageLayout BasePageView { get; set; }
- /// <summary>
- /// DisplayCompleted
- /// </summary>
+
public static bool DisplayCompleted = false;
- //public static UserInfo LoginUser;
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public static string VersionString = "1.0.0924";
- ///// <summary>
- ///// 瀹㈡埛绔被鍨�
- ///// </summary>
- //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+ public static UserInfo LoginUser;
- /// <summary>
- ///
- /// </summary>
+ public static string VersionString = "1.0.0924";
+
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
/// 澶╂皵鍒锋柊action
@@ -49,12 +32,12 @@
/// </summary>
public static bool IsRemote = false;
- ///// <summary>
- ///// 鍏徃浠ｇ爜
- ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- ///// 0:HDL
- ///// </summary>
- //public static int Company = 0;
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
+ /// 0:HDL
+ /// </summary>
+ public static int Company = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
@@ -86,42 +69,50 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
+ //BusSocket.Start();
+ //CommonPage.InitReceiveEvent();
+
+ LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
- if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
+ if (LoginUser == null || !LoginUser.IsLogin)
{
- GoLoginPage(UserInfo.Current);
+ GoLoginPage(LoginUser);
}
else
{
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- })
- { IsBackground = true }.Start();
+ //UdpSocket._BusSocket.Start();
+ //if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
+ //{
+ // BusSocket.Start();
+ // CommonPage.InitReceiveEvent();
+ // Control.ReadGatewayIPAddress();
+ //}
+ //else
+ //{
+ // BusSocket.Start();
+ // CommonPage.InitReceiveEvent();
+ //}
+
new System.Threading.Thread(() =>
{
var pm =new DAL.Server.HttpServerRequest();
pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
})
{ IsBackground = true }.Start();
-
+ new System.Threading.Thread(() =>
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ })
+ { IsBackground = true }.Start();
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();
+ //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+#endif
}
}
catch (Exception ex)
@@ -139,7 +130,7 @@
/// <summary>
/// 杩涘叆鐧诲綍鐣岄潰
/// </summary>
- public static void GoLoginPage(UserInfo userInfo = null)
+ public static void GoLoginPage(UserInfo userInfo =null)
{
BaseView.RemoveAll();
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -193,7 +184,5 @@
Console.WriteLine(msg);
#endif
}
-
-
}
}
--
Gitblit v1.8.0