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/FanPage.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index bce99bf..7d8c20e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -101,7 +101,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = fan.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnSwitchIcon = new Button()
{
@@ -169,7 +174,11 @@
LoadEventList();
new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(fan, actionRefresh);
-
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(fan);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0