From 9aa32bd5ed75d54b2141b6c91f163d43216a3643 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 06 十二月 2019 13:14:02 +0800
Subject: [PATCH] 20191206
---
HDL_ON/UI/MainPage.cs | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 12089b0..46005fc 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -15,6 +15,8 @@
public static List<string> LocationFiles;
+ public static string VersionString = "3.01205";
+
/// <summary>
/// 鍏徃浠ｇ爜
/// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
@@ -37,31 +39,25 @@
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
-#if DEBUG
- MainPage.LoginUser = new UserInfo
+ Log("1");
+ LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(MyIO.FileUtils.ReadFile("Register_File")));
+ Log("2");
+ //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
+ if (LoginUser == null || !LoginUser.IsLogin)
{
- ID = 0,
- AccountType = 0,
- AccountString = "zxn@hdlchina.com.cn",
- Password = "",
- UserName = "灏忎竷灏忎竷",
- LastTime = DateTime.Now,
- };
+ var fisrtView = new UI.UI1Login.LoginPage();
+ fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ BaseView.AddChidren(fisrtView);
+ fisrtView.LoadView();
- var ss = new UI.UserPage();
- MainPage.BaseView.AddChidren(ss);
- ss.ChoosePersonalCenter();
-
- //var personalCenterPage = new UI2.PersonalCenterPage();
- //MainPage.BaseView.AddChidren(personalCenterPage);
- //personalCenterPage.LoadView();
-#else
- var fisrtView = new UI1Login.LoginPage();
- fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
- BaseView.AddChidren(fisrtView);
- fisrtView.LoadView();
-#endif
-
+ }
+ else
+ {
+ //璺宠浆椤甸潰----
+ var ss = new UI.UserPage();
+ BaseView.AddChidren(ss);
+ ss.LoadPage();
+ }
}
catch
{
--
Gitblit v1.8.0