From 7a2b08af309d3b16e380c83063da8211cc97217a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 14:18:42 +0800
Subject: [PATCH] 一个新版本

---
 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
old mode 100755
new mode 100644
index 74bfc7b..a32d8ec
--- 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);
+                this.InitMiddleFrame(nextDir.Trim('/'));
             };
         }
 
@@ -89,16 +89,23 @@
             //}
             //else
             {
-                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]);
+                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();
                 }
-                listDirectory.Sort();
-
-                listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/'));
-                listAllFile.Sort();
+                catch
+                {
+                    this.ShowMassage(ShowMsgType.Tip, "璇诲彇鏂囦欢澶瑰唴瀹瑰け璐�");
+                }
             }
 
             var listView = new VerticalListControl(23);

--
Gitblit v1.8.0