From 8ccc71771efec9434ad3b4a45c5f2ec11326d40f Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期五, 23 四月 2021 10:25:24 +0800
Subject: [PATCH] 2021-04-23 添加乐橙可视对讲
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 7dd8e14..4658ffe 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>
/// 鑾峰彇璁惧璇︽儏鍒楄〃
@@ -1855,6 +1878,7 @@
d.Add("actions", actionObjs);
var requestJson = HttpUtil.GetSignRequestJson(d);
+ MainPage.Log($"{requestJson}");
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
}
/// <summary>
@@ -2202,11 +2226,25 @@
public ResponsePackNew EZGetChildToken()
{
Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
}
#endregion
+
+ #region 鍙瀵硅
+ /// <summary>
+ /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew CheckFlVideo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome( NewAPI.API_POST_FL_Check, requestJson);
+ return pack;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0