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 | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
index a83c60a..4d2d467 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs
@@ -20,10 +20,6 @@
/// 鍔ㄤ綔淇℃伅 1 寮�鍏�/ 3浜害璋冭妭
/// </summary>
private Dictionary<int, Safeguard.TaskListInfo> dicTaskinfo = new Dictionary<int, Safeguard.TaskListInfo>();
- /// <summary>
- /// 杩涘害鏉℃渶澶у��
- /// </summary>
- private int MaxValue = 254;
#endregion
@@ -85,7 +81,7 @@
//澶撮儴淇℃伅
var btnTitle = new NormalViewControl(frameTransparent.Width, Application.GetRealHeight(70), false);
btnTitle.Y = Application.GetRealHeight(28);
- btnTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ btnTitle.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
btnTitle.TextColor = UserCenterColor.Current.TextColor4;
btnTitle.TextSize = 16;
btnTitle.TextAlignment = TextAlignment.Center;
@@ -113,7 +109,7 @@
rowRound.AddChidren(btnFinish);
//绾�
- var btnLine1 = new NormalViewControl(frameTransparent.Width, HdlControlResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(frameTransparent.Width, ControlCommonResourse.BottomLineHeight, false);
btnLine1.Y = Application.GetRealHeight(138);
btnLine1.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameTransparent.AddChidren(btnLine1);
@@ -135,28 +131,28 @@
detailBackFrame.AddChidren(btnPersent);
if (dicTaskinfo.ContainsKey(3) == true)
{
- btnPersent.Text = ((int)(dicTaskinfo[3].Data1 * 1.0 / MaxValue * 100)) + "%";
+ btnPersent.Text = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(dicTaskinfo[3].Data1) + "%";
}
//杩涘害鏉�
var seekBar = new SeekBarControl(919);
seekBar.Y = Application.GetRealHeight(268);
seekBar.ProgressBarColor = 0xfffdb500;
- seekBar.MaxValue = this.MaxValue;
+ 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) =>
{
- btnPersent.Text = ((int)(value * 1.0 / MaxValue * 100)) + "%";
+ btnPersent.Text = value + "%";
};
//绾�
- var btnLine2 = new NormalViewControl(Application.GetRealWidth(919), HdlControlResourse.BottomLineHeight, false);
+ var btnLine2 = new NormalViewControl(Application.GetRealWidth(919), ControlCommonResourse.BottomLineHeight, false);
btnLine2.Y = Application.GetRealHeight(417);
btnLine2.Gravity = Gravity.CenterHorizontal;
btnLine2.BackgroundColor = UserCenterColor.Current.ButtomLine;
@@ -165,8 +161,8 @@
//寮�
var rowOpen = new FrameRowControl();
rowOpen.Y = Application.GetRealHeight(69);
- rowOpen.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
- rowOpen.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
+ rowOpen.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowOpen.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
detailBackFrame.AddChidren(rowOpen);
var btnOpen = rowOpen.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleOpen), 400);
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -177,8 +173,8 @@
//鍏�
var rowClose = new FrameRowControl();
rowClose.Y = btnLine2.Bottom + Application.GetRealHeight(12);
- rowClose.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
- rowClose.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
+ rowClose.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowClose.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
detailBackFrame.AddChidren(rowClose);
var btnClose = rowClose.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleClose), 400);
btnClose.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -209,7 +205,7 @@
seekBar.Enable = true;
if (seekBar.Progress == 0)
{
- seekBar.Progress = MaxValue;
+ seekBar.Progress = 100;
btnPersent.Text = "100%";
}
@@ -275,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>();
--
Gitblit v1.8.0