From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成,搜索网关、一端口修改完成"

---
 HDL_ON/UI/MainPage.cs |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index bb50cbc..9988c55 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
 using System.Collections.Generic;
 using HDL_ON.DAL;
 using HDL_ON.UI;
@@ -27,11 +27,10 @@
         /// 鐗堟湰鍙�
         /// </summary>
         public static string VersionString = "1.0.0924";
-        ///// <summary>
-        ///// 瀹㈡埛绔被鍨�
-        ///// </summary>
-        //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
-
+        /// <summary>
+        /// 瀹㈡埛绔被鍨�
+        /// </summary>
+        public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
         /// <summary>
         /// 
         /// </summary>
@@ -94,33 +93,26 @@
                 }
                 else
                 {
-
-                    new System.Threading.Thread(() =>
-                    {
-                        var pm = new DAL.Server.HttpServerRequest();
-                        pm.RefreshToken();//鍒锋柊Token
-                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                    })
-                    { IsBackground = true }.Start();
                     new System.Threading.Thread(() =>
                     {
                         var pm =new DAL.Server.HttpServerRequest();
                         pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
                     })
                     { IsBackground = true }.Start();
-                    
+                    new System.Threading.Thread(() =>
+                    {
+                        var pm = new DAL.Server.HttpServerRequest();
+                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+                    })
+                    { IsBackground = true }.Start();
                     GoUserPage();
                     //鍚姩瀵嗙爜楠岃瘉
                     new AppUnlockPage().LoadPage();
                     //璇诲彇闊充箰淇℃伅
                     UI.Music.A31MusicModel.ReadMusicStates();
-                    //鎼滅储缃戝叧
-
 #if DEBUG
-                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
-                    Entity.DB_ResidenceData.residenceData.GatewayType = 0;
-#endif
-                    DriverLayer.Control.Ins.SearchLoaclGateway();
+                    //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
+#endif           
                 }
             }
             catch (Exception ex)

--
Gitblit v1.8.0