From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
index a32d8ec..3e3b151 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
@@ -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);
@@ -221,7 +214,7 @@
btnReName.ButtonClickEvent += (sender, e) =>
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputControl();
+ var dialogForm = new DialogInputControl(360);
//淇濆瓨妯℃澘鍒癆pp
dialogForm.SetTitleText("閲嶅懡鍚�");
//璇疯緭鍏ユ柊鍚嶅瓧
--
Gitblit v1.8.0