Merge branch 'CJL'

wxr

2020-11-20 387383a243879bf8c63a4611e2ed2c5a519e218d

 HDL_ON/UI/MainPage.cs

@@ -16,7 +16,7 @@

        public static UserInfo LoginUser;

        public static string VersionString = "1.0103";
        public static string VersionString = "1.0.0924";

        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
        /// <summary>
@@ -66,11 +66,11 @@
                Application.DesignWidth = 375;
                Application.DesignHeight = 667;

                BusSocket.Start(6000);
                CommonPage.InitReceiveEvent();

                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")));
                //判断需不需要登录，有没有登录，或者登录是否过期，
@@ -80,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();
@@ -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           
                }
            }
@@ -171,5 +184,17 @@
            Console.WriteLine(msg);
#endif
        }

        /// <summary>
        /// 弹窗提示
        /// </summary>
        /// <param name="mes"></param>
        public static void ShowAlertOnMainThread(string mes)
        {
            Application.RunOnMainThread(() => {
                new Alert("", mes, Language.StringByID(StringId.Close)).Show();
            });
        }

    }
}