From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
index 544d769..db14cc1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
@@ -60,6 +60,10 @@
//LOG鍑哄姏銆愭枃浠跺す銆�
this.CreateDirectory(DirNameResourse.LogDirectory);
+ //妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.LocalTemplateDirectory);
+ this.CreateDirectory(DirNameResourse.AllResidenceTemplateDirectory);
+
//鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty)
{
@@ -86,10 +90,21 @@
/// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
/// </summary>
/// <param name="fullName">鍏ㄨ矾寰�</param>
- /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
+ /// <param name="textValue">鏂囨湰</param>
public void SaveTextToFile(string fullName, string textValue)
{
var byteData = Encoding.UTF8.GetBytes(textValue);
+ this.SaveByteToFile(fullName, byteData);
+ }
+
+ /// <summary>
+ /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <param name="byteData">byte鏁版嵁</param>
+ public void SaveByteToFile(string fullName, byte[] byteData)
+ {
+ if (byteData == null) { return; }
//鍐欏叆鍐呭
System.IO.FileStream fileStream = null;
try
@@ -212,18 +227,34 @@
return new List<string>();
}
- List<string> list = new List<string>();
- var files = System.IO.Directory.GetFiles(directory);
- foreach (var file in files)
+ var list = new List<string>();
+ try
{
- string fileName = file;
- if (onlyFileName == true)
+ //2020.07.10鐨勬椂鍊�,鍑虹幇杩囪幏鍙栧け璐ュ紓甯� 鎻愮ず:write fault on path
+ var files = System.IO.Directory.GetFiles(directory);
+ foreach (var file in files)
{
- fileName = fileName.Substring(directory.Length + 1);
+ string fileName = file;
+ if (onlyFileName == true)
+ {
+ fileName = fileName.Substring(directory.Length + 1);
+ }
+ list.Add(fileName);
}
- list.Add(fileName);
}
+ catch (Exception ex)
+ { HdlLogLogic.Current.WriteLog(ex); }
+
return list;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏍圭洰褰曠殑鍏ㄩ儴鏂囦欢鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<string> GetRootPathListFile()
+ {
+ return this.GetFileFromDirectory(Common.Config.Instance.FullPath);
}
/// <summary>
@@ -249,6 +280,12 @@
var rootPath = Common.Config.Instance.FullPath;
foreach (var file in listFile)
{
+ if (file.StartsWith("ModelData_") == true)
+ {
+ //澶嶅埗妯℃澘鏁版嵁鏂囦欢鍒版寚瀹氭枃浠跺す
+ TemplateData.TemplateCommonLogic.Current.CopyTemplateFileToLocalDirectory2(System.IO.Path.Combine(fulldirectory, file));
+ continue;
+ }
string oldFile = System.IO.Path.Combine(fulldirectory, file);
string newFile = System.IO.Path.Combine(rootPath, file);
//绉诲姩鏂囦欢
--
Gitblit v1.8.0