Merge remote-tracking branch 'origin/newBranch1' into WJC

xm

2021-11-24 1802b849f0dadc81644fb0a706d6fb45efdf2a20

 HDL_ON/DAL/Mqtt/MqttInfoConfig.cs

@@ -49,7 +49,7 @@
            }
        }

        public HomeGatewayInfo HomeGatewayInfo = null;
        public HomeGatewayInfo HomeGatewayInfo = new HomeGatewayInfo();

        public MqttInfo mMqttInfo = null;

@@ -67,7 +67,8 @@
        public void Refresh()
        {
            m_Current = null;
            Save();
            Common.FileUtlis.Files.DeleteFile(ConfigFile);
            //Save();
        }

        public void Save()