From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
index 14721c3..d1818c1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.cs
@@ -135,23 +135,17 @@
}
//杩涘害鏉�
- var seekBar = new HorizontalSeekBar();
- seekBar.Enable = false;
+ var seekBar = new SeekBarControl(919);
seekBar.Y = Application.GetRealHeight(268);
- seekBar.Gravity = Gravity.CenterHorizontal;
- seekBar.Width = Application.GetRealWidth(919);
- seekBar.Height = Application.GetRealHeight(89);
- seekBar.Max = 100;
- seekBar.BackgroundColor = 0xfff5f5f5;
- seekBar.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar.ProgressColor = 0xfffdb500;
+ seekBar.ProgressBarColor = 0xfffdb500;
+ seekBar.Enable = false;
if (dicTaskinfo.ContainsKey(5) == true)
{
//5:鐧惧垎姣旇皟鑺�
seekBar.Progress = dicTaskinfo[5].Data2;
}
detailBackFrame.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
btnPersent.Text = value + "%";
};
@@ -196,7 +190,6 @@
btnOpenSelect.Visible = false;
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo.Remove(0);
}
@@ -209,7 +202,6 @@
//寮� 鍙敤
btnOpen.TextColor = UserCenterColor.Current.TextColor1;
seekBar.Enable = true;
- seekBar.ProgressColor = 0xfffdb500;
if (seekBar.Progress == 0)
{
seekBar.Progress = 100;
@@ -249,7 +241,6 @@
//寮� 涓嶅彲鐢�
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
//绉婚櫎鎵撳紑
dicTaskinfo.Remove(0);
@@ -295,13 +286,11 @@
}
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
- string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);
+ string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);
this.FinishSelectEvent?.Invoke(statuText, listData);
this.CloseForm();
};
- //鍔ㄧ敾鏁堟灉
- frameTransparent.Animate = Animate.DownToUp;
}
#endregion
@@ -311,11 +300,11 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
this.FinishSelectEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0