From 7584dea0241cefc276a4b5311331aee1dcda6c80 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 11:44:41 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 6c253dc..9ef310f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -5,6 +5,7 @@
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using Shared;
+using HDL_ON.Entity;
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
@@ -12,7 +13,6 @@
public class PirSend
{
- public static string pirId = "1367032976869658625";
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -51,6 +51,19 @@
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>
/// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
/// </summary>
public static ResponsePackNew ControlList(Pir pir)
@@ -75,7 +88,7 @@
jObject.Add("type", control.type);
if (control.type=="library")
{
- jObject.Add("group_id", control.group_id);
+ jObject.Add("groupId", control.groupId);
var libraryjay = new JArray { };
for (int i = 0; i < control.library.Count; i++)
{
@@ -97,8 +110,8 @@
jObject.Add("homeId", HomeId);
jObject.Add("deviceId", control.deviceId);
jObject.Add("spk", control.spk);
- if (control.spk== Entity.SPK.AcStandard) {
- jObject.Add("group_id", control.group_id);
+ if (control.spk== SPK.AcIr) {
+ jObject.Add("groupId", control.groupId);
}
var libraryJay = new JArray { };
for (int i = 0; i < control.library.Count; i++)
@@ -110,7 +123,7 @@
{
var statusJob = new JObject { };
var job = control.status[i];
- statusJob.Add("key", job.Key);
+ statusJob.Add("key", job.key);
statusJob.Add("value", job.value);
statusJay.Add(statusJob);
}
@@ -124,7 +137,7 @@
/// 绾㈠鐮佸涔�
/// </summary>
/// <returns></returns>
- public static void CodeStudy(ButtonObj buttonObj, Action<ResponsePackNew> action)
+ public static void CodeStudy(Control control,AttributesStatus buttonObj,Action<ResponsePackNew> action)
{
//var whichDayJson = jay["whichDay"].ToString();
//var whichDayAry = Newtonsoft.Json.Linq.JArray.Parse(whichDayJson);
@@ -134,14 +147,14 @@
// timer.whichDay.Add(int.Parse(days));
//}
var job = new JObject { };
- job.Add("key", buttonObj.Key);
+ job.Add("key", buttonObj.key);
job.Add("data_type", "string");
var valuejArray = new JArray { };
valuejArray.Add(buttonObj.value);
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", control.deviceId }, { "attributes", jArray } };
ResponsePackNew responsePackNew = null;
new System.Threading.Thread(() =>
{
@@ -167,17 +180,17 @@
/// 鑷鎸夐敭鍒犻櫎
/// </summary>
/// <returns></returns>
- public static ResponsePackNew CodeRemove(ButtonObj buttonObj)
+ public static ResponsePackNew CodeRemove(AttributesStatus buttonObj,string deviceId)
{
var job = new JObject { };
- job.Add("key", buttonObj.Key);
+ job.Add("key", buttonObj.key);
job.Add("data_type", "string");
var valuejArray = new JArray { };
valuejArray.Add(buttonObj.value);
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;
}
@@ -193,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;
}
--
Gitblit v1.8.0