From 51cb254cbd616e84b7a466b195eb43ab097c3897 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 29 九月 2020 13:16:45 +0800
Subject: [PATCH] 20200928

---
 HDL_ON/UI/MainPage.cs |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 1d08e32..79cdbd7 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -66,11 +66,11 @@
                 Application.DesignWidth = 375;
                 Application.DesignHeight = 667;
 
-                BusSocket.Start(6000);
-                CommonPage.InitReceiveEvent();
-
                 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")));
                 //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
@@ -80,6 +80,20 @@
                 }
                 else
                 {
+                    //BusSocket.Start(6688);
+                    //CommonPage.InitReceiveEvent();
+                    //Control.ReadGatewayIPAddress();
+
+                    //if(Entity.DB_ResidenceData.residenceData.GatewayType == 1)
+                    //{
+                    //    Control.ReadGatewayIPAddress();
+                    //}
+                    //else
+                    //{
+                    //BusSocket.Start(6000);
+                    //CommonPage.InitReceiveEvent();
+                    //}
+
                     new System.Threading.Thread(() =>
                     {
                         var pm =new DAL.Server.HttpServerRequest();

--
Gitblit v1.8.0