Merge branch 'CJL'

wxr

2020-11-20 387383a243879bf8c63a4611e2ed2c5a519e218d

 HDL_ON/UI/MainPage.cs

@@ -69,8 +69,8 @@
                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;

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

                LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
                //判断需不需要登录，有没有登录，或者登录是否过期，
@@ -80,17 +80,18 @@
                }
                else
                {
                    if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
                    {
                        BusSocket.Start(6688);
                        CommonPage.InitReceiveEvent();
                        Control.ReadGatewayIPAddress();
                    }
                    else
                    {
                        BusSocket.Start(6000);
                        CommonPage.InitReceiveEvent();
                    }
                //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(() =>
                    {
@@ -110,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           
                }
            }
@@ -183,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();
            });
        }

    }
}