Skip to content

Fix load Json file error #3

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

Open
namkazt wants to merge 1 commit into
base: 4.5.1
Choose a base branch
from
Open

Fix load Json file error #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions dragonbones/renderer/DBCCFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,22 @@ DragonBonesData* DBCCFactory::loadDragonBonesData(const std::string &dragonBones
{
return existDragonBonesData;
}
cocos2d::Data data = cocos2d::FileUtils::getInstance()->getDataFromFile(dragonBonesFilePath);
if (data.getSize() == 0)
{
CCLOG("read file [%s] error!", dragonBonesFilePath.c_str());
return nullptr;
}

DragonBonesData *dragonBonesData = nullptr;
const std::string filePosfix = getFilePosfix(dragonBonesFilePath);
if (".JSON" == filePosfix)
{
dragonBonesData = JSONDataParser::parseDragonBonesData(reinterpret_cast<char*>(data.getBytes()));
std::string data = cocos2d::FileUtils::getInstance()->getStringFromFile(dragonBonesFilePath);
dragonBonesData = JSONDataParser::parseDragonBonesData(data.c_str());
}
else if (".XML" == filePosfix)
{
cocos2d::Data data = cocos2d::FileUtils::getInstance()->getDataFromFile(dragonBonesFilePath);
if (data.getSize() == 0)
{
CCLOG("read file [%s] error!", dragonBonesFilePath.c_str());
return nullptr;
}

#ifdef COCOS2D_DEBUG
timeval t_beg,t_end;
Expand All @@ -88,6 +90,13 @@ DragonBonesData* DBCCFactory::loadDragonBonesData(const std::string &dragonBones
}
else if (".XMLB" == filePosfix)
{
cocos2d::Data data = cocos2d::FileUtils::getInstance()->getDataFromFile(dragonBonesFilePath);
if (data.getSize() == 0)
{
CCLOG("read file [%s] error!", dragonBonesFilePath.c_str());
return nullptr;
}

#ifdef COCOS2D_DEBUG
timeval t_beg,t_end;
gettimeofday(&t_beg, NULL);
Expand Down