Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve android web view

This commit is contained in:
andyque 2014-09-15 18:14:04 +08:00
parent 5f95ad221e
commit af3dd215cb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos/ui/UIWebViewImpl-android.cpp
View File

@ -322,7 +322,7 @@ namespace cocos2d {
loadHTMLStringJNI(_viewTag, string, baseURL);
}
void WebViewImpl::loadUrl(const std::string &url) {
void WebViewImpl::loadURL(const std::string &url) {
loadUrlJNI(_viewTag, url);
}
@ -371,8 +371,8 @@ namespace cocos2d {
auto it = s_WebViewImpls.find(viewTag);
if (it != s_WebViewImpls.end()) {
auto webView = s_WebViewImpls[viewTag]->_webView;
if (webView->shouldStartLoading) {
return webView->shouldStartLoading(webView, url);
if (webView->_onShouldStartLoading) {
return webView->_onShouldStartLoading(webView, url);
}
}
return true;
@ -382,8 +382,8 @@ namespace cocos2d {
auto it = s_WebViewImpls.find(viewTag);
if (it != s_WebViewImpls.end()) {
auto webView = s_WebViewImpls[viewTag]->_webView;
if (webView->didFinishLoading) {
webView->didFinishLoading(webView, url);
if (webView->_onDidFinishLoading) {
webView->_onDidFinishLoading(webView, url);
}
}
}
@ -392,8 +392,8 @@ namespace cocos2d {
auto it = s_WebViewImpls.find(viewTag);
if (it != s_WebViewImpls.end()) {
auto webView = s_WebViewImpls[viewTag]->_webView;
if (webView->didFailLoading) {
webView->didFailLoading(webView, url);
if (webView->_onDidFailLoading) {
webView->_onDidFailLoading(webView, url);
}
}
}
@ -402,8 +402,8 @@ namespace cocos2d {
auto it = s_WebViewImpls.find(viewTag);
if (it != s_WebViewImpls.end()) {
auto webView = s_WebViewImpls[viewTag]->_webView;
if (webView->onJsCallback) {
webView->onJsCallback(webView, message);
if (webView->_onJSCallback) {
webView->_onJSCallback(webView, message);
}
}
}

2
cocos/ui/UIWebViewImpl-android.h
View File

@ -57,7 +57,7 @@ namespace cocos2d {
void loadHTMLString(const std::string &string, const std::string &baseURL);
void loadUrl(const std::string &url);
void loadURL(const std::string &url);
void loadFile(const std::string &fileName);