2020-12-03-1

陈嘉乐

2020-12-03 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7

 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,15 @@
                    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;
                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "123456789AAAAAAA";
                    Entity.DB_ResidenceData.residenceData.GatewayType = 1;
#endif
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }
            }
            catch (Exception ex)