From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
old mode 100644
new mode 100755
index 238f5df..591b6fa
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
@@ -21,6 +21,14 @@
/// 鏍℃婀垮害鍊�
/// </summary>
double correctHValue = 0;
+ /// <summary>
+ /// 鏈夋晥鏂囨湰
+ /// </summary>
+ private string invalidText1 = "";
+ /// <summary>
+ /// 鏈夋晥鏂囨湰
+ /// </summary>
+ private string invalidText2 = "";
#endregion
#region 鈻� 鍒濆鍖朹___________________________
@@ -145,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) =>
@@ -179,35 +189,66 @@
correctHValue = curV;
}
}
+ if (curIndex == 0)
+ {
+ invalidText1 = btnNum.Text;
+ }
+ else
+ {
+ invalidText2 = btnNum.Text;
+ }
+
};
btnReduction.MouseDownEventHandler += async (sender, e) =>
{
- double vTemp = double.Parse(btnNum.Text);
- vTemp -= 0.1;
- btnNum.Text = vTemp.ToString();
+ 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);
+ }
+ }
if (curIndex == 0)
- {
- correctTValue = double.Parse(btnNum.Text);
+ {
+ invalidText1 = btnNum.Text;
}
else
- {
- correctHValue = double.Parse(btnNum.Text);
- }
+ {
+ invalidText2 = btnNum.Text;
+ }
};
btnAdd.MouseDownEventHandler += async (sender, e) =>
{
- double vTemp = double.Parse(btnNum.Text);
- vTemp += 0.1;
- btnNum.Text = vTemp.ToString();
+ 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);
+ }
+ }
if (curIndex == 0)
- {
- correctTValue = double.Parse(btnNum.Text);
+ {
+ invalidText1 = btnNum.Text;
}
else
- {
- correctHValue = double.Parse(btnNum.Text);
+ {
+ invalidText2 = btnNum.Text;
}
};
}
@@ -281,6 +322,22 @@
{
try
{
+ if (string.IsNullOrEmpty(invalidText1) )
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.TNumTip), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+ if ( string.IsNullOrEmpty(invalidText2))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.HNumTip), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Start();
--
Gitblit v1.8.0