From 437c7a6d88d11e500fc19a3dd198aec28412f06b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 17:48:23 +0800
Subject: [PATCH] 2020-11-20 1.修改UserInfo调用方法。2.增加保存用户注册域名信息。
---
HDL_ON/UI/MainPage.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 36f4c36..e28bc3e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -14,7 +14,7 @@
public static bool DisplayCompleted = false;
- public static UserInfo LoginUser;
+ //public static UserInfo LoginUser;
public static string VersionString = "1.0.0924";
@@ -69,28 +69,29 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- BusSocket.Start(6000);
- CommonPage.InitReceiveEvent();
-
- 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 (LoginUser == null || !LoginUser.IsLogin)
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
{
- GoLoginPage(LoginUser);
+ GoLoginPage(UserInfo.Current);
}
else
{
- if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
- {
- BusSocket.Start(6688);
- CommonPage.InitReceiveEvent();
- Control.ReadGatewayIPAddress();
- }
- else
- {
- BusSocket.Start(6000);
- CommonPage.InitReceiveEvent();
- }
+ //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(() =>
{
@@ -110,7 +111,7 @@
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
#if DEBUG
- new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+ //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif
}
}
@@ -129,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;
@@ -183,5 +184,7 @@
Console.WriteLine(msg);
#endif
}
+
+
}
}
--
Gitblit v1.8.0