From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期四, 03 十二月 2020 15:35:42 +0800 Subject: [PATCH] 2020-12-03-1 --- HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs index eb3c30a..31a1b80 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs @@ -98,7 +98,7 @@ Height = Application.GetMinRealAverage(40), SelectedImagePath = "Collection/CollectionIcon.png", UnSelectedImagePath = "Collection/CollectionGrayIcon.png", - IsSelected = socketFunction.collection + IsSelected = socketFunction.collect }; controlView.AddChidren(btnCollection); @@ -108,7 +108,7 @@ Y = Application.GetRealHeight(100), Width = Application.GetRealWidth(198), Height = Application.GetRealWidth(198), - IsSelected = socketFunction.trait_on_off.value.ToString() == "on", + IsSelected = socketFunction.trait_on_off.curValue.ToString() == "on", UnSelectedImagePath = "FunctionIcon/Socket/SocketIconBg.png", SelectedImagePath = "FunctionIcon/Socket/SocketIconOnBg.png", }; @@ -122,14 +122,14 @@ Height = Application.GetMinRealAverage(40), UnSelectedImagePath = "Public/PowerClose.png", SelectedImagePath = "Public/PowerOpen.png", - IsSelected = socketFunction.trait_on_off.value.ToString() == "on" + IsSelected = socketFunction.trait_on_off.curValue.ToString() == "on" }; controlView.AddChidren(btnSwitch); LoadEventList(); - new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView(socketFunction, actionRefresh); + new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(socketFunction, actionRefresh); } -- Gitblit v1.8.0