From 12bda302564e919a0ba8157957df3d2ee7382909 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 14 九月 2021 15:27:51 +0800
Subject: [PATCH] 2021-09-14 1.增加物业公告推送对接
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 55ef055..933ffc9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -127,12 +127,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);
+ //}
curtainSeekBar = new CurtainRollSeekBarOn()
{
@@ -201,9 +201,8 @@
Y = Application.GetRealHeight(466),
Width = Application.GetMinRealAverage(32),
Height = Application.GetMinRealAverage(32),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",
};
controlView.AddChidren(btnCurtainClose);
@@ -224,9 +223,8 @@
Y = Application.GetRealHeight(466),
Width = Application.GetMinRealAverage(32),
Height = Application.GetMinRealAverage(32),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
- IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0",
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",
};
controlView.AddChidren(btnCurtainOpen);
--
Gitblit v1.8.0