Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

 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();
                }