wxr
2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f
HDL_ON/UI/MainPage.cs
@@ -16,9 +16,7 @@
        public static UserInfo LoginUser;
        public static List<string> LocationFiles;
        public static string VersionString = "1.0103";
        public static string VersionString = "1.0.0924";
        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
        /// <summary>
@@ -26,9 +24,13 @@
        /// </summary>
        public static Action RefreshAir;
        /// <summary>
        /// 本地模式
        /// 无登录模式
        /// </summary>
        public static bool LocalMode = false;
        public static bool NoLoginMode = false;
        /// <summary>
        /// 远程模式
        /// </summary>
        public static bool IsRemote = false;
        /// <summary>
        /// 公司代码
@@ -64,13 +66,13 @@
                Application.DesignWidth = 375;
                Application.DesignHeight = 667;
                BusSocket.Start(6000);
                CommonPage.InitReceiveEvent();
                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
                LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("Register_File")));
                //BusSocket.Start();
                //CommonPage.InitReceiveEvent();
                LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
                //判断需不需要登录,有没有登录,或者登录是否过期,
                if (LoginUser == null || !LoginUser.IsLogin)
                {
@@ -78,6 +80,19 @@
                }
                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();
@@ -95,9 +110,9 @@
                    new AppUnlockPage().LoadPage();
                    //读取音乐信息
                    UI.Music.A31MusicModel.ReadMusicStates();
                    new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#if DEBUG
                    //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif
                }
            }
            catch (Exception ex)
@@ -106,6 +121,9 @@
            }
            finally
            {
                //Application.RunOnMainThread(() => {
                //    Application.HideSoftInput();
                //});
            }
        }