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/Device/PirSensor/PirSensorDimmingModeForm.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorDimmingModeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorDimmingModeForm.cs
index 494845e..5746615 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorDimmingModeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorDimmingModeForm.cs
@@ -92,9 +92,9 @@
{
listSelect.Add(i + "%");
}
- //璁╁畠澶勪簬10鐨勬暣鍊嶆暟
- this.pirConfigure.dimmerLevel = (this.pirConfigure.dimmerLevel / 10) * 10;
- int index = listSelect.IndexOf(this.pirConfigure.dimmerLevel + "%");
+ //杩欎釜鐧惧垎姣旂殑鍊�,鐩存帴绠�
+ int persentValue = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(this.pirConfigure.dimmerLevel);
+ int index = listSelect.IndexOf(persentValue + "%");
//寮�鐏寒搴�
var row1 = new FrameRowControl(listView.rowSpace / 2);
@@ -102,14 +102,17 @@
var btnCaption1 = row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uTurnOnBrightness), 400);
btnCaption1.TextSize = 15;
row1.AddRightArrow();
- var btnStatu = row1.AddMostRightView(pirConfigure.dimmerLevel + "%", 400);
+ var btnStatu = row1.AddMostRightView(persentValue + "%", 400);
row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
PickerView.Show(listSelect, (value) =>
{
btnStatu.Text = listSelect[value];
- pirConfigure.dimmerLevel = Convert.ToInt32(listSelect[value].Replace("%", string.Empty));
+
+ string myValue = listSelect[value].Replace("%", string.Empty);
+ pirConfigure.dimmerLevel = HdlDeviceCommonLogic.Current.CalculateLightLevel(Convert.ToDecimal(myValue));
+ index = value;
}, index == -1 ? 0 : index, Language.StringByID(R.MyInternationalizationString.uBrightness),
Language.StringByID(R.MyInternationalizationString.uFinish),
--
Gitblit v1.8.0