From 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 八月 2020 19:53:49 +0800
Subject: [PATCH] 发布到商店的版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index e396d32..3a1e9a5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -151,8 +151,7 @@
                 //璁剧疆杩涘害鍊�
                 ProgressFormBar.Current.SetValue(i + 1, listFileCount);
             }
-            //鍏抽棴杩涘害鏉�
-            ProgressFormBar.Current.Close();
+
             //鍏佽鎸夌郴缁熺殑杩斿洖閿�
             Shared.Common.CommonPage.BackKeyCanClick = true;
             UserCenterResourse.AccountOption.AppCanSignout = true;
@@ -242,6 +241,7 @@
             List<string> listAllFile = null;
             //鏂囦欢澶圭殑鍏ㄨ矾寰�
             string fullDir = string.Empty;
+            string localTemplateName = string.Empty;
             if (upPath == string.Empty)
             {
                 //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
@@ -249,7 +249,8 @@
                 var templateFile = TemplateData.TemplateCommonLogic.Current.SaveTemplateDataToFile(templateName, "HomeTemplate");
 
                 //灏嗘ā鏉縝in鏂囦欢绉诲姩鍒板浠芥枃浠跺す涓�
-                try { System.IO.File.Move(templateFile, System.IO.Path.Combine(Config.Instance.FullPath, templateName)); }
+                localTemplateName = System.IO.Path.Combine(Config.Instance.FullPath, templateName);
+                try { System.IO.File.Move(templateFile, localTemplateName); }
                 catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex, "绉诲姩妯℃澘澶辫触"); }
 
                 //鑾峰彇鏈湴鏂囦欢
@@ -314,6 +315,11 @@
                     //鍏佽鎸夌郴缁熺殑杩斿洖閿�
                     Shared.Common.CommonPage.BackKeyCanClick = true;
                     UserCenterResourse.AccountOption.AppCanSignout = true;
+                    if (localTemplateName != string.Empty)
+                    {
+                        //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+                        HdlFileLogic.Current.DeleteFile(localTemplateName);
+                    }
                     return false;
                 }
                 //鏁寸悊鏁版嵁
@@ -334,6 +340,11 @@
                     //鍏佽鎸夌郴缁熺殑杩斿洖閿�
                     Shared.Common.CommonPage.BackKeyCanClick = true;
                     UserCenterResourse.AccountOption.AppCanSignout = true;
+                    if (localTemplateName != string.Empty)
+                    {
+                        //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+                        HdlFileLogic.Current.DeleteFile(localTemplateName);
+                    }
                     return false;
                 }
                 //璁剧疆杩涘害鍊�
@@ -351,6 +362,11 @@
                     //鍏佽鎸夌郴缁熺殑杩斿洖閿�
                     Shared.Common.CommonPage.BackKeyCanClick = true;
                     UserCenterResourse.AccountOption.AppCanSignout = true;
+                    if (localTemplateName != string.Empty)
+                    {
+                        //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+                        HdlFileLogic.Current.DeleteFile(localTemplateName);
+                    }
                     return false;
                 }
 
@@ -366,10 +382,21 @@
                     //鍏佽鎸夌郴缁熺殑杩斿洖閿�
                     Shared.Common.CommonPage.BackKeyCanClick = true;
                     UserCenterResourse.AccountOption.AppCanSignout = true;
+                    if (localTemplateName != string.Empty)
+                    {
+                        //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+                        HdlFileLogic.Current.DeleteFile(localTemplateName);
+                    }
                     return false;
                 }
                 //璁剧疆杩涘害鍊�
                 ProgressFormBar.Current.SetValue(i + 1 + listNormalFile.Count, listFileCount);
+            }
+
+            if (localTemplateName != string.Empty)
+            {
+                //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+                HdlFileLogic.Current.DeleteFile(localTemplateName);
             }
 
             //杩涘害鏉″叧闂�
@@ -761,6 +788,12 @@
                 //鏄剧ず璁惧鍘嗗彶鐗堟湰(Debug鐢�)
                 UserCenterResourse.HideOption.DeviceHistory = 1;
             }
+            checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.StartDebugAppFile + UserCenterResourse.UserInfo.Account);
+            if (listFile.Contains(checkKeys) == true)
+            {
+                //寮�鍚悗鍙拌皟璇旳pp鍔熻兘(Debug鐢�)
+                UserCenterResourse.HideOption.StartDebugApp = 1;
+            }
 
             //鎭㈠
             IMessageCommon.Current.IgnoreError = false;
@@ -789,8 +822,6 @@
                 ProgressFormBar.Current.Close();
                 return false;
             }
-            //鍏抽棴杩涘害鏉�
-            ProgressFormBar.Current.Close();
 
             //娓呯┖鍏ㄩ儴鎴块棿
             HdlRoomLogic.Current.DeleteAllRoom();
@@ -811,6 +842,9 @@
             //鍒锋柊鏈湴缂撳瓨
             UserCenterLogic.RefreshAllMemory();
 
+            //鍏抽棴杩涘害鏉�
+            ProgressFormBar.Current.Close();
+
             return true;
         }
 

--
Gitblit v1.8.0