From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs |   89 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/DataCorrectionForm.cs
index d0abc06..a3e829a 100755
--- 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 鈻� 鍒濆鍖朹___________________________ 
@@ -179,35 +187,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 +320,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();
@@ -340,8 +395,6 @@
                 catch { }
             });
         }
-        #endregion
-
-
+        #endregion  
     }
 }

--
Gitblit v1.8.0