From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/MainPage.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index b787efe..9a9feef 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -16,8 +16,6 @@
public static UserInfo LoginUser;
- public static List<string> LocationFiles;
-
public static string VersionString = "1.0103";
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
@@ -26,9 +24,13 @@
/// </summary>
public static Action RefreshAir;
/// <summary>
- /// 鏈湴妯″紡
+ /// 鏃犵櫥褰曟ā寮�
/// </summary>
- public static bool LocalMode = false;
+ public static bool NoLoginMode = false;
+ /// <summary>
+ /// 杩滅▼妯″紡
+ /// </summary>
+ public static bool IsRemote = false;
/// <summary>
/// 鍏徃浠ｇ爜
@@ -70,11 +72,11 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("Register_File")));
+ LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
if (LoginUser == null || !LoginUser.IsLogin)
{
- GoLoginPage();
+ GoLoginPage(LoginUser);
}
else
{
@@ -95,9 +97,9 @@
new AppUnlockPage().LoadPage();
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
-
+#if DEBUG
new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
-
+#endif
}
}
catch (Exception ex)
@@ -106,20 +108,23 @@
}
finally
{
+ //Application.RunOnMainThread(() => {
+ // Application.HideSoftInput();
+ //});
}
}
/// <summary>
/// 杩涘叆鐧诲綍鐣岄潰
/// </summary>
- public static void GoLoginPage(string account ="")
+ public static void GoLoginPage(UserInfo userInfo =null)
{
BaseView.RemoveAll();
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
BaseView.AddChidren(fisrtView);
- fisrtView.LoadView(account);
+ fisrtView.LoadView(userInfo);
}
/// <summary>
@@ -131,18 +136,16 @@
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
BasePageView.IsShowPoint = false;
- BasePageView.PageChange += (sender, e) => {
+ BasePageView.PageChange = (sender, e) => {
if (e < BasePageView.ChildrenCount - 1)
{
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- //BasePageView.RemoveAt(BasePageView.ChildrenCount - 1);
}
while (e < BasePageView.ChildrenCount - 1)
{
BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
}
- //MainPage.Log($"MainPage.BasePageView.PageIndex : { MainPage.BasePageView.PageIndex} \r MainPage.BasePageView.ChildrenCount : {MainPage.BasePageView.ChildrenCount}");
};
BasePageView.MouseDownEventHandler += (sender, e) => {
BasePageView.ScrollEnabled = true;
@@ -157,7 +160,6 @@
BasePageView.AddChidren(userPage);
userPage.LoadPage();
BasePageView.PageIndex = 0;
-
}
/// <summary>
--
Gitblit v1.8.0