From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
index a32d8ec..4a55e41 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
@@ -31,7 +31,7 @@
var btnButton = new NormalViewControl(200, 69, true);
btnButton.Gravity = Gravity.CenterVertical;
- btnButton.X = bodyFrameLayout.Width - Application.GetRealWidth(200) - ControlCommonResourse.XXLeft;
+ btnButton.X = bodyFrameLayout.Width - Application.GetRealWidth(200) - HdlControlResourse.XXLeft;
btnButton.TextColor = UserCenterColor.Current.TopLayoutTitleText;
btnButton.TextAlignment = TextAlignment.BottomRight;
btnButton.TextSize = 17;
@@ -65,7 +65,7 @@
nextDir += Arry[i] + "/";
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame(nextDir.Trim('/'));
+ this.InitMiddleFrame(nextDir);
};
}
@@ -89,23 +89,16 @@
//}
//else
{
- try
- {
- var files = System.IO.Directory.GetDirectories(directory);
- foreach (var file in files)
- {
- string[] arry = file.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listDirectory.Add(arry[arry.Length - 1]);
- }
- listDirectory.Sort();
-
- listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/'));
- listAllFile.Sort();
+ var files = System.IO.Directory.GetDirectories(directory);
+ foreach (var file in files)
+ {
+ string[] arry = file.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
+ listDirectory.Add(arry[arry.Length - 1]);
}
- catch
- {
- this.ShowMassage(ShowMsgType.Tip, "璇诲彇鏂囦欢澶瑰唴瀹瑰け璐�");
- }
+ listDirectory.Sort();
+
+ listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/'));
+ listAllFile.Sort();
}
var listView = new VerticalListControl(23);
@@ -171,7 +164,7 @@
{
try
{
- dirNewName = UserCenterLogic.DecryptPassword(UserCenterResourse.FileEncryptKey, directoryName);
+ dirNewName = HdlCommonLogic.Current.DecryptPassword(HdlUserCenterResourse.FileEncryptKey, directoryName);
}
catch { dirNewName = directoryName; }
}
@@ -201,7 +194,7 @@
{
try
{
- fileNewName = UserCenterLogic.DecryptPassword(UserCenterResourse.FileEncryptKey, fileName);
+ fileNewName = HdlCommonLogic.Current.DecryptPassword(HdlUserCenterResourse.FileEncryptKey, fileName);
}
catch { fileNewName = fileName; }
}
@@ -221,7 +214,7 @@
btnReName.ButtonClickEvent += (sender, e) =>
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputControl();
+ var dialogForm = new DialogInputControl(360);
//淇濆瓨妯℃澘鍒癆pp
dialogForm.SetTitleText("閲嶅懡鍚�");
//璇疯緭鍏ユ柊鍚嶅瓧
@@ -237,7 +230,7 @@
{
return;
}
- HdlFileLogic.Current.MoveFileToDirectory(System.IO.Path.Combine(directory, fileName), System.IO.Path.Combine(directory, textValue));
+ HdlFileLogic.Current.MoveFile(System.IO.Path.Combine(directory, fileName), System.IO.Path.Combine(directory, textValue));
fileNewName = textValue;
fileName = textValue;
--
Gitblit v1.8.0