From f788a1e320b8505435ed66e2456ddb2d0a838f76 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 19 十一月 2020 19:58:14 +0800
Subject: [PATCH] 2020-11-19 1.优化绑定和解绑页面。2.修改密码功能实现，UI界面实现，接口实现。
---
HDL_ON/DAL/FileUtils.cs | 157 +++++++++++++++++----------------------------------
1 files changed, 53 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/DAL/FileUtils.cs b/HDL_ON/DAL/FileUtils.cs
index 1954b2c..9e93101 100644
--- a/HDL_ON/DAL/FileUtils.cs
+++ b/HDL_ON/DAL/FileUtils.cs
@@ -4,16 +4,28 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
-using HDL_ON.UI;
+//using HDL_ON.UI;
using HDL_ON.DAL.Net;
using HDL_ON.DAL;
+using HDL_ON.Entity;
-namespace HDL_ON.MyIO
+namespace HDL_ON
{
public static class FileUtils
{
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>
@@ -43,8 +55,7 @@
{
foreach (var fileName in ReadRegionFiles(path))
{
- System.IO.File.Delete(System.IO.Path.Combine(path, fileName));
- MainPage.Log("Del region file :" + fileName);
+ File.Delete(Path.Combine(path, fileName));
}
}
@@ -74,11 +85,15 @@
foreach (FileInfo NextFile in thFolders)
{
index++;
- if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "Register_File" || NextFile.Name == "AccountListDB")
+ if (NextFile.Name == "headImage.png")
{
continue;
}
- System.IO.FileInfo fileInfo = new System.IO.FileInfo(regionRootPath + NextFile.Name);
+ if (NextFile.Name == "null" || NextFile.Name == "UserConfig" || NextFile.Name == "UserInfo_File" || NextFile.Name == "AccountListDB")
+ {
+ continue;
+ }
+ FileInfo fileInfo = new FileInfo(regionRootPath + NextFile.Name);
if (fileInfo.Exists)
{
fileInfo.MoveTo(Application.RootPath + NextFile.Name);
@@ -86,13 +101,11 @@
}
}
}
-
-
-
+
/// <summary>
/// 閬嶅巻鏂囦欢
/// </summary>
- public static List<string> ReadFiles(bool reInit = true)
+ public static List<string> ReadFiles()
{
List<string> listFiles = new List<string>();
DirectoryInfo TheFolder = new DirectoryInfo(RootPath);
@@ -100,14 +113,6 @@
{
listFiles.Add(NextFile.Name);
}
- try
- {
- if (reInit)
- {
- MainPage.LocationFiles = listFiles;
- }
- }
- catch { }
return listFiles;
}
@@ -123,14 +128,11 @@
return;
}
DeleteFile(newFilePath);
- System.IO.FileInfo fileInfo = new System.IO.FileInfo(Application.RootPath + oldFilePath);
+ FileInfo fileInfo = new FileInfo(Application.RootPath + oldFilePath);
if (fileInfo.Exists)
{
fileInfo.MoveTo(Application.RootPath + newFilePath);
}
- //if (!UserConfig.Instance.LocalFiles.Contains (newFilePath)) {
- // UserConfig.Instance.LocalFiles.Add (newFilePath);
- //}
}
@@ -147,9 +149,9 @@
MainPage.Log ("鏂囦欢澶癸細" + d.Name);
}
#endif
- if (System.IO.Directory.Exists(srcPath))
+ if (Directory.Exists(srcPath))
{
- System.IO.DirectoryInfo folder = new System.IO.DirectoryInfo(srcPath);
+ DirectoryInfo folder = new DirectoryInfo(srcPath);
var path = Path.Combine(RootPath, destFolderPath);
if (Directory.Exists(path))
{
@@ -188,8 +190,8 @@
/// <param name="filePath">File path.</param>
public static bool Exists(string filePath)
{
- //System.MainPage.WriteLog ("Exists==" + System.IO.Path.Combine (RootPath, filePath));
- return System.IO.File.Exists(System.IO.Path.Combine(RootPath, filePath));
+ //System.MainPage.WriteLog ("Exists==" + Path.Combine (RootPath, filePath));
+ return File.Exists(Path.Combine(RootPath, filePath));
}
/// <summary>
@@ -202,11 +204,8 @@
{
return;
}
- System.IO.File.Delete(System.IO.Path.Combine(RootPath, fileName));
+ File.Delete(Path.Combine(RootPath, fileName));
MainPage.Log("鍒犻櫎鏂囦欢鍚嶄负锛�" + fileName);
- //if (UserConfig.Instance.LocalFiles.Contains (fileName)) {
- // UserConfig.Instance.LocalFiles.Remove (fileName);
- //}
}
/// <summary>
@@ -218,57 +217,10 @@
for (int j = 0; j < filesList.Count; j++)
{
var f = filesList[j];
- if (f == "linphonerc" || f == "AccountListDB")
+ if (f == "linphonerc" || f == "AccountListDB" || f == "UserInfo_File")
continue;
DeleteFile(f);
}
- }
-
- /// <summary>
- /// Reads the equipment message.
- /// </summary>
- /// <returns>The equipment json data.</returns>
- /// <param name="common">Common.</param>
- /// <param name="isList">If set to <c>true</c> is list.</param>
- ///
- /// <param name="commonType">
- /// Commons鏄墍鏈夎澶囩殑鍩虹被锛屼絾鏄綋浼犺繃鏉ョ殑Common鏄疞ightDevice鏃讹紝LightDevice涓嶆槸鐪熸鐨勮澶囷紝
- /// 鐪熸鐨勮澶囨槸瀹冧笅闈㈢殑璋冨厜鍣紙LightDimming锛夋垨鑰呯户鐢靛櫒.
- /// 鎵�浠ommon.GetType()鑾峰彇涓嶅埌鐪熷疄鐨勮澶囩被鍨�
- /// 鎵�浠ヨ繖閲岃鎵嬪姩浼犲叆璁惧鐨勭被鍨�
- /// </param>
- public static string ReadEquipmentMessage(Common common)
- {
- string fileName = "Equipment_";
- if (common.Type.ToString() == "WirelessPanel")
- {
- fileName += DeviceType.ButtonPanel.ToString() + "_" + common.SubnetID.ToString() + "_" + common.DeviceID.ToString();
- }
- else
- {
- fileName += common.Type + "_" + common.SubnetID.ToString() + "_" + common.DeviceID.ToString();
- }
- byte[] bytes1 = ReadFile(fileName);
- string one = System.Text.Encoding.UTF8.GetString(bytes1);
- return one;
- }
-
- /// <summary>
- /// Saves the equipment message.
- /// </summary>
- public static void SaveEquipmentMessage(Common common, string loopID = "")
- {
- string deviceType = common.Type.ToString();
- if (common.Type == DeviceType.LightSwitchSocket)
- deviceType = DeviceType.LightSwitch.ToString();
- string fileName = "Equipment_" + deviceType + "_" + common.SubnetID + "_" + common.DeviceID;
- if (loopID != "")
- {
- fileName += "_" + (loopID.Length < 2 ? "0" + loopID : loopID);
- }
- common.SavePath = fileName;
- MainPage.Log(fileName);
- WriteFileByBytes(fileName, CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(common)));
}
/// <summary>
@@ -284,17 +236,14 @@
return false;
}
- System.IO.FileStream fs = null;
+ FileStream fs = null;
try
{
- fs = new FileStream(System.IO.Path.Combine(RootPath, fileName), FileMode.Create, FileAccess.Write);
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Create, FileAccess.Write);
fs.Write(bytes, 0, bytes.Length);
fs.Flush();
MainPage.Log("SaveFile:" + fileName);
- //if (!UserConfig.Instance.LocalFiles.Contains (fileName)) {
- // UserConfig.Instance.LocalFiles.Add (fileName);
- //}
return true;
}
catch (Exception ex)
@@ -325,13 +274,13 @@
/// <param name="fileName">File name.</param>
/// <param name="inputStream">Input stream.</param>
/// <param name="isNeedRootPath">If set to <c>true</c> is need root path.</param>
- public static bool WriteFileByInputStream(string fileName, System.IO.Stream inputStream)
+ public static bool WriteFileByInputStream(string fileName, Stream inputStream)
{
if (fileName == null || (fileName = fileName.Trim()) == (""))
{
return false;
}
- System.IO.FileStream fs = null;
+ FileStream fs = null;
try
{
@@ -341,7 +290,7 @@
{
if (fs == null)
{
- fs = new FileStream(System.IO.Path.Combine(RootPath, fileName), FileMode.Create, FileAccess.Write);
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Create, FileAccess.Write);
}
fs.Write(buffer, 0, length);
fs.Flush();
@@ -383,14 +332,14 @@
{
fileName = "Phone/" + fileName;
}
- System.IO.FileStream fs = null;
+ FileStream fs = null;
try
{
- if (System.IO.File.Exists(System.IO.Path.Combine(RootPath, fileName)))
+ if (File.Exists(Path.Combine(RootPath, fileName)))
{
- fs = new FileStream(System.IO.Path.Combine(RootPath, fileName), FileMode.Open, FileAccess.Read);
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Open, FileAccess.Read);
}
- else if (System.IO.File.Exists(fileName))
+ else if (File.Exists(fileName))
{
fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
}
@@ -424,14 +373,14 @@
public static byte[] ReadFile(string fileName)
{
- System.IO.FileStream fs = null;
+ FileStream fs = null;
try
{
- if (System.IO.File.Exists(System.IO.Path.Combine(RootPath, fileName)))
+ if (File.Exists(Path.Combine(RootPath, fileName)))
{
- fs = new FileStream(System.IO.Path.Combine(RootPath, fileName), FileMode.Open, FileAccess.Read);
+ fs = new FileStream(Path.Combine(RootPath, fileName), FileMode.Open, FileAccess.Read);
}
- else if (System.IO.File.Exists(fileName))
+ else if (File.Exists(fileName))
{
fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
}
@@ -480,21 +429,21 @@
{
directioryPath = "Phone/" + "MusicImage";
}
- directioryPath = System.IO.Path.Combine(RootPath, directioryPath);
- if (!System.IO.Directory.Exists(directioryPath))
+ directioryPath = Path.Combine(RootPath, directioryPath);
+ if (!Directory.Exists(directioryPath))
{
- System.IO.Directory.CreateDirectory(directioryPath);
+ Directory.CreateDirectory(directioryPath);
}
#endregion
- if (!System.IO.File.Exists(fileName))
+ if (!File.Exists(fileName))
{
System.Threading.Tasks.Task.Run(() =>
{
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);
@@ -521,10 +470,10 @@
{
var url = "http://tingapi.ting.baidu.com/v1/restserver/ting?from=qianqian&version=2.1.0&method=baidu.ting.search.catalogSug&format=json&query=" + artist;
string directioryPath = "MusicImage";
- directioryPath = System.IO.Path.Combine(RootPath, directioryPath);
- if (!System.IO.Directory.Exists(directioryPath))
+ directioryPath = Path.Combine(RootPath, directioryPath);
+ if (!Directory.Exists(directioryPath))
{
- System.IO.Directory.CreateDirectory(directioryPath);
+ Directory.CreateDirectory(directioryPath);
}
try
{
@@ -538,7 +487,7 @@
if (tempAlbum.albumname == album && artist == tempAlbum.artistname)
{
var bytes = new HDL_ON.DAL.Net.MyWebClient().DownloadData(new Uri(tempAlbum.artistpic.Split('@')[0] + "@s_1,w_160,h_160"));
- var filePath = System.IO.Path.Combine(directioryPath, "AlbumArtistImage_" + album);
+ var filePath = Path.Combine(directioryPath, "AlbumArtistImage_" + album);
var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(bytes, 0, bytes.Length);
fs.Flush();
@@ -552,7 +501,7 @@
if (artist == tempArtist.artistname)
{
var bytes = new HDL_ON.DAL.Net.MyWebClient().DownloadData(new Uri(tempArtist.artistpic.Split('@')[0] + "@s_1,w_160,h_160"));
- var filePath = System.IO.Path.Combine(directioryPath, "AlbumArtistImage_" + artist);
+ var filePath = Path.Combine(directioryPath, "AlbumArtistImage_" + artist);
var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(bytes, 0, bytes.Length);
fs.Flush();
--
Gitblit v1.8.0