openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-25 12:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

!8170 设置uiextension context中设备横竖屏状态初始值

Browse Source 
Merge pull request !8170 from wangkailong/wantfd
This commit is contained in:
openharmony_ci
2024-04-16 04:18:41 +00:00
committed by Gitee
parent 32c5b7d8bc bb29c6a9d5
commit 005aa9c522
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/BUILD.gn
+1
View File
@@ -988,6 +988,7 @@ ohos_shared_library("ui_extension") {
if (ability_runtime_graphics) {
external_deps += [
"ace_engine:ace_uicontent",
"window_manager:libdm",
"window_manager:libwm",
]
}
frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp
+13
View File
@@ -239,8 +239,21 @@ void JsUIExtension::OnStart(const AAFwk::Want &want)
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::UI_EXT, "JsUIExtension OnStart begin.");
Extension::OnStart(want);
auto context = GetContext();
if (context != nullptr) {
int32_t displayId = static_cast<int32_t>(Rosen::DisplayManager::GetInstance().GetDefaultDisplayId());
displayId = want.GetIntParam(Want::PARAM_RESV_DISPLAY_ID, displayId);
TAG_LOGD(AAFwkTag::UI_EXT, "displayId %{public}d", displayId);
auto configUtils = std::make_shared<ConfigurationUtils>();
configUtils->InitDisplayConfig(displayId, context->GetConfiguration(), context->GetResourceManager());
}
HandleScope handleScope(jsRuntime_);
napi_env env = jsRuntime_.GetNapiEnv();
if (context != nullptr) {
JsExtensionContext::ConfigurationUpdated(env, shellContextRef_, context->GetConfiguration());
}
napi_value napiWant = OHOS::AppExecFwk::WrapWant(env, want);
napi_value argv[] = {napiWant};
CallObjectMethod("onCreate", argv, ARGC_ONE);
frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp
+3 -3
View File
@@ -280,7 +280,7 @@ napi_value JsUIExtensionContentSession::OnGetUIExtensionHostWindowProxy(napi_env
ThrowError(env, AbilityErrorCode::ERROR_CODE_INNER);
return CreateJsUndefined(env);
}
napi_value jsExtensionWindow =
Rosen::JsExtensionWindow::CreateJsExtensionWindow(env, uiWindow_, sessionInfo_->hostWindowId);
if (jsExtensionWindow == nullptr) {
@@ -520,7 +520,7 @@ void JsUIExtensionContentSession::StartAbilityForResultRuntimeTask(napi_env env,
napi_value JsUIExtensionContentSession::OnTerminateSelf(napi_env env, NapiCallbackInfo& info)
{
TAG_LOGD(AAFwkTag::UI_EXT, "OnTerminateSelf called");
TAG_LOGI(AAFwkTag::UI_EXT, "OnTerminateSelf called");
NapiAsyncTask::CompleteCallback complete =
[sessionInfo = sessionInfo_](napi_env env, NapiAsyncTask& task, int32_t status) {
if (sessionInfo == nullptr) {
@@ -544,7 +544,7 @@ napi_value JsUIExtensionContentSession::OnTerminateSelf(napi_env env, NapiCallba
napi_value JsUIExtensionContentSession::OnTerminateSelfWithResult(napi_env env, NapiCallbackInfo& info)
{
TAG_LOGD(AAFwkTag::UI_EXT, "called");
TAG_LOGI(AAFwkTag::UI_EXT, "called");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::UI_EXT, "invalid param");
ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM);
frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp
+2 -2
View File
@@ -340,7 +340,7 @@ napi_value JsUIExtensionContext::OnOpenLink(napi_env env, NapiCallbackInfo& info
napi_value JsUIExtensionContext::OnTerminateSelf(napi_env env, NapiCallbackInfo& info)
{
TAG_LOGD(AAFwkTag::UI_EXT, "OnTerminateSelf is called");
TAG_LOGI(AAFwkTag::UI_EXT, "OnTerminateSelf is called");
NapiAsyncTask::CompleteCallback complete =
[weak = context_](napi_env env, NapiAsyncTask& task, int32_t status) {
auto context = weak.lock();
@@ -414,7 +414,7 @@ napi_value JsUIExtensionContext::OnStartAbilityForResult(napi_env env, NapiCallb
napi_value JsUIExtensionContext::OnTerminateSelfWithResult(napi_env env, NapiCallbackInfo& info)
{
TAG_LOGD(AAFwkTag::UI_EXT, "called");
TAG_LOGI(AAFwkTag::UI_EXT, "called");
if (info.argc == 0) {
TAG_LOGE(AAFwkTag::UI_EXT, "Not enough params");
ThrowTooFewParametersError(env);
interfaces/kits/native/ability/native/ui_extension_ability/js_ui_extension.h
+1
View File
@@ -17,6 +17,7 @@
#define OHOS_ABILITY_RUNTIME_JS_UI_EXTENSION_H
#include "configuration.h"
#include "display_manager.h"
#include "js_ui_extension_content_session.h"
#include "ui_extension.h"
#include <mutex>