From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Common/FileUtlis.cs | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Common/FileUtlis.cs b/HDL_ON/Common/FileUtlis.cs
index 0d3e2f2..d0a8977 100644
--- a/HDL_ON/Common/FileUtlis.cs
+++ b/HDL_ON/Common/FileUtlis.cs
@@ -6,7 +6,7 @@
namespace HDL_ON.Common
{
- public class FileUtlis
+ public class FileUtlis
{
static Common.FileUtlis _temp;
public static Common.FileUtlis Files
@@ -26,7 +26,8 @@
string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
string accountPath;
- string AccountPath {
+ string AccountPath
+ {
get
{
if (string.IsNullOrEmpty(accountPath) || !accountPath.Contains(UserInfo.Current.ID))
@@ -48,9 +49,13 @@
{
get
{
- if (string.IsNullOrEmpty(regionPath) || !regionPath.Contains(DB_ResidenceData.Instance.CurrentRegion.RegionID ))
+ if (DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.id == null)
{
- regionPath = Path.Combine(AccountPath, DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ return AccountPath;
+ }
+ if (string.IsNullOrEmpty(regionPath) || !regionPath.Contains(DB_ResidenceData.Instance.CurrentRegion.id))
+ {
+ regionPath = Path.Combine(AccountPath, DB_ResidenceData.Instance.CurrentRegion.id);
if (!Directory.Exists(regionPath))
{
Directory.CreateDirectory(regionPath);
@@ -228,8 +233,6 @@
}
}
-
-
public byte[] ReadFile(string fileName)
{
FileStream fs = null;
@@ -271,18 +274,55 @@
}
}
+ // 璇诲彇鎸囧畾璺緞鏂囦欢鍐呭
+ public byte[] ReadFileForPath(string path)
+ {
+ FileStream fs = null;
+ try
+ {
+ if (File.Exists(path))
+ {
+ fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+ }
+ else
+ {
+ return new byte[0];
+ }
+ byte[] bytes = new byte[fs.Length];
+ fs.Read(bytes, 0, bytes.Length);
+ return bytes;
+ }
+ catch
+ {
+ return new byte[0];
+ }
+ finally
+ {
+ try
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
+ catch
+ {
+ }
+ }
+ }
/// <summary>
/// 涓嬭浇缃戠粶鍥剧墖
/// </summary>
/// <param name="fileName"></param>
/// <param name="url"></param>
- public void DownLoadImage(string fileName, string url,Action action)
+ public void DownLoadImage(string fileName, string url, Action action)
{
if (!File.Exists(fileName))
{
- System.Threading.Tasks.Task.Run(() => {
+ System.Threading.Tasks.Task.Run(() =>
+ {
FileStream fs = null;
try
{
@@ -293,7 +333,8 @@
fs.Write(recevieBytes, 0, recevieBytes.Length);
fs.Flush();
}
- catch (Exception ex) {
+ catch (Exception ex)
+ {
MainPage.Log($"down image : {ex.Message}");
}
finally
@@ -306,6 +347,10 @@
}
});
}
+ else
+ {
+ action?.Invoke();
+ }
}
}
--
Gitblit v1.8.0