From 8cd7b0fd1c53fc35a9817de31ab5d90f7dc7814b Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 16:59:43 +0800
Subject: [PATCH] 上传一个版本
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 7dd8e14..5499083 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -480,6 +480,7 @@
IsOthreShare = mHome.IsOtherShare,
accountType = mHome.accountType,
isRemoteControl = mHome.isRemoteControl,
+ isBindGateway = mHome.isBindGateway,
longitude = mHome.longitude,
latitude = mHome.latitude,
deliverstatus = mHome.deliverstatus,
@@ -491,7 +492,14 @@
Address = mHome.homeAddress,
isAllowCreateScene = mHome.isAllowCreateScene,
};
- UserInfo.Current.regionList.Add(home);
+ if (home.isBindGateway)
+ {
+ UserInfo.Current.regionList.Add(home);
+ }
+ }
+ if(UserInfo.Current.regionList.Count== 0)
+ {
+ return "null";
}
//-------濡傛灉璐﹀彿鏄娆＄櫥褰�
if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
@@ -1792,6 +1800,7 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
+ d.Add("networkConfig", true);
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
@@ -1808,12 +1817,26 @@
d.Add("categoryType", 1);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
+ d.Add("networkConfig", true);
+
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
}
+ /// <summary>
+ /// 鑾峰彇璁惧璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetDeviceInfo(string functionId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceIds", new List<string>() { functionId });
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
+ }
/// <summary>
/// 鑾峰彇璁惧璇︽儏鍒楄〃
--
Gitblit v1.8.0