From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 十二月 2020 18:57:15 +0800
Subject: [PATCH] 20201208

---
 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