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 | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
index 9c80d01..30fbc37 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -121,22 +121,16 @@
/// 缇ゆ帶鎺у埗
/// </summary>
/// <param name="pairs"></param>
- public void Control(Dictionary<string,object> pairs)
+ public void Control(Dictionary<string,string> pairs)
{
try
{
if (DriverLayer.Control.Ins.GatewayOnline_Local)
{
- var controlValues = new Dictionary<string, string>();
- foreach (var p in pairs)
- {
- controlValues.Add("key", p.Key);
- controlValues.Add("value", p.Value.ToString());
- }
- var functionControlDataObj = GetGatewayAlinkControlData(controlValues);
+ var functionControlDataObj = GetGatewayAlinkControlData(pairs);
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
- var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
+ var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlGroupControlTopic, functionControlDataJson);
new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
}
--
Gitblit v1.8.0