From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/FileUtils.cs | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/DAL/FileUtils.cs b/HDL_ON/DAL/FileUtils.cs
index 9104bcc..6330ee5 100644
--- a/HDL_ON/DAL/FileUtils.cs
+++ b/HDL_ON/DAL/FileUtils.cs
@@ -1,13 +1,7 @@
锘縰sing System;
using System.IO;
using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using Shared;
-//using HDL_ON.UI;
-using HDL_ON.DAL.Net;
-using HDL_ON.DAL;
-using HDL_ON.Entity;
namespace HDL_ON
{
@@ -85,11 +79,11 @@
foreach (FileInfo NextFile in thFolders)
{
index++;
- if (NextFile.Name == "headImage.png")
+ if (NextFile.Name.Contains(ImageUtlis.HEADIMAGE))
{
continue;
}
- if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "UserInfo_File" || NextFile.Name == "AccountListDB")
+ if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "UserInfo_File" || NextFile.Name == "AccountListDB" || NextFile.Name == OnAppConfig.ConfigFile)
{
continue;
}
@@ -200,7 +194,7 @@
/// <param name="fileName">File name.</param>
public static void DeleteFile(string fileName)
{
- if (fileName == null || fileName == "Language.ini" || fileName == "AccountListDB")
+ if (fileName == null || fileName == "Language.ini" || fileName == "AccountListDB" || fileName == OnAppConfig.ConfigFile)
{
return;
}
@@ -217,7 +211,7 @@
for (int j = 0; j < filesList.Count; j++)
{
var f = filesList[j];
- if (f == "linphonerc" || f == "AccountListDB" || f == "UserInfo_File")
+ if (f == "linphonerc" || f == "AccountListDB" || f == "UserInfo_File" || f == OnAppConfig.ConfigFile)
continue;
DeleteFile(f);
}
@@ -412,6 +406,21 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="imagePath"></param>
+ public static void FileCopyToRootPath(string oldPath, string fileName)
+ {
+ System.IO.FileInfo fileInfo = new System.IO.FileInfo(oldPath);
+ if (fileInfo.Exists)
+ {
+ fileInfo.CopyTo(Path.Combine(RootPath, fileName), true);
+ //Utlis.WriteLine("FileCopyToRootPath : " + Path.Combine(RootPath, fileName));
+ }
+ }
+
///// <summary>
///// 涓嬭浇鐢靛彴銆侀煶涔愩�丏LNA绛夌瓑缃戠粶鍥剧墖
///// </summary>
--
Gitblit v1.8.0