From dbf79099f47d5f06223edfd5b8dc06c51b1830aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:39 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 626d5e2..ddbd24a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -120,7 +120,7 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = curtain.collection
+ IsSelected = curtain.collect
};
controlView.AddChidren(btnCollection);
@@ -218,7 +218,7 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, curtain.name).LoadTopView(curtain, actionRefresh);
+ new TopViewDiv(bodyView, curtain.name).LoadTopView_FunctionTop(curtain, actionRefresh);
}
}
--
Gitblit v1.8.0