From f49856cb0e1e9d95fe11bb64054a407f69943d16 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:34:35 +0800
Subject: [PATCH] 2020-11-30-1
---
HDL_ON/UI/MainPage.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4e3acab..1454ea6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -16,9 +16,7 @@
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>
@@ -26,9 +24,13 @@
/// </summary>
public static Action RefreshAir;
/// <summary>
- /// 鏈湴妯″紡
+ /// 鏃犵櫥褰曟ā寮�
/// </summary>
- public static bool LocalMode = false;
+ public static bool NoLoginMode = false;
+ /// <summary>
+ /// 杩滅▼妯″紡
+ /// </summary>
+ public static bool IsRemote = false;
/// <summary>
/// 鍏徃浠ｇ爜
@@ -64,13 +66,13 @@
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)
{
@@ -78,6 +80,19 @@
}
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();
@@ -95,9 +110,9 @@
new AppUnlockPage().LoadPage();
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
-
- new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
-
+#if DEBUG
+ //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+#endif
}
}
catch (Exception ex)
@@ -106,6 +121,9 @@
}
finally
{
+ //Application.RunOnMainThread(() => {
+ // Application.HideSoftInput();
+ //});
}
}
--
Gitblit v1.8.0