Skip to content

IAP plugin call lua logic error #121

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

IAP plugin call lua logic error #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e091b02
IAP plugin lua logic error
lpcdma Jan 7, 2015
cface19
Merge remote-tracking branch 'upstream/develop' into develop
lpcdma Feb 6, 2015
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
13 changes: 9 additions & 4 deletions protocols/platform/android/ProtocolIAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@ extern "C" {
ProtocolIAP* pIAP = dynamic_cast<ProtocolIAP*>(pPlugin);
if (pIAP != NULL)
{
pIAP->onPayResult((PayResultCode) ret, strMsg.c_str());
ProtocolIAP::ProtocolIAPCallback callback = pIAP->getCallback();
if (callback) {
PluginUtils::outputLog("ProtocolIAP", "IAP plugin callback function");
callback(ret, strMsg);
}else{
PluginUtils::outputLog("ProtocolIAP", "IAP plugin running onPayResult");
pIAP->onPayResult((PayResultCode) ret, strMsg.c_str());
}
}
else
{
ProtocolIAP::ProtocolIAPCallback callback = pIAP->getCallback();
if(callback)
callback(ret, strMsg);
PluginUtils::outputLog("ProtocolIAP", "Can't find the C++ object of the IAP plugin");
}
}
}
Expand Down
13 changes: 9 additions & 4 deletions protocols/platform/ios/IAPWrapper.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,19 @@ + (void) onPayResult:(id) obj withRet:(IAPResult) ret withMsg:(NSString*) msg
{
PluginProtocol* plugin = PluginUtilsIOS::getPluginPtr(obj);
ProtocolIAP* iapPlugin = dynamic_cast<ProtocolIAP*>(plugin);
PayResultListener *listener = iapPlugin->getResultListener();
ProtocolIAP::ProtocolIAPCallback callback = iapPlugin->getCallback();
const char* chMsg = [msg UTF8String];
PayResultCode cRet = (PayResultCode) ret;
if (iapPlugin) {
iapPlugin->onPayResult(cRet, chMsg);
}else if(callback){
std::string stdmsg(chMsg);
callback(cRet,stdmsg);
if (callback) {
PluginUtilsIOS::outputLog("IAP plugin callback function");
std::string stdmsg(chMsg);
callback(cRet,stdmsg);
}else{
PluginUtilsIOS::outputLog("IAP plugin running onPayResult");
iapPlugin->onPayResult(cRet, chMsg);
}
} else {
PluginUtilsIOS::outputLog("Can't find the C++ object of the IAP plugin");
}
Expand Down