From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 169 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 143 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 8d2b7d3..6f4b31f 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,15 +13,36 @@
public class PirSend
{
/// <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>
public static string HomeId
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.id;
}
}
+
+
+ /// <summary>
+ /// 涔愭subAccessToken
+ /// </summary>
+ public static string LcSubAccessToken = "";
+
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
@@ -28,12 +50,53 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
}
+ }
+ /// <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>
+ /// 鑾峰彇璁惧璇︽儏閫氳繃(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(string deviceId)
+ {
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId} };
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_List);
+ return responsePackNew;
}
/// <summary>
/// 閬ユ帶鍣ㄦ坊鍔�
/// </summary>
+ /// <returns></returns>
+ /// <param name="control"></param>
/// <returns></returns>
public static ResponsePackNew Add(Control control)
{
@@ -41,11 +104,11 @@
jObject.Add("homeId", HomeId);
jObject.Add("deviceId", control.deviceId);
jObject.Add("name", control.name);
- jObject.Add("spk", "ir.module");
+ jObject.Add("spk", control.spk);
jObject.Add("type", control.type);
- if (control.type == "library")
+ if (control.type=="library")
{
- //jObject.Add("group_id", "123");
+ jObject.Add("groupId", control.groupId);
var libraryjay = new JArray { };
for (int i = 0; i < control.library.Count; i++)
{
@@ -53,46 +116,84 @@
}
jObject.Add("library", libraryjay);
}
+
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_Add);
return responsePackNew;
}
/// <summary>
+ ///绾㈠鐮佸簱璇曠爜
+ /// </summary>
+ /// <returns></returns>
+ public static ResponsePackNew CodeTest(Control control)
+ {
+ var jObject = new JObject { };
+ jObject.Add("homeId", HomeId);
+ jObject.Add("deviceId", control.deviceId);
+ jObject.Add("spk", control.spk);
+ if (control.spk== SPK.AcIr) {
+ jObject.Add("groupId", control.groupId);
+ }
+ var libraryJay = new JArray { };
+ for (int i = 0; i < control.library.Count; i++)
+ {
+ libraryJay.Add(control.library[i]);
+ }
+ var statusJay = new JArray { };
+ for (int i = 0; i < control.status.Count; i++)
+ {
+ var statusJob = new JObject { };
+ var job = control.status[i];
+ statusJob.Add("key", job.key);
+ statusJob.Add("value", job.value);
+ statusJay.Add(statusJob);
+ }
+ jObject.Add("library", libraryJay);
+ jObject.Add("status", statusJay);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeTest);
+ return responsePackNew;
+ }
+ /// <summary>
+ /// <summary>
/// 绾㈠鐮佸涔�
/// </summary>
/// <returns></returns>
- public static void CodeStudy(ButtonObj buttonObj, Action<ResponsePackNew> action)
+ public static void CodeStudy(Control control, AttributesStatus buttonObj, Action<Cloud> 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("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", "0" }, { "attributes", jArray } };
- ResponsePackNew responsePackNew = null;
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", control.deviceId }, { "attributes", jArray } };
+ Cloud cloud = null;
new System.Threading.Thread(() =>
{
try
{
//鍙戦�佺孩澶栫爜瀛︿範鍛戒护
- responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeStudy);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeStudy);
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ PirMethod method = new PirMethod();
+ PirMethod.buttondata = "";
+ cloud = method.MqttDate("鎸夐敭", control.sid, 25);
+ }
+ else
+ {
+ PirMethod method = new PirMethod();
+ method.ErrorShow(responsePackNew, "");
+ }
}
catch { }
finally
{
Application.RunOnMainThread(() =>
{
- action(responsePackNew);
+ action(cloud);
});
}
@@ -103,21 +204,40 @@
/// 鑷鎸夐敭鍒犻櫎
/// </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", "0" }, { "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>
+ /// <returns></returns>
+ public static ResponsePackNew DeleteDevice(string deviceId)
+ {
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId } };
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_DeviceDel);
+ return responsePackNew;
+ }
+ /// <summary>
+ /// 淇敼绾㈠瀹�/璁惧鍚嶇О
+ /// </summary>
+ /// <returns></returns>
+ public static ResponsePackNew DeviceRename(string deviceId,string name)
+ {
+ var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId }, { "name", name} };
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_DeviceRename);
+ return responsePackNew;
+ }
/// <summary>
/// 鏌ヨ绾㈠璁惧绫诲瀷鍒楄〃/鍝佺墝鍒楄〃/鍝佺墝绾㈠鐮佸簱鍒楄〃
/// </summary>
@@ -150,7 +270,7 @@
url = "/smart-footstone/app/ir/code/list";
jObject.Add("brandId", id);
}
- responsePackNew = RequestServerhomeId(jObject, url);
+ responsePackNew = RequestServerhomeId(jObject, url,5);
}
catch { }
finally
@@ -165,9 +285,6 @@
{ IsBackground = true }.Start();
}
-
-
-
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
--
Gitblit v1.8.0