From ce2a26883e5dccaa0639cfdb4c4045ac7b5d9207 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 17:28:44 +0800
Subject: [PATCH] 2020-12-20 1.报警推送弹窗方案效果修改，点击查看跳转信息中心，实现避免重复弹窗。2.
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
old mode 100644
new mode 100755
index 9940cf9..661eb0e
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -108,7 +108,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = curtain.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnCurtainBgIcon = new Button()
{
@@ -155,7 +160,12 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView,curtain.name).LoadTopView_FunctionTop(curtain, actionRefresh);
+ new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(curtain);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0