From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index ff756e4..8c2b3dc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -100,7 +100,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = socketFunction.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnSwitchIcon = new Button()
{
@@ -126,10 +131,9 @@
};
controlView.AddChidren(btnSwitch);
-
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(socketFunction, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Socket)).LoadTopView_FunctionTop(socketFunction, actionRefresh);
new System.Threading.Thread(() =>
{
DriverLayer.Control.Ins.SendReadCommand(socketFunction);
--
Gitblit v1.8.0