2020-11-20 1.更新

JLChen

2020-11-20 ec074f7a42c10995732739c842e60ed84aedce20

 HDL_ON/UI/MainPage.cs

@@ -14,7 +14,7 @@

        public static bool DisplayCompleted = false;

        public static UserInfo LoginUser;
        //public static UserInfo LoginUser;

        public static string VersionString = "1.0.0924";

@@ -66,20 +66,33 @@
                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("UserInfo_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)
                if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
                {
                    GoLoginPage(LoginUser);
                    GoLoginPage(UserInfo.Current);
                }
                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();
@@ -98,7 +111,7 @@
                    //读取音乐信息
                    UI.Music.A31MusicModel.ReadMusicStates();
#if DEBUG
                    new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
                    //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif           
                }
            }
@@ -117,7 +130,7 @@
        /// <summary>
        /// 进入登录界面
        /// </summary>
        public static void GoLoginPage(UserInfo userInfo =null)
        public static void GoLoginPage(UserInfo userInfo = null)
        {
            BaseView.RemoveAll();
            BaseView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -171,5 +184,7 @@
            Console.WriteLine(msg);
#endif
        }


    }
}