From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/MainPage.cs | 92 ++++++++++++++++++++++++++++++---------------
1 files changed, 61 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 20c996f..5b1c7ba 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -9,33 +9,52 @@
{
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;
+ //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 List<string> LocationFiles;
-
- public static string VersionString = "1.0103";
-
+ /// <summary>
+ ///
+ /// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
/// 澶╂皵鍒锋柊action
/// </summary>
public static Action RefreshAir;
/// <summary>
- /// 鏈湴妯″紡
+ /// 鏃犵櫥褰曟ā寮�
/// </summary>
- public static bool LocalMode = false;
-
+ public static bool NoLoginMode = false;
/// <summary>
- /// 鍏徃浠ｇ爜
- /// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- /// 0:HDL
+ /// 杩滅▼妯″紡
/// </summary>
- public static int Company = 0;
+ public static bool IsRemote = false;
+
+ ///// <summary>
+ ///// 鍏徃浠ｇ爜
+ ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
+ ///// 0:HDL
+ ///// </summary>
+ //public static int Company = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
@@ -64,36 +83,45 @@
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")));
+ //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();
+ GoLoginPage(UserInfo.Current);
}
else
{
+ new System.Threading.Thread(() =>
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.RefreshToken();//鍒锋柊Token
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ })
+ { IsBackground = true }.Start();
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();
}
}
catch (Exception ex)
@@ -102,20 +130,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>
@@ -127,18 +158,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;
@@ -153,7 +182,6 @@
BasePageView.AddChidren(userPage);
userPage.LoadPage();
BasePageView.PageIndex = 0;
-
}
/// <summary>
@@ -165,5 +193,7 @@
Console.WriteLine(msg);
#endif
}
+
+
}
}
--
Gitblit v1.8.0