From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/MainPage.cs | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5f97e53..6caaac3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -86,9 +86,6 @@
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")));
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
@@ -97,18 +94,6 @@
}
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();
@@ -128,9 +113,13 @@
new AppUnlockPage().LoadPage();
//璇诲彇闊充箰淇℃伅
UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+
#if DEBUG
- //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
-#endif
+ Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
+ Entity.DB_ResidenceData.residenceData.GatewayType = 0;
+#endif
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
}
catch (Exception ex)
--
Gitblit v1.8.0