From b71dfb3ca100340005d56e1298292807da82322d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 六月 2020 15:04:21 +0800
Subject: [PATCH] 20200608
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 141 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 134 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 58a2c2a..f1cd506 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -390,6 +390,133 @@
return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
}
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetResidenceMemberAccount()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true);
+ }
+
+ /// <summary>
+ /// 淇敼瀛愯处鍙锋樀绉�
+ /// </summary>
+ /// <param name="nickName"></param>
+ /// <param name="subAccountGuid"></param>
+ /// <returns></returns>
+ public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("NickName", nickName);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/EditSubAccountNickName", jsonString, true);
+ }
+ /// <summary>
+ /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
+ /// </summary>
+ /// <param name="nickName"></param>
+ /// <param name="subAccountGuid"></param>
+ /// <returns></returns>
+ public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("HomeGuid", homeGuid);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ChangeCreateSceneState", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetShareDataByMemberAccount(string memberId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetShareData(string memberId,string hId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", hId);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
+ }
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack AddShareData(ShareData shareData)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
+ }
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack EditShareData(ShareData shareData)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", shareData.DistributedMark);
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
+ }
+
+ /// <summary>
+ /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
+ /// </summary>
+ /// <param name="subAccount"></param>
+ /// <param name="nickName"></param>
+ /// <returns></returns>
+ public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccount", subAccount);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("Nickname", nickName);
+ d.Add("IsAllowRemoteCtrl", true);
+
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetResidenceMemberAccountInfo(string account)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("Account", account);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
+ }
#endregion
@@ -745,7 +872,7 @@
{
sid = "000101" + guid + "0102010001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = roomIds,
@@ -771,7 +898,7 @@
{
sid = "000101" + guid + "0202020001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
},
roomIdList = roomIds,
@@ -798,7 +925,7 @@
{
sid = "000101" + guid + "0202040001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
},
@@ -827,7 +954,7 @@
{
sid = "000101" + guid + "0204010001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} },
@@ -859,7 +986,7 @@
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
},// "curtain",
lastState = "寮�",
@@ -885,7 +1012,7 @@
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
},// "rollingshutter",
lastState = "20%",
@@ -911,7 +1038,7 @@
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
},
lastState = "20%",
--
Gitblit v1.8.0