diff --git a/frameworks/bridge/declarative_frontend/jsview/js_web.cpp b/frameworks/bridge/declarative_frontend/jsview/js_web.cpp index 12cf5fefed8e47ae8e08c921842c3647cef18f15..c5b08911773097c2275a1e1f92c9026a0aa5a4ff 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_web.cpp +++ b/frameworks/bridge/declarative_frontend/jsview/js_web.cpp @@ -5975,6 +5975,7 @@ void JSWeb::RunJavaScriptOnDocumentStart(const JSCallbackInfo& args) void JSWeb::RunJavaScriptOnDocumentEnd(const JSCallbackInfo& args) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 JSWeb::RunJavaScriptOnDocumentEnd"); ScriptItems scriptItems; ScriptItemsByOrder scriptItemsByOrder; ParseScriptItems(args, scriptItems, scriptItemsByOrder); diff --git a/frameworks/core/components/web/resource/web_delegate.cpp b/frameworks/core/components/web/resource/web_delegate.cpp index 7f8dfbc2c96b335999e7756a40e9c576f2b7c800..3a0d39ecf09ae7942b349a4c0dd21b17bf87605e 100644 --- a/frameworks/core/components/web/resource/web_delegate.cpp +++ b/frameworks/core/components/web/resource/web_delegate.cpp @@ -7965,6 +7965,10 @@ void WebDelegate::ScrollByRefScreen(float deltaX, float deltaY, float vx, float void WebDelegate::SetJavaScriptItems(const ScriptItems& scriptItems, const ScriptItemType& type) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::SetJavaScriptItems type: %{public}d", static_cast(type)); + for(auto& script : scriptItems) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::SetJavaScriptItems script: %{public}s", script.first.c_str()); + } if (type == ScriptItemType::DOCUMENT_START) { onDocumentStartScriptItems_ = std::make_optional(scriptItems); onDocumentStartScriptItemsByOrder_ = std::nullopt; @@ -7989,6 +7993,13 @@ void WebDelegate::JavaScriptOnDocumentStart() void WebDelegate::SetJavaScriptItemsByOrder(const ScriptItems& scriptItems, const ScriptItemType& type, const ScriptItemsByOrder& scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::SetJavaScriptItemsByOrder type: %{public}d", static_cast(type)); + for(auto& script : scriptItems) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::SetJavaScriptItemsByOrder script: %{public}s", script.first.c_str()); + } + for(auto& script : scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::SetJavaScriptItemsByOrder scriptByOrder: %{public}s", script.c_str()); + } if (type == ScriptItemType::DOCUMENT_START) { onDocumentStartScriptItems_ = std::make_optional(scriptItems); onDocumentStartScriptItemsByOrder_ = std::make_optional(scriptItemsByOrder); @@ -8015,6 +8026,13 @@ void WebDelegate::JavaScriptOnDocumentStartByOrder() void WebDelegate::JavaScriptOnDocumentEndByOrder() { CHECK_NULL_VOID(nweb_); + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::JavaScriptOnDocumentEndByOrder"); + for(auto& script : onDocumentEndScriptItems_.value()) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::JavaScriptOnDocumentEndByOrder script: %{public}s", script.first.c_str()); + } + for(auto& script : onDocumentEndScriptItemsByOrder_.value()) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::JavaScriptOnDocumentEndByOrder scriptByOrder: %{public}s", script.c_str()); + } if (onDocumentEndScriptItems_.has_value() && onDocumentEndScriptItemsByOrder_.has_value()) { nweb_->JavaScriptOnDocumentEndByOrder(onDocumentEndScriptItems_.value(), onDocumentEndScriptItemsByOrder_.value()); @@ -8037,6 +8055,7 @@ void WebDelegate::JavaScriptOnHeadReadyByOrder() void WebDelegate::JavaScriptOnDocumentEnd() { CHECK_NULL_VOID(nweb_); + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebDelegate::JavaScriptOnDocumentEnd"); if (onDocumentEndScriptItems_.has_value() && !onDocumentEndScriptItemsByOrder_.has_value()) { nweb_->JavaScriptOnDocumentEnd(onDocumentEndScriptItems_.value()); onDocumentEndScriptItems_ = std::nullopt; diff --git a/frameworks/core/components_ng/pattern/web/web_model_ng.cpp b/frameworks/core/components_ng/pattern/web/web_model_ng.cpp index ec19ab403a535cddc14511f6c952f775a9711223..1b0a2f14ff57275215a6146c5612764034d702ae 100644 --- a/frameworks/core/components_ng/pattern/web/web_model_ng.cpp +++ b/frameworks/core/components_ng/pattern/web/web_model_ng.cpp @@ -1240,6 +1240,13 @@ void WebModelNG::JavaScriptOnDocumentStartByOrder(const ScriptItems& scriptItems void WebModelNG::JavaScriptOnDocumentEndByOrder(const ScriptItems& scriptItems, const ScriptItemsByOrder& scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebModelNG::JavaScriptOnDocumentEndByOrder"); + for(auto& script : scriptItems) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebModelNG::JavaScriptOnDocumentEndByOrder script: %{public}s", script.first.c_str()); + } + for(auto& script : scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebModelNG::JavaScriptOnDocumentEndByOrder scriptByOrder: %{public}s", script.c_str()); + } auto webPattern = ViewStackProcessor::GetInstance()->GetMainFrameNodePattern(); CHECK_NULL_VOID(webPattern); webPattern->JavaScriptOnDocumentEndByOrder(scriptItems, scriptItemsByOrder); diff --git a/frameworks/core/components_ng/pattern/web/web_pattern.cpp b/frameworks/core/components_ng/pattern/web/web_pattern.cpp index 2d068eff7ffdfd627537f578e2835a01cc7bff89..cf0041fe3e2d40bf68017dbb83cb867dd3c8746d 100644 --- a/frameworks/core/components_ng/pattern/web/web_pattern.cpp +++ b/frameworks/core/components_ng/pattern/web/web_pattern.cpp @@ -3714,6 +3714,7 @@ void WebPattern::OnColorConfigurationUpdate() void WebPattern::OnModifyDone() { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::OnModifyDone"); Pattern::OnModifyDone(); // called in each update function. auto host = GetHost(); @@ -6997,6 +6998,13 @@ void WebPattern::JavaScriptOnDocumentStartByOrder(const ScriptItems& scriptItems void WebPattern::JavaScriptOnDocumentEndByOrder(const ScriptItems& scriptItems, const ScriptItemsByOrder& scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::JavaScriptOnDocumentEndByOrder"); + for(auto& script : scriptItems) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::JavaScriptOnDocumentEndByOrder script: %{public}s", script.first.c_str()); + } + for(auto& script : scriptItemsByOrder) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::JavaScriptOnDocumentEndByOrder scriptByOrder: %{public}s", script.c_str()); + } onDocumentEndScriptItems_ = std::make_optional(scriptItems); onDocumentEndScriptItemsByOrder_ = std::make_optional(scriptItemsByOrder); EventRecorder::Get().FillWebJsCode(onDocumentEndScriptItems_); @@ -7048,7 +7056,14 @@ void WebPattern::UpdateJavaScriptOnDocumentStartByOrder() void WebPattern::UpdateJavaScriptOnDocumentEndByOrder() { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::UpdateJavaScriptOnDocumentEndByOrder"); if (delegate_ && onDocumentEndScriptItems_.has_value() && onDocumentEndScriptItemsByOrder_.has_value()) { + for(auto& script : onDocumentEndScriptItems_.value()) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::UpdateJavaScriptOnDocumentEndByOrder script: %{public}s", script.first.c_str()); + } + for(auto& script : onDocumentEndScriptItemsByOrder_.value()) { + TAG_LOGI(AceLogTag::ACE_WEB, "adrainlyz1 WebPattern::UpdateJavaScriptOnDocumentEndByOrder scriptByOrder: %{public}s", script.c_str()); + } delegate_->SetJavaScriptItemsByOrder(onDocumentEndScriptItems_.value(), ScriptItemType::DOCUMENT_END, onDocumentEndScriptItemsByOrder_.value()); onDocumentEndScriptItems_ = std::nullopt;