UI Rebuild(100%).

RfidResearchGroup · Mar 5, 2020 · 0c131c3 · 0c131c3
1 parent d0e7195
commit 0c131c3
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/tools/DumpListActivity.java b/app_main/src/main/java/cn/rrg/rdv/activities/tools/DumpListActivity.java
@@ -10,6 +10,7 @@
 import java.io.FileFilter;
 
 import cn.rrg.rdv.javabean.FileBean;
+import cn.rrg.rdv.util.DumpUtils;
 import cn.rrg.rdv.util.Paths;
 
 public class DumpListActivity extends FileListActivity {
@@ -40,8 +41,8 @@ private boolean isDumpFileName(String name) {
         return false;
     }
 
-    private boolean isHardnestedDir(String name) {
-        return Paths.HARDNESTED_PATH.equalsIgnoreCase(name);
+    private boolean isHardnestedDir(File name) {
+        return name.isDirectory() && Paths.HARDNESTED_PATH.equalsIgnoreCase(name.getName());
     }
 
     @Override
@@ -52,14 +53,20 @@ public boolean accept(File pathname) {
                 // 1. The name is match!
                 // 2. not a hardnested res dir.
                 String name = pathname.getName();
-                return isDumpFileName(name) && !isHardnestedDir(name);
+                if (isHardnestedDir(pathname)) {
+                    return false;
+                }
+                if (pathname.isDirectory()) {
+                    return true;
+                }
+                return isDumpFileName(name) && DumpUtils.isDump(pathname);
             }
         };
     }
 
     @Override
     protected String onInitPath() {
-        return Paths.DUMP_DIRECTORY;
+        return Paths.TOOLS_DIRECTORY;
     }
 
     @Override