From d4957e5f3956ca1ef358268ec529306a6e79ac8a Mon Sep 17 00:00:00 2001
From: liweifeng <liweifeng2@huawei.com>
Date: Wed, 12 Jan 2022 11:54:09 +0800
Subject: [PATCH] start options deliver to window

Change-Id: Ib13620e65fda7953ee65509e739656cd37105400
Signed-off-by: liweifeng <liweifeng2@huawei.com>
---
 frameworks/kits/ability/native/include/ability.h |  3 +--
 frameworks/kits/ability/native/src/ability.cpp   | 16 ++++------------
 .../native/src/js_service_extension_context.cpp  |  5 +++--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/frameworks/kits/ability/native/include/ability.h b/frameworks/kits/ability/native/include/ability.h
index b078ab08d93..e79fefec333 100644
--- a/frameworks/kits/ability/native/include/ability.h
+++ b/frameworks/kits/ability/native/include/ability.h
@@ -1452,7 +1452,7 @@ private:
     std::shared_ptr<AbilityWindow> abilityWindow_ = nullptr;
     std::shared_ptr<AAFwk::Want> setWant_ = nullptr;
     sptr<IRemoteObject> reverseContinuationSchedulerReplica_ = nullptr;
-    
+
     bool bWindowFocus_ = false;
     int compatibleVersion_ = 0;
 
@@ -1484,7 +1484,6 @@ private:
     static const int32_t RELEASE_FORM = 8;
     static const int32_t RELEASE_CACHED_FORM = 9;
     static const int64_t MIN_NEXT_TIME = 5;
-    static const std::map<int32_t, Rosen::WindowMode> convertWindowModeMap_;
 
 private:
     /**
diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp
index d266dca5e9c..4f15bbce643 100755
--- a/frameworks/kits/ability/native/src/ability.cpp
+++ b/frameworks/kits/ability/native/src/ability.cpp
@@ -72,12 +72,6 @@ const std::string Ability::DMS_ORIGIN_DEVICE_ID("deviceId");
 const int Ability::DEFAULT_DMS_SESSION_ID(0);
 const std::string PERMISSION_REQUIRE_FORM = "ohos.permission.REQUIRE_FORM";
 const int TARGET_VERSION_THRESHOLDS = 8;
-const std::map<int32_t, Rosen::WindowMode> Ability::convertWindowModeMap_ = {
-    {AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_FULLSCREEN, Rosen::WindowMode::WINDOW_MODE_FULLSCREEN},
-    //{AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_PRIMARY, Rosen::WindowMode::WINDOW_MODE_SPLIT_PRIMARY},
-    //{AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_SECONDARY, Rosen::WindowMode::WINDOW_MODE_SPLIT_SECONDARY},
-    {AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_FLOATING, Rosen::WindowMode::WINDOW_MODE_FLOATING}
-};
 
 static std::mutex formLock;
 
@@ -897,7 +891,7 @@ void Ability::OnConfigurationUpdatedNotify(const Configuration &configuration)
     } else {
         APP_LOGE("%{public}s scene_ is nullptr.", __func__);
     }
-   
+
     APP_LOGI("%{public}s end.", __func__);
 }
 
@@ -3208,11 +3202,9 @@ sptr<Rosen::WindowOption> Ability::GetWindowOption(const Want &want)
     }
     auto windowMode = want.GetIntParam(StartOptions::STRING_WINDOW_MODE,
         AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED);
-    auto iter = convertWindowModeMap_.find(windowMode);
-    if (iter != convertWindowModeMap_.end()) {
-        option->SetWindowMode(iter->second);
-        APP_LOGI("Ability::GetWindowOption window mode is %{public}d.", iter->second);
-    }
+    APP_LOGI("Ability::GetWindowOption window mode is %{public}d.", windowMode);
+    option->SetWindowMode(static_cast<Rosen::WindowMode>(windowMode));
+
     APP_LOGI("%{public}s end", __func__);
     return option;
 }
diff --git a/frameworks/kits/ability/native/src/js_service_extension_context.cpp b/frameworks/kits/ability/native/src/js_service_extension_context.cpp
index 091db3037e3..bf622d2839c 100644
--- a/frameworks/kits/ability/native/src/js_service_extension_context.cpp
+++ b/frameworks/kits/ability/native/src/js_service_extension_context.cpp
@@ -37,6 +37,7 @@ constexpr int32_t ERROR_CODE_TWO = 2;
 constexpr size_t ARGC_ZERO = 0;
 constexpr size_t ARGC_ONE = 1;
 constexpr size_t ARGC_TWO = 2;
+constexpr size_t ARGC_THREE = 3;
 
 class JsServiceExtensionContext final {
 public:
@@ -78,8 +79,8 @@ private:
     NativeValue* OnStartAbility(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("OnStartAbility is called");
-        // only support one or two params
-        if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) {
+        // only support one or two or three params
+        if (info.argc != ARGC_ONE && info.argc != ARGC_TWO && info.argc != ARGC_THREE) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
         }
-- 
Gitee