Merge branch 'CJL'

wxr

2020-11-20 f4b178e64fd43262872fe9d443aa9da6048ceaac

 HDL_ON/UI/MainPage.cs

@@ -80,7 +80,7 @@
                }
                else
                {
                //UdpSocket._BusSocket.Start();
                    //UdpSocket._BusSocket.Start();
                    //if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
                    //{
                    //    BusSocket.Start();
@@ -89,8 +89,8 @@
                    //}
                    //else
                    //{
                    //    BusSocket.Start();
                    //    CommonPage.InitReceiveEvent();
                    //BusSocket.Start();
                    //CommonPage.InitReceiveEvent();
                    //}

                    new System.Threading.Thread(() =>
@@ -185,5 +185,16 @@
#endif
        }

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

    }
}