Merge branch 'CJL'

wxr

2020-11-20 387383a243879bf8c63a4611e2ed2c5a519e218d

 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(() =>