From 78c5b5715518c0017d9f629ce16ee9c173a48690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 28 八月 2020 09:59:18 +0800
Subject: [PATCH] 2020-08-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
index 6a06cc5..996445d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
@@ -20,6 +20,10 @@
/// 鍔ㄤ綔淇℃伅 1 寮�鍏�/ 3浜害璋冭妭
/// </summary>
private Dictionary<int, Safeguard.TaskListInfo> dicTaskinfo = new Dictionary<int, Safeguard.TaskListInfo>();
+ /// <summary>
+ /// 杩涘害鏉℃渶澶у��
+ /// </summary>
+ private int MaxValue = 254;
#endregion
@@ -131,29 +135,24 @@
detailBackFrame.AddChidren(btnPersent);
if (dicTaskinfo.ContainsKey(3) == true)
{
- btnPersent.Text = dicTaskinfo[3].Data1 + "%";
+ btnPersent.Text = ((int)(dicTaskinfo[3].Data1 * 1.0 / MaxValue * 100)) + "%";
}
//杩涘害鏉�
- 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.MaxValue = this.MaxValue;
+ seekBar.Enable = false;
if (dicTaskinfo.ContainsKey(3) == true)
{
//3:浜害璋冭妭
seekBar.Progress = dicTaskinfo[3].Data1;
}
detailBackFrame.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
- btnPersent.Text = value + "%";
+ btnPersent.Text = ((int)(value * 1.0 / MaxValue * 100)) + "%";
};
//绾�
@@ -196,7 +195,6 @@
btnOpenSelect.Visible = false;
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo.Remove(1);
}
@@ -209,7 +207,11 @@
//寮� 鍙敤
btnOpen.TextColor = UserCenterColor.Current.TextColor1;
seekBar.Enable = true;
- seekBar.ProgressColor = 0xfffdb500;
+ if (seekBar.Progress == 0)
+ {
+ seekBar.Progress = MaxValue;
+ btnPersent.Text = "100%";
+ }
//鍏� 涓嶅彲鐢�
btnClose.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -242,7 +244,6 @@
//寮� 涓嶅彲鐢�
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
seekBar.Enable = false;
- seekBar.ProgressColor = 0xffe8e8e8;
dicTaskinfo[1] = new Safeguard.TaskListInfo();
dicTaskinfo[1].TaskType = 1;
@@ -285,13 +286,11 @@
dicTaskinfo = null;
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
- string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);
+ string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);
this.FinishSelectEvent?.Invoke(statuText, listData);
this.CloseForm();
};
- //鍔ㄧ敾鏁堟灉
- frameTransparent.Animate = Animate.DownToUp;
}
#endregion
@@ -301,10 +300,10 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
this.FinishSelectEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0