From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 4c0144d..8cbd451 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -420,12 +420,9 @@
nvc.Add("ManualBackupType", ManualBackupType.ToString());
nvc.Add("IsOtherAccountCtrl", Common.Config.Instance.isAdministrator.ToString());
- for (int i = 0; i < listPicFile.Count; i++)
- {
- string base64 = GetBase64Text(fullName);
- nvc.Add("UploadSubFileLists[" + i + "].BackupFileName", fileName);
- nvc.Add("UploadSubFileLists[" + i + "].BackupFileContent", base64);
- }
+ string base64 = GetBase64Text(fullName);
+ nvc.Add("UploadSubFileLists[0].BackupFileName", fileName);
+ nvc.Add("UploadSubFileLists[0].BackupFileContent", base64);
bool result = UpLoadBigBackupFileToDB("App/UploadHomeAppGatewaySubFiles", fullName, nvc);
if (result == false)
@@ -577,12 +574,26 @@
{
try
{
- //鍒犻櫎鏈湴鍏ㄩ儴Log
- Global.CreateEmptyDirectory(Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory), true);
+ var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ if (listAllFile.Count > 10)
+ {
+ listAllFile.Sort();
+ while (listAllFile.Count >= 10)
+ {
+ System.IO.File.Delete(listAllFile[0]);
+ listAllFile.RemoveAt(0);
+ }
+ }
}
catch { }
}
ProgressFormBar.Current.Close();
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "Log涓婁紶鎴愬姛");
+ contr.Show();
+ });
return result;
}
@@ -638,17 +649,32 @@
IMessageCommon.Current.IgnoreError = false;
return false;
}
+ if (listFile.Count == 0)
+ {
+ //鎭㈠
+ IMessageCommon.Current.IgnoreError = false;
+ return true;
+ }
- if (listFile.Contains(DirNameResourse.ShowOptionMenuFile) == true)
+ //妫�娴�
+ string checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.ShowOptionMenuFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
{
//鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�)
UserCenterResourse.HideOption.CenterHideMenu = 1;
}
- if (listFile.Contains(DirNameResourse.DetailedLogFile) == true)
+ checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.DetailedLogFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
{
//鍑哄姏璇︾粏Log(Debug鐢�)
UserCenterResourse.HideOption.DetailedLog = 1;
}
+ checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.DeviceHistoryFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
+ {
+ //鏄剧ず璁惧鍘嗗彶鐗堟湰(Debug鐢�)
+ UserCenterResourse.HideOption.DeviceHistory = 1;
+ }
//鎭㈠
IMessageCommon.Current.IgnoreError = false;
--
Gitblit v1.8.0