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/HdlFileLogic.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
similarity index 92%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
index 21a4d5a..bad19fa 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鏂囦欢鎿嶄綔鐨勯�昏緫
@@ -39,33 +39,36 @@
/// </summary>
public void CreatAllUserCenterDirectory()
{
- //鐢ㄦ埛淇℃伅銆愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.AccountDirectory);
-
//鏈湴缂撳瓨鐨勬牴鐩綍
- this.CreateDirectory(HdlFileNameResourse.LocalMemoryDirectory);
+ this.CreateDirectory(DirNameResourse.LocalMemoryDirectory);
//鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
- this.CreateDirectory(HdlFileNameResourse.AutoBackupDirectory);
+ this.CreateDirectory(DirNameResourse.AutoBackupDirectory);
//鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
- this.CreateDirectory(HdlFileNameResourse.AutoBackupdeleteDirectory);
+ this.CreateDirectory(DirNameResourse.AutoBackupdeleteDirectory);
//涓嬭浇澶囦唤鐨勬椂鍊欐墍浣跨敤鐨勪复鏃躲�愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.DownLoadBackupTempDirectory);
+ this.CreateDirectory(DirNameResourse.DownLoadBackupTempDirectory);
//淇濆瓨瀹夐槻璁板綍鐨勩�愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.SafeguardAlarmDirectory);
+ this.CreateDirectory(DirNameResourse.SafeguardAlarmDirectory);
//涓嬭浇鍒嗕韩鏂囦欢鐨勪复鏃躲�愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.DownLoadShardDirectory);
+ this.CreateDirectory(DirNameResourse.DownLoadShardDirectory);
+
+ //LOG鍑哄姏銆愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.LogDirectory);
//妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.LocalTemplateDirectory);
- this.CreateDirectory(HdlFileNameResourse.AllResidenceTemplateDirectory);
+ this.CreateDirectory(DirNameResourse.LocalTemplateDirectory);
+ this.CreateDirectory(DirNameResourse.AllResidenceTemplateDirectory);
//鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
- this.CreateDirectory(HdlFileNameResourse.UserPictrueDirectory);
+ if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty)
+ {
+ this.CreateDirectory(UserCenterResourse.AccountOption.UserPictruePath);
+ }
}
#endregion
@@ -286,7 +289,7 @@
string oldFile = System.IO.Path.Combine(fulldirectory, file);
string newFile = System.IO.Path.Combine(rootPath, file);
//绉诲姩鏂囦欢
- this.MoveFile(oldFile, newFile);
+ this.MoveFileToDirectory(oldFile, newFile);
}
if (deleteDirectory == true)
{
@@ -346,7 +349,7 @@
/// </summary>
/// <param name="oldFile">鍘熸枃浠�</param>
/// <param name="newFile">鐩爣鏂囦欢</param>
- public void MoveFile(string oldFile, string newFile)
+ public void MoveFileToDirectory(string oldFile, string newFile)
{
if (System.IO.File.Exists(oldFile) == true)
{
@@ -354,7 +357,6 @@
if (System.IO.File.Exists(newFile) == true)
{
this.CopyFile(oldFile, newFile);
- return;
}
try
{
--
Gitblit v1.8.0