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 | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 10640b5..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;
@@ -120,9 +124,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = curtain.collection
+ IsSelected = curtain.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
curtainSeekBar = new CurtainRollSeekBarOn()
{
@@ -130,17 +139,23 @@
Y = Application.GetRealHeight(130),
Width = Application.GetRealWidth(170),
Height = Application.GetRealWidth(210),
- Progress = curtain.openLevel
+ Progress = curtain.percent,
+ IsInvertedProgress = true,
+ ProgressTextColor = 0x00000000,
};
controlView.AddChidren(curtainSeekBar);
btnMinusSignIcon = new Button()
{
- X = Application.GetRealWidth(42),
Y = Application.GetRealHeight(406),
- Width = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(52),
Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "Public/MinusSignIcon.png",
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = StringId.PullOpen,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(btnMinusSignIcon);
@@ -148,26 +163,34 @@
{
X = btnMinusSignIcon.Right,
Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
- Width = Application.GetRealWidth(190),
+ Width = Application.GetRealWidth(220),
Height = Application.GetRealHeight(54),
SeekBarViewHeight = Application.GetRealHeight(8),
ThumbImagePath = "Public/ThumbImage.png",
ThumbImageHeight = Application.GetRealHeight(54),
ProgressBarColor = CSS_Color.MainColor,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressTextSize = 0x00000000,
MaxValue = 100,
- Progress = curtain.openLevel
+ SeekBarPadding = Application.GetRealWidth(20),
+ Progress = curtain.percent,
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(controlBar);
btnPlusSgnIcon = new Button()
{
- X = controlBar.Right + Application.GetRealWidth(10),
+ X = Application.GetRealWidth(286),
Y = Application.GetRealHeight(406),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "Public/PlusSignIcon.png",
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(24),
+ TextID = StringId.Shut,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(btnPlusSgnIcon);
@@ -205,8 +228,12 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(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