From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/MainPage.cs | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 3f421d9..1454ea6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
+using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
@@ -15,13 +16,21 @@
public static UserInfo LoginUser;
- public static List<string> LocationFiles;
-
- public static string VersionString = "1.0103";
+ public static string VersionString = "1.0.0924";
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
-
+ /// <summary>
+ /// 澶╂皵鍒锋柊action
+ /// </summary>
public static Action RefreshAir;
+ /// <summary>
+ /// 鏃犵櫥褰曟ā寮�
+ /// </summary>
+ public static bool NoLoginMode = false;
+ /// <summary>
+ /// 杩滅▼妯″紡
+ /// </summary>
+ public static bool IsRemote = false;
/// <summary>
/// 鍏徃浠ｇ爜
@@ -57,20 +66,33 @@
Application.DesignWidth = 375;
Application.DesignHeight = 667;
- BusSocket.Start(6000);
- CommonPage.InitReceiveEvent();
-
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("Register_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)
{
- GoLoginPage();
+ GoLoginPage(LoginUser);
}
else
{
+ //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();
@@ -84,25 +106,38 @@
})
{ IsBackground = true }.Start();
GoUserPage();
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage();
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+#if DEBUG
+ //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+#endif
}
}
catch (Exception ex)
{
Log("root erorr : " + ex.Message);
}
+ 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>
@@ -114,10 +149,15 @@
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
BasePageView.IsShowPoint = false;
- BasePageView.PageChange += (sender, e) => {
+ BasePageView.PageChange = (sender, e) => {
if (e < BasePageView.ChildrenCount - 1)
{
- BasePageView.RemoveAt(BasePageView.ChildrenCount - 1);
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+ }
+
+ while (e < BasePageView.ChildrenCount - 1)
+ {
+ BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
}
};
BasePageView.MouseDownEventHandler += (sender, e) => {
@@ -129,16 +169,10 @@
BaseView.AddChidren(BasePageView);
//璺宠浆椤甸潰----
- var userPage = new UI.UserPage();
+ var userPage = new UserPage();
BasePageView.AddChidren(userPage);
userPage.LoadPage();
- BasePageView.PageChange += (sender, e) =>
- {
- while (e < BasePageView.ChildrenCount - 1)
- {
- BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- };
+ BasePageView.PageIndex = 0;
}
/// <summary>
--
Gitblit v1.8.0