From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 24 十月 2019 14:32:30 +0800 Subject: [PATCH] 完全合并了Wjc,Xm 的 代码 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs index 5e03dc6..1a83c35 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs @@ -341,15 +341,15 @@ await HdlShardLogic.Current.SynchronizeDeleteSharedContent(); return 0; } - //鍒涘缓涓�涓┖鏂囦欢 - var file = System.IO.File.Create(checkFile); - file.Close(); //鏆傛椂涓嶆敮鎸佹垚鍛� if (UserCenterResourse.UserInfo.AuthorityNo == 3) { //鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭 await HdlShardLogic.Current.SynchronizeDbSharedContent(); + //鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾) + var file = System.IO.File.Create(checkFile); + file.Close(); return 1; } @@ -357,14 +357,15 @@ var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1); if (data == null) { - //寮傚父,鍒犻櫎妫�娴嬫枃浠� - System.IO.File.Delete(checkFile); return -1; } if (data.Count == 0) { //鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭 await HdlShardLogic.Current.SynchronizeDbSharedContent(); + //鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾) + var file = System.IO.File.Create(checkFile); + file.Close(); return 1; } //鑷姩澶囦唤鍙湁涓�涓� @@ -390,6 +391,11 @@ //鍚屾鏈嶅姟鍣ㄧ殑鍙栨秷浜嗙殑鍒嗕韩鍐呭 await HdlShardLogic.Current.SynchronizeDeleteSharedContent(); + + //鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾) + var file2 = System.IO.File.Create(checkFile); + file2.Close(); + return 1; } -- Gitblit v1.8.0