From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index b0e0323..4065b46 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -62,6 +62,10 @@
/// </summary>
Action actionRefresh;
#endregion
+ /// <summary>
+ /// 姝ｅ湪鎺у埗
+ /// </summary>
+ bool onControl = false;
public RollingShutterPage(Curtain func)
{
bodyView = this;
@@ -122,7 +126,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);
+ }
curtainSeekBar = new CurtainRollSeekBarOn()
{
@@ -131,7 +140,8 @@
Width = Application.GetRealWidth(170),
Height = Application.GetRealWidth(210),
Progress = curtain.percent,
- ProgressTextColor = 0x00000000
+ IsInvertedProgress = true,
+ ProgressTextColor = 0x00000000,
};
controlView.AddChidren(curtainSeekBar);
--
Gitblit v1.8.0