Merge branch 'v3.5.0' into v3.6_merge_v3.5.0

This commit is contained in:
minggo
2022-01-25 19:52:06 +08:00
1002 changed files with 7024 additions and 6337 deletions

View File

@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2021 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -28,7 +28,7 @@
#include "platform/java/jni/JniImp.h"
namespace cc {
CommonSystem::CommonSystem() = default;
CommonSystem::CommonSystem() = default;
CommonSystem::~CommonSystem() = default;
std::string CommonSystem::getDeviceModel() const {
@@ -37,7 +37,7 @@ std::string CommonSystem::getDeviceModel() const {
CommonSystem::LanguageType CommonSystem::getCurrentLanguage() const {
std::string languageName = getCurrentLanguageJNI();
const char* pLanguageName = languageName.c_str();
const char * pLanguageName = languageName.c_str();
LanguageType ret = LanguageType::ENGLISH;
if (0 == strcmp("zh", pLanguageName)) {
@@ -90,7 +90,7 @@ std::string CommonSystem::getSystemVersion() const {
return getSystemVersionJNI();
}
bool CommonSystem::openURL(const std::string& url) {
bool CommonSystem::openURL(const std::string &url) {
return openURLJNI(url);
}