Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

JLChen

2020-11-23 eb51679c618d5027070fbd6f3c0519f0f17e7d7d

 HDL_ON/DriverLayer/UdpSocket.cs

@@ -27,7 +27,7 @@
      {
            get
            {
            if ( UserInfo.Current != null && Entity.DB_ResidenceData.residenceData != null)
            if (MainPage.LoginUser != null && Entity.DB_ResidenceData.residenceData != null)
            {
               return Entity.DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585;
            }