From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
index 1c25db0..30fbc37 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
using Shared;
namespace HDL_ON.Entity
@@ -81,64 +82,78 @@
/// <summary>
/// 鎴块棿uid
/// </summary>
- public List<String> uids = new List<string>();
+ [Newtonsoft.Json.JsonIgnore]
+ public List<string> uids = new List<string>();
//public List<String> roomIds = new List<string>();
/// <summary>
/// 缇ゆ帶鍔熻兘sid閰嶇疆
/// </summary>
public List<GroupControlFunction> sids = new List<GroupControlFunction>();
- ///// <summary>
- ///// 鑾峰彇璁惧娣诲姞鍒版埧闂寸殑鎴块棿鍚嶇О
- ///// </summary>
- ///// <returns></returns>
- //public string GetRoomListName()
- //{
- // string roomNameList = "";
- // foreach (var roomId in roomIds)
- // {
- // var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
- // if (findRoom == null)
- // {
- // continue;
- // }
- // if (roomNameList != "")
- // {
- // roomNameList += ",";
- // }
- // roomNameList += findRoom.floorName + "-" + findRoom.roomName;
- // }
- // if (roomNameList == "")
- // {
- // roomNameList = Language.StringByID(StringId.WholeZone);
- // }
- // return roomNameList;
- //}
+ /// <summary>
+ /// 鑾峰彇璁惧娣诲姞鍒版埧闂寸殑鎴块棿鍚嶇О
+ /// </summary>
+ /// <returns></returns>
+ public string GetUidListName()
+ {
+ string roomNameList = "";
+ foreach (var roomId in uids)
+ {
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
+ if (findRoom == null)
+ {
+ continue;
+ }
+ if (roomNameList != "")
+ {
+ roomNameList += ",";
+ }
+ roomNameList += findRoom.floorName + "-" + findRoom.roomName;
+ }
+ if (roomNameList == "")
+ {
+ roomNameList = Language.StringByID(StringId.WholeZone);
+ }
+ return roomNameList;
+ }
/// <summary>
/// 缇ゆ帶鎺у埗
/// </summary>
/// <param name="pairs"></param>
- public void Control(Dictionary<string,object> pairs)
+ public void Control(Dictionary<string,string> pairs)
{
try
{
- var controlValues = new Dictionary<string, object>();
- foreach(var p in pairs)
+
+ if (DriverLayer.Control.Ins.GatewayOnline_Local)
{
- controlValues.Add("key", p.Key);
- controlValues.Add("value", p.Value);
+ var functionControlDataObj = GetGatewayAlinkControlData(pairs);
+ var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
+ var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlGroupControlTopic, functionControlDataJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
}
- var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
- if (pack != null)
+ else
{
- if (pack.Code == StateCode.SUCCESS)
+
+ var controlValues = new Dictionary<string, object>();
+ foreach (var p in pairs)
{
- //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ controlValues.Add("key", p.Key);
+ controlValues.Add("value", p.Value);
}
- else
+ var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
+ if (pack != null)
{
- MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ }
+ else
+ {
+ MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ }
}
}
}
--
Gitblit v1.8.0