From 2b758fd30a4c13398845dad1b963867deea60277 Mon Sep 17 00:00:00 2001 From: lu Date: Sat, 26 Mar 2022 10:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DRSScreen=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=E6=8A=8A=E5=B1=8F=E5=B9=95modeId=E7=9A=84?= =?UTF-8?q?=E5=90=AB=E4=B9=89=E6=94=B9=E4=B8=BA=E6=95=B0=E7=BB=84=E4=B8=8B?= =?UTF-8?q?=E6=A0=87=EF=BC=8C=E4=BB=A5=E7=AE=80=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lu Change-Id: I30c5cbe7ec7f33c90ffa3f5b30fe884902e5edb9 --- dmserver/src/abstract_screen.cpp | 10 ++++------ dmserver/src/abstract_screen_controller.cpp | 4 ++-- interfaces/innerkits/dm/screen.h | 1 - interfaces/kits/napi/screen_runtime/napi/js_screen.cpp | 1 - 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dmserver/src/abstract_screen.cpp b/dmserver/src/abstract_screen.cpp index 8d2307a7..b6b8cb80 100644 --- a/dmserver/src/abstract_screen.cpp +++ b/dmserver/src/abstract_screen.cpp @@ -37,13 +37,11 @@ AbstractScreen::~AbstractScreen() sptr AbstractScreen::GetActiveScreenMode() const { - for (sptr mode : modes_) { - if (mode->modeId_ == activeIdx_) { - return mode; - } + if (activeIdx_ < 0 || activeIdx_ >= modes_.size()) { + WLOGE("active mode index is wrong: %{public}d", activeIdx_); + return nullptr; } - WLOGE("active mode index is wrong: %{public}d", activeIdx_); - return nullptr; + return modes_[activeIdx_]; } std::vector> AbstractScreen::GetAbstractScreenModes() const diff --git a/dmserver/src/abstract_screen_controller.cpp b/dmserver/src/abstract_screen_controller.cpp index c1fc1e15..29442ef8 100644 --- a/dmserver/src/abstract_screen_controller.cpp +++ b/dmserver/src/abstract_screen_controller.cpp @@ -345,9 +345,9 @@ bool AbstractScreenController::FillAbstractScreen(sptr& absScree info->width_ = static_cast(rsScreenModeInfo.GetScreenWidth()); info->height_ = static_cast(rsScreenModeInfo.GetScreenHeight()); info->refreshRate_ = rsScreenModeInfo.GetScreenRefreshRate(); - info->modeId_ = rsScreenModeInfo.GetScreenModeId(); absScreen->modes_.push_back(info); - WLOGD("fill screen mode%{public}d w/h:%{public}d/%{public}d", info->modeId_, info->width_, info->height_); + WLOGD("fill screen idx:%{public}d w/h:%{public}d/%{public}d", + rsScreenModeInfo.GetScreenModeId(), info->width_, info->height_); } int32_t activeModeId = rsInterface_.GetScreenActiveMode(rsScreenId).GetScreenModeId(); WLOGD("fill screen activeModeId:%{public}d", activeModeId); diff --git a/interfaces/innerkits/dm/screen.h b/interfaces/innerkits/dm/screen.h index 1930c8ac..abd80f4d 100644 --- a/interfaces/innerkits/dm/screen.h +++ b/interfaces/innerkits/dm/screen.h @@ -39,7 +39,6 @@ struct SupportedScreenModes : public RefBase { uint32_t width_; uint32_t height_; uint32_t refreshRate_; - int32_t modeId_; }; struct VirtualScreenOption { diff --git a/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp b/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp index 53d3e419..f134df8b 100644 --- a/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp +++ b/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp @@ -173,7 +173,6 @@ NativeValue* CreateJsScreenObject(NativeEngine& engine, sptr& screen) std::unique_ptr jsScreen = std::make_unique(screen); object->SetNativePointer(jsScreen.release(), JsScreen::Finalizer, nullptr); - object->SetProperty("id", CreateJsValue(engine, static_cast(screen->GetId()))); object->SetProperty("parent", CreateJsValue(engine, static_cast(screen->GetParentId()))); object->SetProperty("orientation", CreateJsValue(engine, screen->GetOrientation())); object->SetProperty("activeModeIndex", CreateJsValue(engine, screen->GetModeId()));