From 6b6a3fd9c292a75196c4cc15c6d9bf52537efbd4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 07 九月 2021 10:12:20 +0800
Subject: [PATCH] 1.窗帘问题。2.智能空开。3.组合调光部分。
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 131 ++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 58 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 933ffc9..3bbabed 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -26,18 +26,18 @@
/// 绐楀笜鍔ㄦ�佹帶浠�
/// </summary>
CurtainRollSeekBarOn curtainSeekBar;
- /// <summary>
- /// 绐楀笜杩涘害鍑忓皯鎸夐挳
- /// </summary>
- Button btnMinusSignIcon;
- /// <summary>
- /// 绐楀笜杩涘害澧炲姞鎸夐挳
- /// </summary>
- Button btnPlusSgnIcon;
- /// <summary>
- /// 绐楀笜婊戝姩鎺у埗
- /// </summary>
- DiyImageSeekBar controlBar;
+ ///// <summary>
+ ///// 绐楀笜杩涘害鍑忓皯鎸夐挳
+ ///// </summary>
+ //Button btnMinusSignIcon;
+ ///// <summary>
+ ///// 绐楀笜杩涘害澧炲姞鎸夐挳
+ ///// </summary>
+ //Button btnPlusSgnIcon;
+ ///// <summary>
+ ///// 绐楀笜婊戝姩鎺у埗
+ ///// </summary>
+ //DiyImageSeekBar controlBar;
/// <summary>
/// 绐楀笜鍏抽棴鎸夐挳
/// </summary>
@@ -50,6 +50,10 @@
/// 绐楀笜鎵撳紑鎸夐挳
/// </summary>
Button btnCurtainOpen;
+ /// <summary>
+ /// 杩涘害鍊�
+ /// </summary>
+ Button btnProgress;
#endregion
#region 鍖哄煙鍙橀噺
@@ -134,6 +138,17 @@
// controlView.AddChidren(btnCollection);
//}
+
+ btnProgress = new Button()
+ {
+ Y = Application.GetRealHeight(80),
+ Height = Application.GetRealHeight(50),
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ Text = curtainTemp.GetPercent(function).ToString() + "%",
+ };
+ controlView.AddChidren(btnProgress);
+
curtainSeekBar = new CurtainRollSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
@@ -146,54 +161,54 @@
};
controlView.AddChidren(curtainSeekBar);
- btnMinusSignIcon = new Button()
- {
- Y = Application.GetRealHeight(406),
- Width = Application.GetRealWidth(52),
- Height = Application.GetMinRealAverage(24),
- TextAlignment = TextAlignment.CenterRight,
- TextID = StringId.PullOpen,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextColor = CSS_Color.PromptingColor1,
- Visible = false,
- Enable = false,
- };
- controlView.AddChidren(btnMinusSignIcon);
+ //btnMinusSignIcon = new Button()
+ //{
+ // Y = Application.GetRealHeight(406),
+ // Width = Application.GetRealWidth(52),
+ // Height = Application.GetMinRealAverage(24),
+ // TextAlignment = TextAlignment.CenterRight,
+ // TextID = StringId.PullOpen,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextColor = CSS_Color.PromptingColor1,
+ // Visible = false,
+ // Enable = false,
+ //};
+ //controlView.AddChidren(btnMinusSignIcon);
- controlBar = new DiyImageSeekBar()
- {
- X = btnMinusSignIcon.Right,
- Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
- 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 = 0x00000000,
- MaxValue = 100,
- SeekBarPadding = Application.GetRealWidth(20),
- Progress = curtainTemp.GetPercent(function),
- Visible = false,
- Enable = false,
- };
- controlView.AddChidren(controlBar);
+ //controlBar = new DiyImageSeekBar()
+ //{
+ // X = btnMinusSignIcon.Right,
+ // Y = Application.GetRealHeight(391),//414,璁捐鏁版嵁
+ // 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 = 0x00000000,
+ // MaxValue = 100,
+ // SeekBarPadding = Application.GetRealWidth(20),
+ // Progress = curtainTemp.GetPercent(function),
+ // Visible = false,
+ // Enable = false,
+ //};
+ //controlView.AddChidren(controlBar);
- btnPlusSgnIcon = new Button()
- {
- X = Application.GetRealWidth(286),
- Y = Application.GetRealHeight(406),
- 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);
+ //btnPlusSgnIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(286),
+ // Y = Application.GetRealHeight(406),
+ // 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);
btnCurtainClose = new Button()
{
--
Gitblit v1.8.0