From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
index aeb5165..4d2d467 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
@@ -131,18 +131,19 @@
detailBackFrame.AddChidren(btnPersent);
if (dicTaskinfo.ContainsKey(3) == true)
{
- btnPersent.Text = dicTaskinfo[3].Data1 + "%";
+ btnPersent.Text = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(dicTaskinfo[3].Data1) + "%";
}
//杩涘害鏉�
var seekBar = new SeekBarControl(919);
seekBar.Y = Application.GetRealHeight(268);
seekBar.ProgressBarColor = 0xfffdb500;
+ seekBar.MaxValue = 100;
seekBar.Enable = false;
if (dicTaskinfo.ContainsKey(3) == true)
{
//3:浜害璋冭妭
- seekBar.Progress = dicTaskinfo[3].Data1;
+ seekBar.Progress = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(dicTaskinfo[3].Data1);
}
detailBackFrame.AddChidren(seekBar);
seekBar.ProgressChangedEvent += (div, value) =>
@@ -270,7 +271,7 @@
//鐧惧垎姣旇皟鑺�
dicTaskinfo[3] = new Safeguard.TaskListInfo();
dicTaskinfo[3].TaskType = 3;
- dicTaskinfo[3].Data1 = seekBar.Progress;
+ dicTaskinfo[3].Data1 = HdlDeviceCommonLogic.Current.CalculateLightLevel(seekBar.Progress);
}
var listData = new List<Safeguard.TaskListInfo>();
@@ -281,7 +282,7 @@
dicTaskinfo = null;
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
- string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);
+ string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);
this.FinishSelectEvent?.Invoke(statuText, listData);
this.CloseForm();
--
Gitblit v1.8.0