From fa9ed0cc5f6a585eb6ac61510ffe7245434275ec Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 15:17:39 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 29127b6..b90288d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -605,17 +605,12 @@
}
if (groupControlLightList.Count == functions.Count)
{
- if (!btnChooseAll.IsSelected)
- {
- btnChooseAll.IsSelected = true;
- }
+ btnChooseAll.TextID = StringId.SelectedAll;
}
else
{
- if (btnChooseAll.IsSelected)
- {
- btnChooseAll.IsSelected = false;
- }
+ if(btnChooseAll.TextID != StringId.Cancel)
+ btnChooseAll.TextID = StringId.Cancel;
}
};
if (groupControl.sids.Find((obj) => obj.sid == function.sid) != null)
--
Gitblit v1.8.0