From 80e9a38e128505ad7dfd0c5e934337c9db7cb167 Mon Sep 17 00:00:00 2001 From: chenqinxin Date: Thu, 17 Feb 2022 12:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenqinxin Change-Id: I339eaf94f38f27e3e3dce808d899f80430a258df --- dmserver/src/display_power_controller.cpp | 3 +- .../window_napi/js_window_utils.h | 101 +++++++++--------- wm/src/window_impl.cpp | 2 +- wm/src/window_manager.cpp | 10 +- wmserver/src/window_layout_policy_cascade.cpp | 2 +- wmserver/src/window_root.cpp | 6 +- wmtest/frameworks/inative_test.cpp | 3 - wmtest/frameworks/inative_test.h | 4 +- 8 files changed, 63 insertions(+), 68 deletions(-) diff --git a/dmserver/src/display_power_controller.cpp b/dmserver/src/display_power_controller.cpp index 5282348e..ac3e5cb2 100644 --- a/dmserver/src/display_power_controller.cpp +++ b/dmserver/src/display_power_controller.cpp @@ -27,7 +27,8 @@ namespace { bool DisplayPowerController::SuspendBegin(PowerStateChangeReason reason) { WLOGFI("reason:%{public}u", reason); - DisplayManagerService::GetInstance().NotifyDisplayStateChange(DISPLAY_ID_INVALD, DisplayStateChangeType::BEFORE_SUSPEND); + DisplayManagerService::GetInstance().NotifyDisplayStateChange(DISPLAY_ID_INVALD, + DisplayStateChangeType::BEFORE_SUSPEND); return true; } diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.h b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.h index 0a7858f9..3a248e11 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.h +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.h @@ -32,57 +32,56 @@ constexpr int32_t INDEX_TWO = 2; constexpr int32_t INDEX_THREE = 3; constexpr int32_t RGB_LENGTH = 6; constexpr int32_t RGBA_LENGTH = 8; -namespace { - enum class ApiWindowType : uint32_t { - TYPE_BASE, - TYPE_APP = TYPE_BASE, - TYPE_APP_SUB_WINDOW, - TYPE_SYSTEM_ALERT, - TYPE_INPUT_METHOD, - TYPE_STATUS_BAR, - TYPE_PANEL, - TYPE_KEYGUARD, - TYPE_VOLUME_OVERLAY, - TYPE_NAVIGATION_BAR, - TYPE_END = TYPE_NAVIGATION_BAR, - }; - const std::map NATIVE_JS_TO_WINDOW_TYPE_MAP { - { WindowType::APP_SUB_WINDOW_BASE, ApiWindowType::TYPE_APP }, - { WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW, ApiWindowType::TYPE_SYSTEM_ALERT }, - { WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT, ApiWindowType::TYPE_INPUT_METHOD }, - { WindowType::WINDOW_TYPE_STATUS_BAR, ApiWindowType::TYPE_STATUS_BAR }, - { WindowType::WINDOW_TYPE_PANEL, ApiWindowType::TYPE_PANEL }, - { WindowType::WINDOW_TYPE_KEYGUARD, ApiWindowType::TYPE_KEYGUARD }, - { WindowType::WINDOW_TYPE_VOLUME_OVERLAY, ApiWindowType::TYPE_VOLUME_OVERLAY }, - { WindowType::WINDOW_TYPE_NAVIGATION_BAR, ApiWindowType::TYPE_NAVIGATION_BAR }, - { WindowType::WINDOW_TYPE_APP_SUB_WINDOW, ApiWindowType::TYPE_APP_SUB_WINDOW }, - }; - const std::map JS_TO_NATIVE_WINDOW_TYPE_MAP { - { ApiWindowType::TYPE_APP, WindowType::APP_SUB_WINDOW_BASE }, - { ApiWindowType::TYPE_SYSTEM_ALERT, WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW}, - { ApiWindowType::TYPE_INPUT_METHOD, WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT }, - { ApiWindowType::TYPE_STATUS_BAR, WindowType::WINDOW_TYPE_STATUS_BAR }, - { ApiWindowType::TYPE_PANEL, WindowType::WINDOW_TYPE_PANEL }, - { ApiWindowType::TYPE_KEYGUARD, WindowType::WINDOW_TYPE_KEYGUARD }, - { ApiWindowType::TYPE_VOLUME_OVERLAY, WindowType::WINDOW_TYPE_VOLUME_OVERLAY }, - { ApiWindowType::TYPE_NAVIGATION_BAR, WindowType::WINDOW_TYPE_NAVIGATION_BAR }, - { ApiWindowType::TYPE_APP_SUB_WINDOW, WindowType::WINDOW_TYPE_APP_SUB_WINDOW }, - }; - enum class ApiWindowMode : uint32_t { - UNDEFINED = 1, - FULLSCREEN, - PRIMARY, - SECONDARY, - FLOATING - }; - const std::map NATIVE_TO_JS_WINDOW_MODE_MAP { - { WindowMode::WINDOW_MODE_UNDEFINED, ApiWindowMode::UNDEFINED }, - { WindowMode::WINDOW_MODE_FULLSCREEN, ApiWindowMode::FULLSCREEN }, - { WindowMode::WINDOW_MODE_SPLIT_PRIMARY, ApiWindowMode::PRIMARY }, - { WindowMode::WINDOW_MODE_SPLIT_SECONDARY, ApiWindowMode::SECONDARY }, - { WindowMode::WINDOW_MODE_FLOATING, ApiWindowMode::FLOATING }, - }; -} +enum class ApiWindowType : uint32_t { + TYPE_BASE, + TYPE_APP = TYPE_BASE, + TYPE_APP_SUB_WINDOW, + TYPE_SYSTEM_ALERT, + TYPE_INPUT_METHOD, + TYPE_STATUS_BAR, + TYPE_PANEL, + TYPE_KEYGUARD, + TYPE_VOLUME_OVERLAY, + TYPE_NAVIGATION_BAR, + TYPE_END = TYPE_NAVIGATION_BAR, +}; +const std::map NATIVE_JS_TO_WINDOW_TYPE_MAP { + { WindowType::APP_SUB_WINDOW_BASE, ApiWindowType::TYPE_APP }, + { WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW, ApiWindowType::TYPE_SYSTEM_ALERT }, + { WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT, ApiWindowType::TYPE_INPUT_METHOD }, + { WindowType::WINDOW_TYPE_STATUS_BAR, ApiWindowType::TYPE_STATUS_BAR }, + { WindowType::WINDOW_TYPE_PANEL, ApiWindowType::TYPE_PANEL }, + { WindowType::WINDOW_TYPE_KEYGUARD, ApiWindowType::TYPE_KEYGUARD }, + { WindowType::WINDOW_TYPE_VOLUME_OVERLAY, ApiWindowType::TYPE_VOLUME_OVERLAY }, + { WindowType::WINDOW_TYPE_NAVIGATION_BAR, ApiWindowType::TYPE_NAVIGATION_BAR }, + { WindowType::WINDOW_TYPE_APP_SUB_WINDOW, ApiWindowType::TYPE_APP_SUB_WINDOW }, +}; +const std::map JS_TO_NATIVE_WINDOW_TYPE_MAP { + { ApiWindowType::TYPE_APP, WindowType::APP_SUB_WINDOW_BASE }, + { ApiWindowType::TYPE_SYSTEM_ALERT, WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW}, + { ApiWindowType::TYPE_INPUT_METHOD, WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT }, + { ApiWindowType::TYPE_STATUS_BAR, WindowType::WINDOW_TYPE_STATUS_BAR }, + { ApiWindowType::TYPE_PANEL, WindowType::WINDOW_TYPE_PANEL }, + { ApiWindowType::TYPE_KEYGUARD, WindowType::WINDOW_TYPE_KEYGUARD }, + { ApiWindowType::TYPE_VOLUME_OVERLAY, WindowType::WINDOW_TYPE_VOLUME_OVERLAY }, + { ApiWindowType::TYPE_NAVIGATION_BAR, WindowType::WINDOW_TYPE_NAVIGATION_BAR }, + { ApiWindowType::TYPE_APP_SUB_WINDOW, WindowType::WINDOW_TYPE_APP_SUB_WINDOW }, +}; +enum class ApiWindowMode : uint32_t { + UNDEFINED = 1, + FULLSCREEN, + PRIMARY, + SECONDARY, + FLOATING +}; +const std::map NATIVE_TO_JS_WINDOW_MODE_MAP { + { WindowMode::WINDOW_MODE_UNDEFINED, ApiWindowMode::UNDEFINED }, + { WindowMode::WINDOW_MODE_FULLSCREEN, ApiWindowMode::FULLSCREEN }, + { WindowMode::WINDOW_MODE_SPLIT_PRIMARY, ApiWindowMode::PRIMARY }, + { WindowMode::WINDOW_MODE_SPLIT_SECONDARY, ApiWindowMode::SECONDARY }, + { WindowMode::WINDOW_MODE_FLOATING, ApiWindowMode::FLOATING }, +}; + NativeValue* GetRectAndConvertToJsValue(NativeEngine& engine, const Rect rect); NativeValue* CreateJsWindowPropertiesObject(NativeEngine& engine, sptr& window); bool SetSystemBarPropertiesFromJs(NativeEngine& engine, NativeObject* jsObject, diff --git a/wm/src/window_impl.cpp b/wm/src/window_impl.cpp index 00dccef8..06d4d040 100644 --- a/wm/src/window_impl.cpp +++ b/wm/src/window_impl.cpp @@ -536,7 +536,7 @@ WMError WindowImpl::Create(const std::string& parentName, const std::shared_ptr< return ret; } } - windowMap_.insert({ name_, std::pair>(windowId, this) }); + windowMap_.insert(std::make_pair(name_, std::pair>(windowId, this))); if (parentName != "") { // add to subWindowMap_ subWindowMap_[property_->GetParentId()].push_back(this); } diff --git a/wm/src/window_manager.cpp b/wm/src/window_manager.cpp index fd9f81f0..b2ab5c63 100644 --- a/wm/src/window_manager.cpp +++ b/wm/src/window_manager.cpp @@ -111,11 +111,11 @@ void WindowManager::Impl::NotifySystemBarChanged(DisplayId displayId, const Syst void WindowManager::Impl::NotifyWindowUpdate(const sptr& windowInfo, WindowUpdateType type) const { WLOGFI("NotifyWindowUpdate: wid[%{public}d],width[%{public}d], \ - height[%{public}d],positionX[%{public}d],positionY[%{public}d],\ - isFocused[%{public}d],mode[%{public}d],type[%{public}d]", - windowInfo->wid_, windowInfo->windowRect_.width_,windowInfo->windowRect_.height_, - windowInfo->windowRect_.posX_,windowInfo->windowRect_.posY_, - windowInfo->focused_,windowInfo->mode_,windowInfo->type_); + height[%{public}d],positionX[%{public}d],positionY[%{public}d],\ + isFocused[%{public}d],mode[%{public}d],type[%{public}d]", + windowInfo->wid_, windowInfo->windowRect_.width_, windowInfo->windowRect_.height_, + windowInfo->windowRect_.posX_, windowInfo->windowRect_.posY_, + windowInfo->focused_, windowInfo->mode_, windowInfo->type_); for (auto& listener : windowUpdateListeners_) { listener->OnWindowUpdate(windowInfo, type); } diff --git a/wmserver/src/window_layout_policy_cascade.cpp b/wmserver/src/window_layout_policy_cascade.cpp index 61345813..490449df 100644 --- a/wmserver/src/window_layout_policy_cascade.cpp +++ b/wmserver/src/window_layout_policy_cascade.cpp @@ -353,7 +353,7 @@ Rect WindowLayoutPolicyCascade::GetCurCascadeRect(const sptr& node) (*iter)->GetWindowId() != node->GetWindowId()) { cascadeRect = (*iter)->GetWindowProperty()->GetWindowRect(); WLOGFI("get current cascadeRect :[%{public}d, %{public}d, %{public}d, %{public}d]", - cascadeRect.posX_, cascadeRect.posY_, cascadeRect.width_, cascadeRect.height_); + cascadeRect.posX_, cascadeRect.posY_, cascadeRect.width_, cascadeRect.height_); break; } } diff --git a/wmserver/src/window_root.cpp b/wmserver/src/window_root.cpp index 0f385109..25e7a38e 100644 --- a/wmserver/src/window_root.cpp +++ b/wmserver/src/window_root.cpp @@ -47,7 +47,7 @@ sptr WindowRoot::GetOrCreateWindowNodeContainer(DisplayId d abstractDisplay->GetWidth(), abstractDisplay->GetHeight(), abstractDisplay->GetId()); sptr container = new WindowNodeContainer(abstractDisplay->GetId(), static_cast(abstractDisplay->GetWidth()), static_cast(abstractDisplay->GetHeight())); - windowNodeContainerMap_.insert({ displayId, container }); + windowNodeContainerMap_.insert(std::make_pair(displayId, container)); return container; } @@ -95,9 +95,9 @@ WMError WindowRoot::SaveWindow(const sptr& node) return WMError::WM_ERROR_NULLPTR; } WLOGFI("save windowId %{public}d", node->GetWindowId()); - windowNodeMap_.insert({ node->GetWindowId(), node }); + windowNodeMap_.insert(std::make_pair(node->GetWindowId(), node)); auto remoteObject = node->GetWindowToken()->AsObject(); - windowIdMap_.insert({ remoteObject, node->GetWindowId() }); + windowIdMap_.insert(std::make_pair(remoteObject, node->GetWindowId())); if (windowDeath_ == nullptr) { WLOGFI("failed to create death Recipient ptr WindowDeathRecipient"); diff --git a/wmtest/frameworks/inative_test.cpp b/wmtest/frameworks/inative_test.cpp index 62b5316d..93d6cef2 100644 --- a/wmtest/frameworks/inative_test.cpp +++ b/wmtest/frameworks/inative_test.cpp @@ -15,9 +15,6 @@ #include "inative_test.h" -#include -#include - namespace OHOS::Rosen { void INativeTest::VisitTests(VisitTestFunc func) { diff --git a/wmtest/frameworks/inative_test.h b/wmtest/frameworks/inative_test.h index 640dd9ff..41c16fee 100644 --- a/wmtest/frameworks/inative_test.h +++ b/wmtest/frameworks/inative_test.h @@ -25,9 +25,7 @@ using VisitTestFunc = std::function; class INativeTest { public: - enum { - LAST_TIME_FOREVER = 999999999, - }; + static constexpr uint32_t LAST_TIME_FOREVER = 999999999, static void VisitTests(VisitTestFunc func); INativeTest();