Skip to content

Android: CCFileUtils listFiles impl #19044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 17 commits into from
Sep 19, 2018
Merged

Android: CCFileUtils listFiles impl #19044

merged 17 commits into from
Sep 19, 2018

Conversation

PatriceJiang
Copy link
Contributor

ref #18725

minggo
minggo reviewed Sep 17, 2018
View reviewed changes
minggo
minggo reviewed Sep 17, 2018
View reviewed changes
@PatriceJiang PatriceJiang force-pushed the android_ccfileutils_list_files branch from 589e512 to fd5fcfe Compare September 17, 2018 06:09
minggo
minggo reviewed Sep 17, 2018
View reviewed changes
minggo
minggo reviewed Sep 17, 2018
View reviewed changes
minggo
minggo reviewed Sep 17, 2018
View reviewed changes
cocos/base/ZipUtils.cpp
fileSet.insert(suffix);
}else if(parts.size() > 1){
fileSet.insert(parts[0] + "/");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitPath is too complex here, we don't need to know every part content, just need to check if it has / or not?

Copy link
Contributor Author

@PatriceJiang PatriceJiang Sep 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok.

@PatriceJiang
omit splitFilePath
4a4d57c 
Too complicate in this context
@minggo
Copy link
Contributor

minggo commented Sep 18, 2018

@jianglong you can close and open the PR the trigger CI in future.

@PatriceJiang
Copy link
Contributor Author

okay

@PatriceJiang PatriceJiang reopened this Sep 18, 2018
@PatriceJiang PatriceJiang reopened this Sep 18, 2018
@minggo minggo merged commit f8ed20e into cocos2d:v3 Sep 19, 2018
@tankorsmash tankorsmash mentioned this pull request Sep 20, 2018
Closed
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Oct 1, 2018
@stevetranby
Merge commit 'a59519a4ef567df7aabac77646d49baa4709ff01' into scgamex-…
afa83da 
…v3-merging

* commit 'a59519a4ef567df7aabac77646d49baa4709ff01': (65 commits)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19082)
  Fix several bugs with button's title (cocos2d#19073)
  [android] fix crash when point JNIEnv is a nullptr in getStringUTFCharsJNI func. (cocos2d#19079)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19074)
  refactor cmake on use libs (cocos2d#19054)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19068)
  [linux] CCFileUtils::isFileExistInternal should reject a folder (cocos2d#19062)
  Correct last delta time (cocos2d#18898)
  Add missing <functional> header which the standard requires and will be necessary to use std::function in VS2019. (cocos2d#18989)
  fix wrong parameter (cocos2d#19060)
  DrawNode add isolate flag (cocos2d#19056)
  Android: CCFileUtils listFiles impl (cocos2d#19044)
  CameraBackgroundDepthBrush should handle opengl recreate event. (cocos2d#19037)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19052)
  shorten the android build path, reduce long path error (cocos2d#19045)
  CCFileUtils: improve thread safety (use single recursive_mutex) (cocos2d#19046)
  remove assert (cocos2d#19047)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19048)
  Android: Adds supporting edge screens (cocos2d#19043)
  cocos2d::Data: prevent use after free. (cocos2d#19034)
  ...

# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/3d/Android.mk
#	cocos/Android.mk
#	cocos/deprecated/CCDeprecated.h
#	cocos/editor-support/cocostudio/Android.mk
#	cocos/editor-support/spine/Android.mk
#	cocos/platform/android/libcocos2dx-with-controller/build.gradle
#	cocos/platform/android/libcocos2dx/build.gradle
#	cocos/ui/UIAbstractCheckButton.cpp
#	cocos/ui/UIButton.cpp
#	cocos/ui/UIEditBox/UIEditBox.h
#	cocos/ui/UIEditBox/UIEditBoxImpl-common.h
#	extensions/Android.mk
#	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
#	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
@drelaptop drelaptop added this to the 3.18 milestone Oct 16, 2018
@PatriceJiang PatriceJiang deleted the android_ccfileutils_list_files branch December 25, 2018 04:02
huangwei1024 pushed a commit to huangwei1024/cocos2d-x that referenced this pull request Jun 20, 2019
@PatriceJiang @huangwei1024
Android: CCFileUtils listFiles impl (cocos2d#19044)
2d598c7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@minggo minggo minggo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.17.1

Development

Successfully merging this pull request may close these issues.

3 participants

@PatriceJiang @minggo @drelaptop