You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mo...@apache.org on 2019/07/11 12:38:56 UTC
[incubator-weex] branch master updated: [iOS] fix compile error
This is an automated email from the ASF dual-hosted git repository.
moshen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 862c0bf [iOS] fix compile error
new 4d2ae38 Merge pull request #2686 from jianhan-he/master
862c0bf is described below
commit 862c0bf0e40ce0cabd5d936a16802f115a9f4489
Author: linghe.lh <li...@alibaba-inc.com>
AuthorDate: Thu Jul 11 20:34:48 2019 +0800
[iOS] fix compile error
---
weex_core/Source/core/bridge/script/core_side_in_script.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/weex_core/Source/core/bridge/script/core_side_in_script.cpp b/weex_core/Source/core/bridge/script/core_side_in_script.cpp
index 4fd7584..8f85f18 100644
--- a/weex_core/Source/core/bridge/script/core_side_in_script.cpp
+++ b/weex_core/Source/core/bridge/script/core_side_in_script.cpp
@@ -28,8 +28,8 @@
#include "core/bridge/eagle_bridge.h"
#include "wson/wson_parser.h"
#include "core/config/core_environment.h"
-#include "core/parser/action_args_check.h"
#ifdef OS_ANDROID
+#include "core/parser/action_args_check.h"
#include <base/time_calculator.h>
#include "android/weex_extend_js_api.h"
#endif
@@ -53,7 +53,7 @@ inline char *copyStr(const char *str, int length = 0) {
void CoreSideInScript::CallNative(const char *page_id, const char *task,
const char *callback) {
if (page_id == nullptr || task == nullptr) return;
-
+#ifdef OS_ANDROID
if (WXCoreEnvironment::getInstance()->isUseRunTimeApi()){
if (isCallNativeToFinish(task)){
RenderManager::GetInstance()->CreateFinish(page_id);
@@ -65,6 +65,7 @@ void CoreSideInScript::CallNative(const char *page_id, const char *task,
}
return;
}
+#endif
std::string task_str(task);
std::string target_str("[{\"module\":\"dom\",\"method\":\"createFinish\","
"\"args\":[]}]");