From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 04a1926..7d859aa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -850,11 +850,11 @@
                 ProgressBar.SetAppendText(string.Empty);
 
                 //0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
-                if (result == 0)
-                {
-                    //寮�鍚嚜鍔ㄥ浠芥彁绀�
-                    //HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
-                }
+                //if (result == 0)
+                //{
+                //    //寮�鍚嚜鍔ㄥ浠芥彁绀�
+                //    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
+                //}
             }
 
             //鎭㈠鍙叧闂繘搴︽潯
@@ -1153,7 +1153,7 @@
             Global.CreateEmptyDirectory(directory);
 
             //鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
-            if (!System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath))
+            if (UserCenterResourse.Option.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath))
             {
                 System.IO.Directory.CreateDirectory(UserCenterResourse.Option.UserPictruePath);
             }

--
Gitblit v1.8.0