From 25ce81434a6ce69cf10f12d4f5a25ab80a339ba7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 17:50:53 +0800
Subject: [PATCH] 2021-3-3-3
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index a325237..7ac563e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -11,6 +11,8 @@
public class PirSend
{
+
+ public static string pirId = "1367032976869658625";
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -32,11 +34,28 @@
}
}
/// <summary>
+ /// 鑾峰彇璁惧鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static ResponsePackNew GetDeviceList(string spk)
+ {
+ var jObject = new JObject { };
+ jObject.Add("homeId", HomeId);
+ jObject.Add("spk", spk);
+ //d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);
+ //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//鍙帶鍙傛暟锛屽綋闇�瑕佸垎椤佃幏鍙栵紝鎬庝箞鐭ラ亾鍒嗛〉鎬绘暟
+ //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ //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>
/// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
/// </summary>
public static ResponsePackNew GetList()
{
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }};
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pirId } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_List);
return responsePackNew;
}
@@ -45,19 +64,18 @@
/// </summary>
/// <returns></returns>
/// <param name="control"></param>
- /// <param name="bool_library">(true=鐮佸簱锛宖alse=鑷鐨�)</param>
/// <returns></returns>
- public static ResponsePackNew Add(Control control,bool bool_library)
+ public static ResponsePackNew Add(Control control)
{
var jObject = new JObject { };
jObject.Add("homeId", HomeId);
- jObject.Add("deviceId", control.deviceId);
+ jObject.Add("deviceId", pirId);
jObject.Add("name", control.name);
jObject.Add("spk", "ir.module");
jObject.Add("type", control.type);
- if (bool_library)
+ if (control.type=="library")
{
- jObject.Add("group_id", "123");
+ jObject.Add("group_id", control.group_id);
var libraryjay = new JArray { };
for (int i = 0; i < control.library.Count; i++)
{
@@ -77,7 +95,7 @@
{
var jObject = new JObject { };
jObject.Add("homeId", HomeId);
- jObject.Add("deviceId", HomeId);
+ jObject.Add("deviceId", pirId);
jObject.Add("spk", control.spk);
if (control.spk== Entity.SPK.AcStandard) {
jObject.Add("group_id", control.group_id);
@@ -123,7 +141,7 @@
job.Add("value", valuejArray);
var jArray = new JArray { };
jArray.Add(job);
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }, { "attributes", jArray } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pirId }, { "attributes", jArray } };
ResponsePackNew responsePackNew = null;
new System.Threading.Thread(() =>
{
@@ -159,7 +177,7 @@
job.Add("value", valuejArray);
var jArray = new JArray { };
jArray.Add(job);
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }, { "attributes", jArray } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pirId }, { "attributes", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeRemove);
return responsePackNew;
}
@@ -173,7 +191,7 @@
job.Add("deviceId", deviceId);
var jArray = new JArray { };
jArray.Add(job);
- var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }, { "devices", jArray } };
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", pirId }, { "devices", jArray } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_DeviceRemove);
return responsePackNew;
}
--
Gitblit v1.8.0