From b78a4d0ca90416d37fcbaf5e54b00f7eaab53919 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 14 十月 2019 17:03:58 +0800
Subject: [PATCH] 2019-10-14-2

---
 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs |   60 ++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
index a4b8721..fa6d90c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
@@ -56,12 +56,11 @@
             listView.Height = bodyFrameLayout.Height;
             bodyFrameLayout.AddChidren(listView);
 
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 //浠庝簯绔幏鍙栨暟鎹�
                 this.SetBackupInfoToForm();
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -183,7 +182,7 @@
         /// <param name="BackupClassId"></param>
         private void LoadBackupInfo(string BackupClassId)
         {
-            new System.Threading.Thread(async () =>
+            HdlThreadLogic.Current.RunThread(async () =>
             {
                 //浠庝簯绔幏鍙栧浠界殑鏂囦欢
                 bool result = await HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
@@ -206,8 +205,7 @@
                 //鏂囦欢鎭㈠鎴愬姛
                 string msg = Language.StringByID(R.MyInternationalizationString.uFileRecoverSuccess);
                 this.ShowMassage(ShowMsgType.Normal, msg);
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -220,7 +218,7 @@
         /// <param name="backName"></param>
         private void UpLoadBackInfo(string backName)
         {
-            new System.Threading.Thread(async () =>
+            HdlThreadLogic.Current.RunThread(async () =>
             {
                 //鍒涘缓涓�涓浠藉悕瀛�
                 string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
@@ -247,14 +245,12 @@
                     return;
                 }
 
-                new System.Threading.Thread(() =>
+                HdlThreadLogic.Current.RunThread(() =>
                 {
                     //浠庝簯绔幏鍙栨暟鎹�
                     this.SetBackupInfoToForm();
-                })
-                { IsBackground = true }.Start();
-            })
-            { IsBackground = true }.Start();
+                });
+            });
         }
 
         #endregion
@@ -288,12 +284,11 @@
                 return;
             }
 
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 //浠庝簯绔幏鍙栨暟鎹�
                 this.SetBackupInfoToForm();
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -326,12 +321,11 @@
                 return;
             }
 
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 //浠庝簯绔幏鍙栨暟鎹�
                 this.SetBackupInfoToForm();
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -352,14 +346,13 @@
             dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
             //璇疯緭鍏ュ娉ㄥ悕绉�
             dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
-            dialogForm.InputText = fileInfo.BackupName;
+            dialogForm.Text = fileInfo.BackupName;
 
             //鎸変笅纭鎸夐挳
-            dialogForm.ComfirmClickEvent += (() =>
+            dialogForm.ComfirmClickEvent += ((textValue) =>
             {
-                string txtvalue = dialogForm.InputText;
                 //妫�娴嬪鑰冨悕绉�
-                if (this.CheckBackupName(txtvalue) == false)
+                if (this.CheckBackupName(textValue) == false)
                 {
                     return;
                 }
@@ -368,10 +361,10 @@
                 dialogForm.CloseDialog();
 
                 //鍚嶅瓧涓�鏍锋椂锛屼笉澶勭悊
-                if (txtvalue != fileInfo.BackupName)
+                if (textValue != fileInfo.BackupName)
                 {
                     //缂栬緫澶囦唤鍚嶇О
-                    this.EditorBackInfo(fileInfo.Id, txtvalue);
+                    this.EditorBackInfo(fileInfo.Id, textValue);
                 }
             });
         }
@@ -391,11 +384,10 @@
             dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
 
             //鎸変笅纭鎸夐挳
-            dialogForm.ComfirmClickEvent += (() =>
+            dialogForm.ComfirmClickEvent += ((textValue) =>
             {
-                string txtvalue = dialogForm.InputText;
                 //妫�娴嬪鑰冨悕绉�
-                if (this.CheckBackupName(txtvalue) == false)
+                if (this.CheckBackupName(textValue) == false)
                 {
                     return;
                 }
@@ -404,7 +396,7 @@
                 dialogForm.CloseDialog();
 
                 //涓婁紶澶囦唤
-                this.UpLoadBackInfo(txtvalue);
+                this.UpLoadBackInfo(textValue);
             });
         }
 
@@ -448,6 +440,18 @@
                 this.ShowMassage(ShowMsgType.Error, msg);
                 return false;
             }
+            if (backName.Contains("##") == true)
+            {
+                //瀛樺湪闈炴硶瀛楃銆�##銆�
+                string msg = Language.StringByID(R.MyInternationalizationString.uErrorFieldIsEsixt);
+                if (msg.Contains("{0}") == true)
+                {
+                    msg = string.Format(msg, "##");
+                }
+                this.ShowMassage(ShowMsgType.Error, msg);
+                return false;
+            }
+
             return true;
         }
         #endregion

--
Gitblit v1.8.0