From 4e6dfedede622d018b0aec0fb85c130d47cf45ba Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 25 十一月 2020 16:14:39 +0800
Subject: [PATCH] 2020-11-25 1.增加服务器信息、关于ON、功能介绍、投诉、检测更新。
---
HDL_ON/UI/MainPage.cs | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 79cdbd7..3515498 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -9,15 +9,32 @@
{
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 +49,12 @@
/// </summary>
public static bool IsRemote = false;
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- /// 0:HDL
- /// </summary>
- public static int Company = 0;
+ ///// <summary>
+ ///// 鍏徃浠ｇ爜
+ ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
+ ///// 0:HDL
+ ///// </summary>
+ //public static int Company = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
@@ -69,29 +86,28 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- BusSocket.Start(6000);
- CommonPage.InitReceiveEvent();
-
- LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_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)
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
{
- GoLoginPage(LoginUser);
+ GoLoginPage(UserInfo.Current);
}
else
{
- //BusSocket.Start(6688);
- //CommonPage.InitReceiveEvent();
- //Control.ReadGatewayIPAddress();
-
- //if(Entity.DB_ResidenceData.residenceData.GatewayType == 1)
+ //UdpSocket._BusSocket.Start();
+ //if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
//{
+ // BusSocket.Start();
+ // CommonPage.InitReceiveEvent();
// Control.ReadGatewayIPAddress();
//}
//else
//{
- //BusSocket.Start(6000);
- //CommonPage.InitReceiveEvent();
+ // BusSocket.Start();
+ // CommonPage.InitReceiveEvent();
//}
new System.Threading.Thread(() =>
@@ -112,7 +128,7 @@
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
#if DEBUG
- new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+ //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif
}
}
@@ -131,7 +147,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 +201,7 @@
Console.WriteLine(msg);
#endif
}
+
+
}
}
--
Gitblit v1.8.0