mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fix two issues: (#1440)
if return type is string, and return null from java to js, then it will crash if the parameter is string, and pass null from js to java, then java will get "null" instead of null
This commit is contained in:
@@ -206,9 +206,14 @@ bool JavaScriptJavaBridge::CallInfo::execute()
|
||||
case JavaScriptJavaBridge::ValueType::STRING:
|
||||
{
|
||||
m_retjstring = (jstring)m_env->CallStaticObjectMethod(m_classID, m_methodID);
|
||||
std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(m_env, m_retjstring);
|
||||
if (m_retjstring)
|
||||
{
|
||||
std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(m_env, m_retjstring);
|
||||
m_ret.stringValue = new std::string(strValue);
|
||||
}
|
||||
else
|
||||
m_ret.stringValue = nullptr;
|
||||
|
||||
m_ret.stringValue = new std::string(strValue);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -428,7 +433,10 @@ bool JavaScriptJavaBridge::convertReturnValue(ReturnValue retValue, ValueType ty
|
||||
ret->setBoolean(retValue.boolValue);
|
||||
break;
|
||||
case JavaScriptJavaBridge::ValueType::STRING:
|
||||
ret->setString(*retValue.stringValue);
|
||||
if (retValue.stringValue)
|
||||
ret->setString(*retValue.stringValue);
|
||||
else
|
||||
ret->setNull();
|
||||
break;
|
||||
default:
|
||||
ret->setUndefined();
|
||||
@@ -541,11 +549,22 @@ static bool JavaScriptJavaBridge_callStaticMethod(se::State& s)
|
||||
break;
|
||||
}
|
||||
case JavaScriptJavaBridge::ValueType::STRING:
|
||||
{
|
||||
const auto &arg = args[index];
|
||||
if (arg.isNull() || arg.isUndefined())
|
||||
jargs[i].l = nullptr;
|
||||
else
|
||||
{
|
||||
std::string str;
|
||||
seval_to_std_string(args[index], &str);
|
||||
jargs[i].l = call.getEnv()->NewStringUTF(str.c_str());
|
||||
toReleaseObjects.push_back(jargs[i].l);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
std::string str;
|
||||
seval_to_std_string(args[index], &str);
|
||||
jargs[i].l = call.getEnv()->NewStringUTF(str.c_str());
|
||||
toReleaseObjects.push_back(jargs[i].l);
|
||||
SE_REPORT_ERROR("Unsupport type of parameter %d", i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user