From a5ba89efa83d0a4afd0d25dbeba5989e4944b5b8 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 24 十一月 2020 18:57:56 +0800 Subject: [PATCH] 20201124;mqtt代码整理备份 --- HDL_ON/UI/MainPage.cs | 61 +++++++++++++++--------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 5f3ef66..9988c55 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -9,15 +9,31 @@ { 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(); + /// <summary> + /// + /// </summary> public static Entity.CityInfo cityInfo = new Entity.CityInfo(); /// <summary> /// 澶╂皵鍒锋柊action @@ -32,12 +48,12 @@ /// </summary> public static bool IsRemote = false; - /// <summary> - /// 鍏徃浠g爜 - /// 棰勭暀绗笁鏂瑰畾鍒舵爣璁� - /// 0:HDL - /// </summary> - public static int Company = 0; + ///// <summary> + ///// 鍏徃浠g爜 + ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁� + ///// 0:HDL + ///// </summary> + //public static int Company = 0; /// <summary> /// 鏄惁鍏ㄩ潰灞忔墜鏈� @@ -69,30 +85,14 @@ BaseView = Application.MainPage; Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor; - //BusSocket.Start(); - //CommonPage.InitReceiveEvent(); - - LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_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(LoginUser); + GoLoginPage(UserInfo.Current); } 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(); @@ -130,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; @@ -185,5 +185,6 @@ #endif } + } } -- Gitblit v1.8.0