Merge branch 'NewFilePath'

wxr

2020-12-16 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -598,7 +598,7 @@
                            if (mHomeGatewayRes.Count > 0)
                            {
                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
                                if(mHomeGatewayRes[0].gatewayStatus)
                                {
                                    //DriverLayer.Control.Ins.IsRemote = true;
                                    DriverLayer.Control.Ins.GatewayOnline = true;
@@ -2030,6 +2030,7 @@
            if (GetType != "All")
            {
                d.Add("roomType", GetType);
                d.Add("pageSize", "10000");
            }
            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);