[Android] fix FileUtils::listFiles with path 'assets/' (#19457)

cocos2d · Mar 4, 2019 · f0f732c · f0f732c
1 parent d3e6727
commit f0f732c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/cocos/platform/android/CCFileUtils-android.cpp b/cocos/platform/android/CCFileUtils-android.cpp
@@ -300,7 +300,7 @@ long FileUtilsAndroid::getFileSize(const std::string& filepath) const
 std::vector<std::string> FileUtilsAndroid::listFiles(const std::string& dirPath) const
 {
 
-    if(isAbsolutePath(dirPath)) return FileUtils::listFiles(dirPath);
+    if(!dirPath.empty() && dirPath[0] == '/') return FileUtils::listFiles(dirPath);
 
     std::vector<std::string> fileList;
     string fullPath = fullPathForDirectory(dirPath);

diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
@@ -1408,10 +1408,24 @@ void TestListFiles::onEnter()
     this->addChild(cntLabel);
     cntLabel->setPosition(winSize.width / 2, winSize.height / 3);
     // writeTest
-    auto list = FileUtils::getInstance()->listFiles("fonts");
+    std::vector<std::string> listFonts = FileUtils::getInstance()->listFiles("fonts");
+    auto defaultPath = FileUtils::getInstance()->getDefaultResourceRootPath();
+    std::vector<std::string> list = FileUtils::getInstance()->listFiles (defaultPath);
 
     char cntBuffer[200] = { 0 };
-    snprintf(cntBuffer, 200, "%d", list.size());
+    snprintf(cntBuffer, 200, "'fonts/' %d, $defaultResourceRootPath %d",listFonts.size(), list.size());
+
+    for(int i=0;i<listFonts.size();i++)
+    {
+        CCLOG("fonts/ %d: \t %s", i, listFonts[i].c_str());
+    }
+
+    for(int i=0;i<list.size();i++)
+    {
+        CCLOG("defResRootPath %d: \t %s", i, list[i].c_str());
+    }
+
+
     cntLabel->setString(cntBuffer);
 
 }