From 4d6c9858844d1545a9b253c1b31842fa89695c1d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 06 六月 2021 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index f34d757..24734bf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -101,12 +101,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnSwitchIcon = new Button()
{
--
Gitblit v1.8.0