From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
index 47fbae8..2c0eff2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs
@@ -411,7 +411,7 @@
{
List<string> listAllFile = Global.FileListByHomeId();
- string strroot = UserCenterResourse.LocalRootPath;
+ string strroot = Common.Config.Instance.FullPath;
string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
foreach (string file in listAllFile)
{
@@ -440,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