From f4b178e64fd43262872fe9d443aa9da6048ceaac Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 17:57:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/DAL/FileUtils.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/DAL/FileUtils.cs b/HDL_ON/DAL/FileUtils.cs
index c53b73f..fdc2ac8 100644
--- a/HDL_ON/DAL/FileUtils.cs
+++ b/HDL_ON/DAL/FileUtils.cs
@@ -1,13 +1,8 @@
锘縰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
{
@@ -15,6 +10,17 @@
{
public static string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
+ /// <summary>
+ /// 鏄惁瀛樺湪鏂囦欢澶�
+ /// </summary>
+ /// <returns></returns>
+ public static bool IsExisFolder(string folderName)
+ {
+ bool result = false;
+ var path = Path.Combine(RootPath, folderName);
+ result = Directory.Exists(path);
+ return result;
+ }
/// <summary>
/// 鍒涘缓涓�涓綇瀹呯殑澶囦唤鏂囦欢澶�
/// </summary>
@@ -45,7 +51,6 @@
foreach (var fileName in ReadRegionFiles(path))
{
File.Delete(Path.Combine(path, fileName));
- MainPage.Log("Del region file :" + fileName);
}
}
@@ -79,7 +84,7 @@
{
continue;
}
- if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "Register_File" || NextFile.Name == "AccountListDB")
+ if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "UserInfo_File" || NextFile.Name == "AccountListDB")
{
continue;
}
@@ -207,10 +212,9 @@
for (int j = 0; j < filesList.Count; j++)
{
var f = filesList[j];
- if (f == "linphonerc" || f == "AccountListDB" || f == "Register_File")
+ if (f == "linphonerc" || f == "AccountListDB" || f == "UserInfo_File")
continue;
DeleteFile(f);
- MainPage.Log($"Del file :{f}");
}
}
@@ -434,7 +438,7 @@
FileStream fs = null;
try
{
- HDL_ON.DAL.Net.MyWebClient webClient = new HDL_ON.DAL.Net.MyWebClient();
+ MyWebClient webClient = new MyWebClient();
byte[] recevieBytes = webClient.DownloadData(new Uri(url));
fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
fs.Write(recevieBytes, 0, recevieBytes.Length);
--
Gitblit v1.8.0