From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 43c4136..9d51783 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -13,7 +13,6 @@
public class PirSend
{
- public static string pirId = "1367032976869658625";
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -49,6 +48,19 @@
//d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
//d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID);
var responsePackNew = RequestServerhomeId(jObject, NewAPI.Api_Post_GetDevcieList);
+ return responsePackNew;
+ }
+ /// <summary>
+ /// 鑾峰彇璁惧璇︽儏閫氳繃(spk,sid)
+ /// </summary>
+ /// <returns></returns>
+ public static ResponsePackNew GetinfoBySid(Control control)
+ {
+ var jObject = new JObject { };
+ jObject.Add("homeId", HomeId);
+ jObject.Add("spk", control.spk);
+ jObject.Add("sid", control.sid);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.Api_Post_GetinfoBySid);
return responsePackNew;
}
/// <summary>
@@ -168,7 +180,7 @@
/// 鑷鎸夐敭鍒犻櫎
/// </summary>
/// <returns></returns>
- public static ResponsePackNew CodeRemove(AttributesStatus buttonObj)
+ public static ResponsePackNew CodeRemove(AttributesStatus buttonObj,string deviceId)
{
var job = new JObject { };
job.Add("key", buttonObj.key);
@@ -178,7 +190,7 @@
job.Add("value", valuejArray);
var jArray = new JArray { };
jArray.Add(job);
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pirId }, { "attributes", jArray } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId }, { "attributes", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeRemove);
return responsePackNew;
}
@@ -194,12 +206,12 @@
return responsePackNew;
}
/// <summary>
- /// 淇敼绾㈠瀹濆悕绉�
+ /// 淇敼绾㈠瀹�/璁惧鍚嶇О
/// </summary>
/// <returns></returns>
- public static ResponsePackNew DeviceRename(Pir pir)
+ public static ResponsePackNew DeviceRename(string deviceId,string name)
{
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pir.deviceId }, { "name", pir.name } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId }, { "name", name} };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_DeviceRename);
return responsePackNew;
}
@@ -235,7 +247,7 @@
url = "/smart-footstone/app/ir/code/list";
jObject.Add("brandId", id);
}
- responsePackNew = RequestServerhomeId(jObject, url);
+ responsePackNew = RequestServerhomeId(jObject, url,5);
}
catch { }
finally
--
Gitblit v1.8.0