openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 23:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add extern_dep && codex fix

Browse Source 
Signed-off-by: y00576111 <yaojian16@huawei.com>
Change-Id: I800be9f2e5caace9d001e326a3eb476bc855ae29
This commit is contained in:
y00576111 2021-10-08 17:09:31 +08:00
parent aa43030174
commit ff739f95ad
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ace_config.gni
View File

@ -70,7 +70,7 @@ if (is_standard_system) {
} else {
ace_engine_part = "ace_engine_full"
hilog_deps = [ "hilog:libhilog" ]
worker_deps = [ "jsapi:worker_init" ]
worker_deps = [ "jsapi_worker:worker_init" ]
ark_runtime_path = "//ark/runtime"
}

2
frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp
View File

@ -714,7 +714,7 @@ bool JsiDeclarativeEngine::Initialize(const RefPtr<FrontendDelegate>& delegate)
}
nativeEngine_ = new ArkNativeEngine(const_cast<EcmaVM*>(vm), static_cast<void*>(this));
ACE_DCHECK(delegate);
delegate->AddTaskObserver([nativeEngine = nativeEngine_](){
delegate->AddTaskObserver([nativeEngine = nativeEngine_]() {
nativeEngine->Loop(LOOP_NOWAIT);
});
RegisterWorker();

1
frameworks/bridge/js_frontend/engine/jsi/BUILD.gn
View File

@ -58,6 +58,7 @@ template("js_engine_ark") {
defines += [ "APP_USE_ARM" ]
}
deps += [ "//foundation/ace/napi:ace_napi_ark" ]
external_deps = worker_deps
}
}

8
frameworks/bridge/js_frontend/engine/jsi/jsi_engine.cpp
View File

@ -1419,7 +1419,7 @@ void ShowActionMenu(const shared_ptr<JsRuntime>& runtime, const shared_ptr<JsVal
engine->CallJs(complete, R"({"errMsg":"enableAlertBeforeBackPage:buttons is invalid"})");
} else {
std::string callBackStr = arg->ToString(runtime);
// Get callbackId and clear redundant symbols
// Get callbackId and clear redundant symbols, 2 is available min string length
if (callBackStr.size() > 2 && callBackStr.front() == '\"' && callBackStr.back() == '\"') {
callBackStr = callBackStr.substr(1, callBackStr.size() - 2);
engine->CallJs(callBackStr,
@ -1497,7 +1497,7 @@ shared_ptr<JsValue> EnableAlertBeforeBackPage(const shared_ptr<JsRuntime>& runti
} else {
LOGE("enableAlertBeforeBackPage message is null");
std::string callBackStr = arg->ToString(runtime);
// Get callbackId and clear redundant symbols
// Get callbackId and clear redundant symbols, 2 is available min string length
if (callBackStr.size() > 2 && callBackStr.front() == '\"' && callBackStr.back() == '\"') {
callBackStr = callBackStr.substr(1, callBackStr.size() - 2);
engine->CallJs(callBackStr,
@ -1561,7 +1561,7 @@ shared_ptr<JsValue> DisableAlertBeforeBackPage(const shared_ptr<JsRuntime>& runt
}
std::string callBackStr = arg->ToString(runtime);
// Get callbackId and clear redundant symbols
// Get callbackId and clear redundant symbols, 2 is available min string length
if (callBackStr.size() > 2 && callBackStr.front() == '\"' && callBackStr.back() == '\"') {
callBackStr = callBackStr.substr(1, callBackStr.size() - 2);
engine->CallJs(callBackStr, R"({"arguments":[{"errMsg":"disableAlertBeforeBackPage:ok"}],"method":"success"})");
@ -2724,7 +2724,7 @@ bool JsiEngine::Initialize(const RefPtr<FrontendDelegate>& delegate)
}
nativeEngine_ = new ArkNativeEngine(const_cast<EcmaVM*>(vm), static_cast<void*>(this));
ACE_DCHECK(delegate);
delegate->AddTaskObserver([nativeEngine = nativeEngine_](){
delegate->AddTaskObserver([nativeEngine = nativeEngine_]() {
nativeEngine->Loop(LOOP_NOWAIT);
});
RegisterWorker();