From 1cd93851bde6ec19c07f1445899a76ab0dfa507d Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 13 四月 2023 16:01:53 +0800
Subject: [PATCH] 1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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..4591f0b 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
@@ -123,22 +124,41 @@
{
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 pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
- if (pack != null)
- {
- if (pack.Code == StateCode.SUCCESS)
+ var controlValues = new Dictionary<string, string>();
+ foreach (var p in pairs)
{
- //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ controlValues.Add("key", p.Key);
+ controlValues.Add("value", p.Value.ToString());
}
- else
+ var functionControlDataObj = GetGatewayAlinkControlData(controlValues);
+ var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
+ var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+ }
+ else
+ {
+
+ var controlValues = new Dictionary<string, object>();
+ foreach (var p in pairs)
{
- MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ controlValues.Add("key", p.Key);
+ controlValues.Add("value", p.Value);
+ }
+ var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
+ if (pack != null)
+ {
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ }
+ else
+ {
+ MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ }
}
}
}
--
Gitblit v1.8.0