From e89eff06b335a16eaaa043b18f35f5463e1bc203 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 四月 2023 17:53:49 +0800
Subject: [PATCH] 群控编辑问题修复
---
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 9 +++++++++
HDL_ON/UI/MainPage.cs | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 7a2069d..87a799f 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.6";
+ public static string VersionString = "1.7.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index c915db0..d82cd54 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -358,6 +358,15 @@
{
if (pack.Code == StateCode.SUCCESS)
{
+ try
+ {
+ var addTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<GroupControl>(pack.Data.ToString());
+ FunctionList.List.groupControls.Add(addTemp);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"娣诲姞缇ゆ帶鎴愬姛锛岃浆璇戣繑鍥炴暟鎹け璐�:{ex.Message}");
+ }
backActon?.Invoke();
this.RemoveFromParent();
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index 0f8600b..2e7b60c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
@@ -436,7 +436,7 @@
}
else
{
- var removeTemp = functions.Find((obj) => obj.sid == function.deviceId);
+ var removeTemp = functions.Find((obj) => obj.sid == function.sid);
if (removeTemp != null)
{
functions.Remove(removeTemp);
--
Gitblit v1.8.0