From a45fe56aeeac8f28a9891b83362954067c8166dc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 09:07:05 +0800
Subject: [PATCH] 请合并新代码，更改多功能面板绑定表重复问题
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index fffeefb..9265a5b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -242,8 +242,18 @@
List<string> listAllFile = null;
//鏂囦欢澶圭殑鍏ㄨ矾寰�
string fullDir = string.Empty;
+ string localTemplateName = string.Empty;
if (upPath == string.Empty)
{
+ //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
+ var templateName = TemplateData.TemplateCommonLogic.Current.GetNewTemplateFileName();
+ var templateFile = TemplateData.TemplateCommonLogic.Current.SaveTemplateDataToFile(templateName, "HomeTemplate");
+
+ //灏嗘ā鏉縝in鏂囦欢绉诲姩鍒板浠芥枃浠跺す涓�
+ localTemplateName = System.IO.Path.Combine(Config.Instance.FullPath, templateName);
+ try { System.IO.File.Move(templateFile, localTemplateName); }
+ catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex, "绉诲姩妯℃澘澶辫触"); }
+
//鑾峰彇鏈湴鏂囦欢
listAllFile = HdlFileLogic.Current.GetRootPathListFile();
fullDir = Common.Config.Instance.FullPath;
@@ -265,6 +275,11 @@
foreach (string fileName in listAllFile)
{
+ //鍒ゆ柇鎸囧畾鏂囦欢鏄惁闇�瑕佷笂浼�(鏍圭洰褰曠殑鎵嶅垽鏂�)
+ if (upPath == string.Empty && this.IsNotUpLoadFile(fileName) == true)
+ {
+ continue;
+ }
if (fileName.EndsWith(".png") == true
|| fileName.EndsWith(".bin") == true)
{
@@ -301,12 +316,12 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
- }
- //鍒ゆ柇鏄惁鏄簲璇ヤ笂浼犵殑鏂囦欢
- if (IsNotUpLoadFile(file) == true && upPath == string.Empty)
- {
- continue;
}
//鏁寸悊鏁版嵁
var datainfo = new FileInfoData();
@@ -326,6 +341,11 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
}
//璁剧疆杩涘害鍊�
@@ -343,6 +363,11 @@
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
+ if (localTemplateName != string.Empty)
+ {
+ //鍒犻櫎鎺夎繖涓ā鏉挎枃浠�
+ HdlFileLogic.Current.DeleteFile(localTemplateName);
+ }
return false;
}
@@ -358,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);
}
//杩涘害鏉″叧闂�
@@ -753,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;
@@ -784,8 +826,15 @@
//鍏抽棴杩涘害鏉�
ProgressFormBar.Current.Close();
+ //娓呯┖鍏ㄩ儴鎴块棿
+ HdlRoomLogic.Current.DeleteAllRoom();
+ //娓呯┖鏈湴鍏ㄩ儴鐨勫満鏅暟鎹�
+ HdlSceneLogic.Current.DeleteAllLocalScene();
//濡傛灉璇诲彇鍒扮殑鏂囦欢瀹屽叏娌℃湁闂锛屽垯娓呯悊鏈湴鐨勬枃浠�
HdlFileLogic.Current.DeleteAllLocationFile(false);
+
+ //娓呯悊鏈湴鐨勬ā鏉挎枃浠�
+ TemplateData.TemplateCommonLogic.Current.DeleteAllLocalFile();
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
HdlFileLogic.Current.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
@@ -829,11 +878,14 @@
/// </summary>
/// <param name="file"></param>
/// <returns></returns>
- public bool IsNotUpLoadFile(string file)
+ private bool IsNotUpLoadFile(string file)
{
- if (file == "Config.json")
+ if (file.StartsWith("Device_") == true
+ || file.StartsWith("Gateway_") == true
+ || file.StartsWith("Room_") == true
+ || file.StartsWith("Scene_") == true)
{
- //涓嶈兘瑕嗙洊Config鏂囦欢
+ //璁惧,缃戝叧,鎴块棿,鍦烘櫙鏂囦欢涓嶉渶瑕佷笂浼�,瀹冨凡缁忎繚瀛樺湪bin妯℃澘鏂囦欢涓�
return true;
}
return false;
--
Gitblit v1.8.0