From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 7aaebf7..661eb0e 100644
--- 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()
{
@@ -156,6 +161,11 @@
LoadEventList();
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