From 5428935270159bfc42c2934ed7fb1091554fc9a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 七月 2020 17:12:42 +0800
Subject: [PATCH] 修改了 sokect
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 104 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index b966e9a..5dc54a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -96,8 +96,8 @@
UserCenterResourse.AccountOption.AppCanSignout = false;
//棣栧厛鍏堝垱寤轰竴涓复鏃舵枃浠跺す,瀛樺湪鏂囦欢鍒欐竻绌�
- string newDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadBackupTempDirectory);
- Global.CreateEmptyDirectory(newDir, true);
+ string newDir = DirNameResourse.DownLoadBackupTempDirectory;
+ HdlFileLogic.Current.CreateDirectory(newDir, true);
//鑾峰彇杩欎釜澶囦唤涓嬮潰鏈夊灏戜釜鏂囦欢
List<string> listFile = GetBackFileIDFromDB(BackupClassId, IsGatewayAutoBackup, ZigbeeUniqueId);
@@ -147,7 +147,7 @@
return null;
}
//灏嗚緭鍏ュ啓鍏ユ湰鍦扮殑涓存椂鏂囦欢澶�
- Global.WriteFileToDirectoryByBytes(newDir, fileName, result);
+ HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(newDir, fileName), System.Text.Encoding.UTF8.GetString(result));
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listFileCount);
}
@@ -246,11 +246,11 @@
{
//鑾峰彇鏈湴鏂囦欢
listAllFile = Global.FileListByHomeId();
- fullDir = UserCenterLogic.CombinePath();
+ fullDir = Common.Config.Instance.FullPath;
}
else
{
- listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ listAllFile = HdlFileLogic.Current.GetFileFromDirectory(upPath);
fullDir = upPath;
}
if (listAllFile.Count == 0)
@@ -265,7 +265,8 @@
foreach (string fileName in listAllFile)
{
- if (fileName.EndsWith(".png") == true)
+ if (fileName.EndsWith(".png") == true
+ || fileName.EndsWith(".bin") == true)
{
//鍥剧墖鏂囦欢
listPicFile.Add(fileName);
@@ -311,7 +312,7 @@
var datainfo = new FileInfoData();
datainfo.BackupFileName = file;
string fullFileName = System.IO.Path.Combine(fullDir, file);
- datainfo.BackupFileContent = Shared.IO.FileUtils.ReadFile(fullFileName);
+ datainfo.BackupFileContent = HdlFileLogic.Current.ReadFileByteContent(fullFileName);
var list = new List<FileInfoData>();
list.Add(datainfo);
@@ -529,8 +530,8 @@
/// <returns></returns>
public bool UpLoadLogBackup()
{
- string upPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory);
- if (HdlAutoBackupLogic.GetFileFromDirectory(upPath).Count == 0)
+ string upPath = DirNameResourse.LogDirectory;
+ if (HdlFileLogic.Current.GetFileFromDirectory(upPath).Count == 0)
{
//娌℃湁Log鏂囦欢
return true;
@@ -572,7 +573,7 @@
{
try
{
- var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ var listAllFile = HdlFileLogic.Current.GetFileFromDirectory(upPath);
if (listAllFile.Count > 10)
{
listAllFile.Sort();
@@ -594,6 +595,85 @@
});
return result;
+ }
+
+ /// <summary>
+ /// 涓婁紶涓滆タ鍒伴殣鍖垮姛鑳藉浠�
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="byteData"></param>
+ /// <returns></returns>
+ public bool UpLoadByteDataToOptionBackup(string fileName, byte[] byteData)
+ {
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg("姝ｅ湪涓婁紶鏂囦欢");
+
+ //浠庝簯绔幏鍙栨暟鎹�
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(0, null, true);
+ if (pageData == null)
+ {
+ ProgressFormBar.Current.Close();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鑾峰彇鍔熻兘澶囦唤澶辫触");
+ contr.Show();
+ });
+ return false;
+ }
+ string backId = string.Empty;
+ for (int i = 0; i < pageData.Count; i++)
+ {
+ if (pageData[i].BackupName == DirNameResourse.OptionBackupName)
+ {
+ //鑾峰彇鍔熻兘澶囦唤鐨処D
+ backId = pageData[i].Id;
+ break;
+ }
+ }
+ if (backId == string.Empty)
+ {
+ //鍒涘缓鏂扮殑澶囦唤
+ backId = this.CreatNewBackupNameToDB(DirNameResourse.OptionBackupName);
+ if (backId == null)
+ {
+ ProgressFormBar.Current.Close();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鍒涘缓鍔熻兘澶囦唤澶辫触");
+ contr.Show();
+ });
+ return false;
+ }
+ }
+ //涓婁紶Log鏂囦欢
+ var datainfo = new FileInfoData();
+ datainfo.BackupFileName = fileName;
+ datainfo.BackupFileContent = byteData;
+
+ var list = new List<FileInfoData>();
+ list.Add(datainfo);
+
+ //鎵ц涓婁紶
+ bool falge = DoUpLoadInfoToDB(backId, list, 0);
+ //鍏抽棴杩涘害鏉�
+ ProgressFormBar.Current.Close();
+
+ if (falge == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鏂囦欢涓婁紶鎴愬姛");
+ contr.Show();
+ });
+ return false;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鏂囦欢涓婁紶鎴愬姛");
+ contr.Show();
+ });
+
+ return true;
}
#endregion
@@ -705,10 +785,10 @@
ProgressFormBar.Current.Close();
//濡傛灉璇诲彇鍒扮殑鏂囦欢瀹屽叏娌℃湁闂锛屽垯娓呯悊鏈湴鐨勬枃浠�
- UserCenterLogic.DeleteAllLocationFile(false);
+ HdlFileLogic.Current.DeleteAllLocationFile(false);
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
- Global.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
+ HdlFileLogic.Current.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
//鍒犻櫎鍏ㄩ儴鐨勮嚜鍔ㄥ浠界殑鏈湴鏂囦欢(姝ゅ嚱鏁扮敤浜庤鍙栬嚜鍔ㄥ浠界殑鏃跺�欎娇鐢�)
HdlAutoBackupLogic.DeleteAllAutoBackupFile();
--
Gitblit v1.8.0