From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index e396d32..9265a5b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -242,6 +242,7 @@
List<string> listAllFile = null;
//鏂囦欢澶圭殑鍏ㄨ矾寰�
string fullDir = string.Empty;
+ string localTemplateName = string.Empty;
if (upPath == string.Empty)
{
//灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
@@ -249,7 +250,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 +316,11 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
}
//鏁寸悊鏁版嵁
@@ -334,6 +341,11 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
}
//璁剧疆杩涘害鍊�
@@ -351,6 +363,11 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
}
@@ -366,10 +383,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 +789,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;
--
Gitblit v1.8.0