From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 39e3ff5..6b0a1c4 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -219,7 +219,7 @@
btn.Visible = false;
};
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
};
foreach (var f in room.GetRoomFunctions(false))
{
@@ -356,6 +356,9 @@
{
btnOpen.MouseUpEventHandler = (sender, e) =>
{
+ DB_ResidenceData.Instance.GlobalCurtainStatus = true;
+ btnOpen.IsSelected = true;
+ btnClose.IsSelected = false;
foreach (var f in FunctionList.List.curtains)
{
f.trait_on_off.curValue = "on";
@@ -368,6 +371,9 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
+ DB_ResidenceData.Instance.GlobalCurtainStatus = false;
+ btnClose.IsSelected = true;
+ btnOpen.IsSelected = false;
foreach (var f in FunctionList.List.curtains)
{
f.trait_on_off.curValue = "off";
--
Gitblit v1.8.0