From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 96c3425..2529c83 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -12,8 +12,20 @@
public class PirSend
{
-
- public static string pirId = "1367032976869658625";
+ /// <summary>
+ /// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID)
+ /// </summary>
+ public static string GatewayId
+ {
+ get
+ {
+ if (Entity.DB_ResidenceData.Instance.HomeGateway == null)
+ {
+ return DriverLayer.Control.Ins.GatewayId;
+ }
+ return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
+ }
+ }
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -67,9 +79,9 @@
/// <summary>
/// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
/// </summary>
- public static ResponsePackNew ControlList(Pir pir)
+ public static ResponsePackNew ControlList(string deviceId)
{
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pir.deviceId } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId} };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_List);
return responsePackNew;
}
@@ -138,15 +150,8 @@
/// 绾㈠鐮佸涔�
/// </summary>
/// <returns></returns>
- public static void CodeStudy(Control control,AttributesStatus buttonObj,Action<ResponsePackNew> action)
+ public static void CodeStudy(string deviceId, AttributesStatus buttonObj,Action<ResponsePackNew> action)
{
- //var whichDayJson = jay["whichDay"].ToString();
- //var whichDayAry = Newtonsoft.Json.Linq.JArray.Parse(whichDayJson);
- //for (int b = 0; b < whichDayAry.Count; b++)
- //{
- // var days = whichDayAry[b].ToString();
- // timer.whichDay.Add(int.Parse(days));
- //}
var job = new JObject { };
job.Add("key", buttonObj.key);
job.Add("data_type", "string");
@@ -155,7 +160,7 @@
job.Add("value", valuejArray);
var jArray = new JArray { };
jArray.Add(job);
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", control.deviceId }, { "attributes", jArray } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId }, { "attributes", jArray } };
ResponsePackNew responsePackNew = null;
new System.Threading.Thread(() =>
{
@@ -181,7 +186,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);
@@ -191,11 +196,10 @@
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;
}
-
/// <summary>
/// 绾㈠瀹�/閬ユ帶鍣ㄥ垹闄�
/// </summary>
@@ -207,12 +211,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;
}
@@ -248,7 +252,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