From 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 15:44:18 +0800
Subject: [PATCH] 2021-10-29 1.更新乐橙 AndroidSDK
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 197 +++++++++++++++++++++++++++----------------------
1 files changed, 109 insertions(+), 88 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 1e3b358..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,10 +50,15 @@
/// 绐楀笜鎵撳紑鎸夐挳
/// </summary>
Button btnCurtainOpen;
+ /// <summary>
+ /// 杩涘害鍊�
+ /// </summary>
+ Button btnProgress;
#endregion
#region 鍖哄煙鍙橀噺
- Curtain curtain;
+ Curtain curtainTemp = new Curtain();
+ Function function;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -62,10 +67,14 @@
/// </summary>
Action actionRefresh;
#endregion
- public RollingShutterPage(Curtain func)
+ /// <summary>
+ /// 姝ｅ湪鎺у埗
+ /// </summary>
+ bool onControl = false;
+ public RollingShutterPage(Function func)
{
bodyView = this;
- curtain = func;
+ function = func;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -95,7 +104,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = curtain.name,
+ Text = function.name,
};
controlView.AddChidren(btnFunctionName);
@@ -108,7 +117,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = curtain.GetRoomListName()
+ Text = function.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -120,14 +129,25 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = curtain.collect
+ IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
+
+
+ btnProgress = new Button()
{
- controlView.AddChidren(btnCollection);
- }
+ 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()
{
@@ -135,77 +155,78 @@
Y = Application.GetRealHeight(130),
Width = Application.GetRealWidth(170),
Height = Application.GetRealWidth(210),
- Progress = curtain.percent,
- ProgressTextColor = 0x00000000
+ Progress = curtainTemp.GetPercent(function),
+ //IsInvertedProgress = true,
+ ProgressTextColor = 0x00000000,
};
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 = curtain.percent,
- 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()
{
- X = Application.GetRealWidth(64),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",
};
controlView.AddChidren(btnCurtainClose);
btnCurtainStop = new Button()
{
- X = Application.GetRealWidth(144),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ X = Application.GetRealWidth(148),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
};
@@ -213,20 +234,20 @@
btnCurtainOpen = new Button()
{
- X = Application.GetRealWidth(224),
- Y = Application.GetRealHeight(462),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ X = Application.GetRealWidth(212),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",
};
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(function, actionRefresh);
new System.Threading.Thread(() =>
{
- DriverLayer.Control.Ins.SendReadCommand(curtain);
+ DriverLayer.Control.Ins.SendReadCommand(function);
})
{ IsBackground = true }.Start();
}
--
Gitblit v1.8.0