Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -164,7 +164,7 @@
        }

        #region 注册、登录部分
       


        /// <summary>
        /// 通用 发送验证码方法
@@ -622,7 +622,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;
@@ -1826,6 +1826,7 @@
            d.Add("deviceIds", functionIds);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            MainPage.Log($"读取设备状态：{requestJson}");
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_RefreshDeviceStatus, requestJson);
        }

@@ -1969,7 +1970,11 @@
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);

            MainPage.Log($"{pack.Data}");

            return pack;
        }
        /// <summary>
        /// 编辑场景