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/MotorCurtainPage.cs | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 5e69429..48b0efb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -24,7 +24,7 @@
/// <summary>
/// 绐楀笜鍔ㄦ�佹帶浠�
/// </summary>
- CurtainSeekBar curtainSeekBar;
+ CurtainSeekBarOn curtainSeekBar;
/// <summary>
/// 绐楀笜杩涘害鍑忓皯鎸夐挳
/// </summary>
@@ -61,6 +61,11 @@
/// </summary>
Action actionRefresh;
#endregion
+ /// <summary>
+ /// 姝ｅ湪鎺у埗
+ /// </summary>
+ bool onControl = false;
+
public MotorCurtainPage(Curtain func)
{
bodyView = this;
@@ -119,28 +124,38 @@
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 CurtainSeekBar()
+ curtainSeekBar = new CurtainSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(130),
Width = Application.GetRealWidth(250),
Height = Application.GetRealWidth(177),
- Progress = curtain.openLevel
+ Progress = curtain.percent,
+ ProgressTextColor =0x00000000,
+ IsInvertedProgress = true,
};
controlView.AddChidren(curtainSeekBar);
-
btnMinusSignIcon = new Button()
{
- X = Application.GetRealWidth(42),
Y = Application.GetRealHeight(406),
- Width = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(62),
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);
@@ -155,19 +170,27 @@
ThumbImageHeight = Application.GetRealHeight(54),
ProgressBarColor = CSS_Color.MainColor,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressTextSize = 0x00000000,
MaxValue = 100,
Progress = 30,
+ SeekBarPadding = Application.GetRealWidth(20),
+ Visible = false,
+ Enable = false,
};
controlView.AddChidren(controlBar);
btnPlusSgnIcon = new Button()
{
- X = controlBar.Right,
+ X = Application.GetRealWidth(266),
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,7 +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