From 305f57840fff5b7cb1914b35c56eaece618711e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 14 一月 2021 17:06:36 +0800
Subject: [PATCH] 2021-01-14 1. 修改判断当前值是否需要参与签名方法，保持跟云端一致
---
HDL_ON/Common/FileUtlis.cs | 121 ++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Common/FileUtlis.cs b/HDL_ON/Common/FileUtlis.cs
old mode 100644
new mode 100755
index 013e023..62136bd
--- a/HDL_ON/Common/FileUtlis.cs
+++ b/HDL_ON/Common/FileUtlis.cs
@@ -5,7 +5,7 @@
namespace HDL_ON.Common
{
- public class FileUtlis
+ public class FileUtlis
{
static Common.FileUtlis _temp;
public static Common.FileUtlis Files
@@ -23,6 +23,22 @@
/// 鏍圭洰褰�
/// </summary>
string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
+
+ string accountPath;
+ string AccountPath {
+ get
+ {
+ if (string.IsNullOrEmpty(accountPath) || !accountPath.Contains(UserInfo.Current.ID))
+ {
+ accountPath = Path.Combine(RootPath, UserInfo.Current.ID);
+ if (!Directory.Exists(accountPath))
+ {
+ Directory.CreateDirectory(accountPath);
+ }
+ }
+ return accountPath + "/";
+ }
+ }
/// <summary>
/// 浣忓畢鏂囦欢澶硅矾寰�
/// </summary>
@@ -31,9 +47,9 @@
{
get
{
- if (string.IsNullOrEmpty(regionPath))
+ if (string.IsNullOrEmpty(regionPath) || !regionPath.Contains(DB_ResidenceData.Instance.CurrentRegion.RegionID ))
{
- regionPath = Path.Combine(RootPath, DB_ResidenceData.residenceData.CurReginID);
+ regionPath = Path.Combine(AccountPath, DB_ResidenceData.Instance.CurrentRegion.RegionID);
if (!Directory.Exists(regionPath))
{
Directory.CreateDirectory(regionPath);
@@ -42,16 +58,9 @@
return regionPath + "/";
}
}
- /// <summary>
- /// 鐢ㄦ埛淇℃伅璺緞
- /// </summary>
- string userInfoPath
- {
- get
- {
- return "UserInfo_File";
- }
- }
+
+ //public List<>
+
/// <summary>
/// 閬嶅巻鏂囦欢
@@ -110,6 +119,90 @@
fs = new FileStream(Path.Combine(RegionPath, fileName), FileMode.Create, FileAccess.Write);
fs.Write(bytes, 0, bytes.Length);
fs.Flush();
+ MainPage.Log($"SaveFile:{fileName}");//Path:{RegionPath}
+ return true;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("FileUtiles Code 113:" + ex.ToString());
+ return false;
+ }
+ finally
+ {
+ try
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("FileUtils Code 121 :" + ex.ToString());
+ }
+ }
+ }
+ /// <summary>
+ /// 璇诲彇userInfo鏂囦欢
+ /// </summary>
+ /// <returns></returns>
+ public byte[] ReadAppConfig()
+ {
+ var fileName = "OnAppConfig";
+ FileStream fs = null;
+ try
+ {
+ if (File.Exists(Path.Combine(RootPath, fileName)))
+ {
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Open, FileAccess.Read);
+ }
+ else if (File.Exists(fileName))
+ {
+ fs = new FileStream(fileName, 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>
+ /// 淇濆瓨userInfo
+ /// </summary>
+ /// <param name="bytes"></param>
+ /// <returns></returns>
+ public bool WirteAppConfig(byte[] bytes)
+ {
+ var fileName = "OnAppConfig";
+ FileStream fs = null;
+
+ try
+ {
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Create, FileAccess.Write);
+ fs.Write(bytes, 0, bytes.Length);
+ fs.Flush();
MainPage.Log("SaveFile:" + fileName);
return true;
}
@@ -134,6 +227,8 @@
}
}
+
+
public byte[] ReadFile(string fileName)
{
FileStream fs = null;
--
Gitblit v1.8.0