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 | 38 ++++++++++---------------------------- 1 files changed, 10 insertions(+), 28 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 5f97e53..9988c55 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -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> @@ -86,9 +85,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,32 +93,18 @@ } 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(); - 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(); -- Gitblit v1.8.0