From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs
similarity index 91%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs
index bad19fa..080c2d0 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlFileLogic.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 鏂囦欢鎿嶄綔鐨勯�昏緫
@@ -39,36 +39,33 @@
/// </summary>
public void CreatAllUserCenterDirectory()
{
+ //鐢ㄦ埛淇℃伅銆愭枃浠跺す銆�
+ this.CreateDirectory(HdlFileNameResourse.AccountDirectory);
+
//鏈湴缂撳瓨鐨勬牴鐩綍
- this.CreateDirectory(DirNameResourse.LocalMemoryDirectory);
+ this.CreateDirectory(HdlFileNameResourse.LocalMemoryDirectory);
//鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
- this.CreateDirectory(DirNameResourse.AutoBackupDirectory);
+ this.CreateDirectory(HdlFileNameResourse.AutoBackupDirectory);
//鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
- this.CreateDirectory(DirNameResourse.AutoBackupdeleteDirectory);
+ this.CreateDirectory(HdlFileNameResourse.AutoBackupdeleteDirectory);
//涓嬭浇澶囦唤鐨勬椂鍊欐墍浣跨敤鐨勪复鏃躲�愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.DownLoadBackupTempDirectory);
+ this.CreateDirectory(HdlFileNameResourse.DownLoadBackupTempDirectory);
//淇濆瓨瀹夐槻璁板綍鐨勩�愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.SafeguardAlarmDirectory);
+ this.CreateDirectory(HdlFileNameResourse.SafeguardAlarmDirectory);
//涓嬭浇鍒嗕韩鏂囦欢鐨勪复鏃躲�愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.DownLoadShardDirectory);
-
- //LOG鍑哄姏銆愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.LogDirectory);
+ this.CreateDirectory(HdlFileNameResourse.DownLoadShardDirectory);
//妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.LocalTemplateDirectory);
- this.CreateDirectory(DirNameResourse.AllResidenceTemplateDirectory);
+ this.CreateDirectory(HdlFileNameResourse.LocalTemplateDirectory);
+ this.CreateDirectory(HdlFileNameResourse.AllResidenceTemplateDirectory);
//鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
- if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty)
- {
- this.CreateDirectory(UserCenterResourse.AccountOption.UserPictruePath);
- }
+ this.CreateDirectory(HdlFileNameResourse.UserPictrueDirectory);
}
#endregion
@@ -283,13 +280,13 @@
if (file.StartsWith("ModelData_") == true)
{
//澶嶅埗妯℃澘鏁版嵁鏂囦欢鍒版寚瀹氭枃浠跺す
- TemplateData.TemplateCommonLogic.Current.CopyTemplateFileToLocalDirectory2(System.IO.Path.Combine(fulldirectory, file));
+ HdlTemplateCommonLogic.Current.CopyTemplateFileToLocalDirectory2(System.IO.Path.Combine(fulldirectory, file));
continue;
}
string oldFile = System.IO.Path.Combine(fulldirectory, file);
string newFile = System.IO.Path.Combine(rootPath, file);
//绉诲姩鏂囦欢
- this.MoveFileToDirectory(oldFile, newFile);
+ this.MoveFile(oldFile, newFile);
}
if (deleteDirectory == true)
{
@@ -349,7 +346,7 @@
/// </summary>
/// <param name="oldFile">鍘熸枃浠�</param>
/// <param name="newFile">鐩爣鏂囦欢</param>
- public void MoveFileToDirectory(string oldFile, string newFile)
+ public void MoveFile(string oldFile, string newFile)
{
if (System.IO.File.Exists(oldFile) == true)
{
@@ -357,6 +354,7 @@
if (System.IO.File.Exists(newFile) == true)
{
this.CopyFile(oldFile, newFile);
+ return;
}
try
{
--
Gitblit v1.8.0