Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -153,6 +153,10 @@
                sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
            }
            else if (revertObj.Code == StateCode.PasswrodError)
            {
                UserInfo.Current.LastTime = DateTime.MinValue;
            }
            return revertObj.Code;
        }

@@ -1946,15 +1950,18 @@
        /// 获取设备列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetDeviceList()
        public ResponsePackNew GetDeviceList(string pageSize="",string pageNo ="")
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            //d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);
            //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//可控参数，当需要分页获取，怎么知道分页总数
            //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            if (!string.IsNullOrEmpty(pageSize))
            {
                d.Add("pageSize", pageSize);
                d.Add("pageNo", pageNo);
            }

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