From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
similarity index 84%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlAutoBackupLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
index e0e906f..0997e67 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlAutoBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鑷姩澶囦唤鐨勯�昏緫
@@ -66,28 +66,6 @@
/// <returns></returns>
private static bool UpLoadBackupFileToDB(List<string> listFile)
{
- //鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var listBackData = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鑷姩澶囦唤);
- if (listBackData == null)
- {
- return false;
- }
- string strBackId = string.Empty;
- if (listBackData.Count == 0)
- {
- //鍒涘缓涓�涓柊鐨勫浠�
- strBackId = HdlBackupLogic.Current.CreatNewBackupNameToDB("AutoBackup", BackUpMode.A鑷姩澶囦唤);
- if (strBackId == null)
- {
- return false;
- }
- }
- else
- {
- //鑷姩澶囦唤鍙湁涓�涓�
- strBackId = listBackData[0].Id;
- }
-
string localPath = Config.Instance.FullPath;
//灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
@@ -121,14 +99,22 @@
for (int i = 0; i < listUpFile.Count; i++)
{
string file = listUpFile[i];
- //璇诲彇鏂囦欢鍐呭
- var fileContent = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(localPath, file));
- if (fileContent == null)
+ var datainfo = new FileInfoData();
+ datainfo.BackupFileName = file;
+ datainfo.BackupFileContent = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(localPath, file));
+ if (datainfo.BackupFileContent == null)
{
continue;
}
- //鎵ц涓婁紶
- var falge = HdlBackupLogic.Current.DoUpLoadInfoToDB(strBackId, file, fileContent);
+
+ var upData = new UpLoadDataPra();
+ upData.HomeId = Config.Instance.Home.Id;
+ upData.UploadSubFileLists = new List<FileInfoData> { datainfo };
+ //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
+ upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ //鎵ц鏄笂浼�
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/HomeAppAutoDataBackup", true, upData, null, true);
if (falge == false)
{
return false;
@@ -141,7 +127,7 @@
HdlFileLogic.Current.DeleteFile(localTemplateName);
//鍒犻櫎鏂囦欢
- var backPath = HdlFileNameResourse.AutoBackupDirectory;
+ var backPath = DirNameResourse.AutoBackupDirectory;
foreach (var file in listFile)
{
string fullName = System.IO.Path.Combine(backPath, file);
@@ -164,20 +150,29 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鑷姩澶囦唤);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null || data.Count == 0)
{
return true;
}
//鑷姩澶囦唤鍙湁涓�涓�
- var result = HdlBackupLogic.Current.DeleteDbBackupData(data[0].Id);
- if (result == false)
+ var autoBackupId = data[0].Id;
+
+ var upData = new DeleteFilePra();
+ upData.BackupClassId = autoBackupId;
+ upData.HomeId = Config.Instance.Home.Id;
+ upData.DeleteFileNameLists = listData;
+ //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
+ upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/DeleteAppBackupFile", true, upData);
+ if (falge == false)
{
return false;
}
//鍒犻櫎鏂囦欢
- var backPath = HdlFileNameResourse.AutoBackupdeleteDirectory;
+ var backPath = DirNameResourse.AutoBackupdeleteDirectory;
foreach (var file in listData)
{
string fullName = System.IO.Path.Combine(backPath, file);
@@ -196,7 +191,7 @@
/// <returns></returns>
public static List<string> GetAutoBackupEditorFile()
{
- return HdlFileLogic.Current.GetFileFromDirectory(HdlFileNameResourse.AutoBackupDirectory);
+ return HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupDirectory);
}
/// <summary>
@@ -205,7 +200,7 @@
/// <returns></returns>
public static List<string> GetAutoBackupDeleteFile()
{
- return HdlFileLogic.Current.GetFileFromDirectory(HdlFileNameResourse.AutoBackupdeleteDirectory);
+ return HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupdeleteDirectory);
}
#endregion
@@ -220,7 +215,7 @@
{
fileName = System.IO.Path.GetFileName(fileName);
//鑷姩澶囦唤鐩綍
- string strBackPath = HdlFileNameResourse.AutoBackupDirectory;
+ string strBackPath = DirNameResourse.AutoBackupDirectory;
if (System.IO.Directory.Exists(strBackPath) == false)
{
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
@@ -228,7 +223,7 @@
}
//鑷姩鍒犻櫎澶囦唤鐩綍
- string strdelBackPath = HdlFileNameResourse.AutoBackupdeleteDirectory;
+ string strdelBackPath = DirNameResourse.AutoBackupdeleteDirectory;
//濡傛灉鍒犻櫎鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
string delFile = System.IO.Path.Combine(strdelBackPath, fileName);
HdlFileLogic.Current.DeleteFile(delFile);
@@ -248,7 +243,7 @@
{
fileName = System.IO.Path.GetFileName(fileName);
//鑷姩鍒犻櫎澶囦唤鐩綍
- string strBackPath = HdlFileNameResourse.AutoBackupdeleteDirectory;
+ string strBackPath = DirNameResourse.AutoBackupdeleteDirectory;
string newFile = System.IO.Path.Combine(strBackPath, fileName);
//鍒涘缓涓�涓┖鏂囦欢
@@ -256,7 +251,7 @@
file.Close();
//鑷姩澶囦唤鐩綍
- strBackPath = HdlFileNameResourse.AutoBackupDirectory;
+ strBackPath = DirNameResourse.AutoBackupDirectory;
//濡傛灉澶囦唤鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
string delFile = System.IO.Path.Combine(strBackPath, fileName);
@@ -274,14 +269,14 @@
public static int SynchronizeDbAutoBackupData()
{
//鏆傛椂涓嶆敮鎸佹垚鍛�
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
HdlShardLogic.Current.SynchronizeDbSharedContent();
return 1;
}
//鍒ゆ柇鏄惁鑳藉鍚屾鏁版嵁
- string checkFile = HdlFileNameResourse.AutoDownLoadBackupCheckFile;
+ string checkFile = DirNameResourse.AutoDownLoadBackupCheckFile;
//濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
if (System.IO.File.Exists(checkFile) == true)
{
@@ -289,12 +284,12 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var listData = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鑷姩澶囦唤);
- if (listData == null)
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ if (data == null)
{
return -1;
}
- if (listData.Count == 0)
+ if (data.Count == 0)
{
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file = System.IO.File.Create(checkFile);
@@ -302,7 +297,7 @@
return 2;
}
//鑷姩澶囦唤鍙湁涓�涓�
- string backId = listData[0].Id;
+ string backId = data[0].Id;
//璐﹀彿鏁版嵁鍚屾涓�
ProgressFormBar.Current.Start();
@@ -330,7 +325,7 @@
file2.Close();
//閲嶆柊鍒锋柊浣忓畢瀵硅薄
- HdlUserCenterLogic.Current.RefreshHomeObject();
+ UserCenterLogic.RefreshHomeObject();
//鏍规嵁妯℃澘鏂囦欢,鎭㈠鏁版嵁
TemplateData.TemplateCommonLogic.Current.RecoverDataByTemplateBinFile();
//寮哄埗鐢熸垚璁惧鍜岀綉鍏虫枃浠�
@@ -352,12 +347,12 @@
public static void DeleteAllAutoBackupFile()
{
//娓呯┖鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
- string dirPath = HdlFileNameResourse.AutoBackupDirectory;
+ string dirPath = DirNameResourse.AutoBackupDirectory;
HdlFileLogic.Current.DeleteDirectory(dirPath);
HdlFileLogic.Current.CreateDirectory(dirPath, true);
//娓呯┖鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
- dirPath = HdlFileNameResourse.AutoBackupdeleteDirectory;
+ dirPath = DirNameResourse.AutoBackupdeleteDirectory;
HdlFileLogic.Current.DeleteDirectory(dirPath);
HdlFileLogic.Current.CreateDirectory(dirPath, true);
}
@@ -374,7 +369,7 @@
public static void SaveBackupNotPrompted(bool notPrompted, int day = -1)
{
//鏂囦欢鍏ㄨ矾寰�
- string fullName = HdlFileNameResourse.AutoBackupNotPromptedFile;
+ string fullName = DirNameResourse.AutoBackupNotPromptedFile;
BackupNotPrompted info = null;
if (System.IO.File.Exists(fullName) == true)
{
@@ -401,7 +396,7 @@
/// </summary>
public static void ShowAutoBackupPromptedForm()
{
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鏆備笉鏀寔鎴愬憳
return;
@@ -417,7 +412,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- var form = new UserCenter.HdlBackup.HdlAutoBackupForm();
+ var form = new HdlBackup.HdlAutoBackupForm();
form.AddForm();
});
}
@@ -429,7 +424,7 @@
/// <returns></returns>
private static bool CheckAutoBackupFileIsChanged()
{
- List<string> listFile1 = HdlFileLogic.Current.GetFileFromDirectory(HdlFileNameResourse.AutoBackupDirectory);
+ List<string> listFile1 = HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupDirectory);
List<string> listFile2 = GetAutoBackupDeleteFile();
if (listFile1.Count == 0 && listFile2.Count == 0)
@@ -462,7 +457,7 @@
private static bool CheckCanShowAutoBackupForm()
{
//鏂囦欢鍏ㄨ矾寰�
- string fullName = HdlFileNameResourse.AutoBackupNotPromptedFile;
+ string fullName = DirNameResourse.AutoBackupNotPromptedFile;
if (System.IO.File.Exists(fullName) == false)
{
//鏈湴娌℃湁瀛樺湪杩欎釜鏂囦欢
--
Gitblit v1.8.0