From d7e25d6a5960b3495cd4d8a67545410e03ca7962 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期日, 06 六月 2021 16:42:08 +0800 Subject: [PATCH] Merge branch 'wxr4' into temp-wxr --- HDL_ON/DAL/Server/HttpServerRequest.cs | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 65389f4..bac8ac7 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -1290,6 +1290,9 @@ MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString(); MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString(); MainPage.cityInfo.weather = jt.GetValue("Weather").ToString(); + MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString(); + MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString(); + break; } catch (Exception ex) @@ -1817,7 +1820,10 @@ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("productPlatform", productPlatform); d.Add("productBrand", productBrand); - d.Add("networkConfig", true); + if (productBrand != "MegaHealth") + { + d.Add("networkConfig", true); + } var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson); @@ -1836,10 +1842,28 @@ d.Add("productBrand", productBrand); d.Add("networkConfig", true); - var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson); } + /// <summary> + /// 娉ㄥ唽绗笁鏂硅澶� + /// </summary> + /// <param name="productPlatform"></param> + /// <param name="productBrand"></param> + /// <returns></returns> + public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("spk", spk); + d.Add("extDevId", extDevId); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson); + } + + + /// <summary> /// 鑾峰彇璁惧璇︽儏 -- Gitblit v1.8.0