Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

 HDL_ON/UI/MainPage.cs

@@ -116,8 +116,10 @@
                    //搜索网关

#if DEBUG
                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
                    Entity.DB_ResidenceData.residenceData.GatewayType = 0;
                    //Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
                    //Entity.DB_ResidenceData.residenceData.GatewayType = 0;
                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "123456789AAAAAAA";
                    Entity.DB_ResidenceData.residenceData.GatewayType = 1;
#endif
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }