From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp20200825/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
similarity index 97%
rename from ZigbeeApp20200825/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
index 80f8dfb..89ecc4c 100644
--- a/ZigbeeApp20200825/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
@@ -23,12 +23,12 @@
double correctHValue = 0;
/// <summary>
/// 鏈夋晥鏂囨湰
- /// </summary>
+ /// </summary>
private string invalidText1 = "";
/// <summary>
/// 鏈夋晥鏂囨湰
- /// </summary>
- private string invalidText2 = "";
+ /// </summary>
+ private string invalidText2 = "";
#endregion
#region 鈻� 鍒濆鍖朹___________________________
@@ -153,12 +153,14 @@
{
devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
btnName.Text = Language.StringByID(R.MyInternationalizationString.Temperature) + " (鈩�)";
+ invalidText1 = btnNum.Text;
}
else
{
line2.Visible = false;
devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
btnName.Text = Language.StringByID(R.MyInternationalizationString.Humidity) + " (%)";
+ invalidText2 = btnNum.Text;
}
btnNum.TextChangeEventHandler += (sender, e) =>
@@ -194,25 +196,25 @@
else
{
invalidText2 = btnNum.Text;
- }
-
+ }
+
};
btnReduction.MouseDownEventHandler += async (sender, e) =>
{
- if(!string.IsNullOrEmpty(btnNum.Text))
+ if (!string.IsNullOrEmpty(btnNum.Text))
{
double vTemp = double.Parse(btnNum.Text);
vTemp -= 0.1;
btnNum.Text = vTemp.ToString();
if (curIndex == 0)
- {
+ {
correctTValue = double.Parse(btnNum.Text);
}
else
- {
- correctHValue = double.Parse(btnNum.Text);
- }
+ {
+ correctHValue = double.Parse(btnNum.Text);
+ }
}
if (curIndex == 0)
{
@@ -221,7 +223,7 @@
else
{
invalidText2 = btnNum.Text;
- }
+ }
};
btnAdd.MouseDownEventHandler += async (sender, e) =>
@@ -232,11 +234,11 @@
vTemp += 0.1;
btnNum.Text = vTemp.ToString();
if (curIndex == 0)
- {
+ {
correctTValue = double.Parse(btnNum.Text);
}
else
- {
+ {
correctHValue = double.Parse(btnNum.Text);
}
}
@@ -320,7 +322,7 @@
{
try
{
- if (string.IsNullOrEmpty(invalidText1) )
+ if (string.IsNullOrEmpty(invalidText1))
{
Application.RunOnMainThread(() =>
{
@@ -328,7 +330,7 @@
});
return;
}
- if ( string.IsNullOrEmpty(invalidText2))
+ if (string.IsNullOrEmpty(invalidText2))
{
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0