From 397d897f0b12c9c97c32b762708e029468e2dbb2 Mon Sep 17 00:00:00 2001
From: pwx1285814 <panzhi9@huawei.com>
Date: Sun, 16 Jun 2024 12:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E9=85=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: pwx1285814 <panzhi9@huawei.com>
Change-Id: Ic5d46b86de261d51177b0455284d9c05cb284553
Signed-off-by: pwx1285814 <panzhi9@huawei.com>
---
 screenhandler/include/dscreen_handler.h |  3 ++-
 screenhandler/src/dscreen_handler.cpp   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/screenhandler/include/dscreen_handler.h b/screenhandler/include/dscreen_handler.h
index fb7b7e06..c53faf55 100644
--- a/screenhandler/include/dscreen_handler.h
+++ b/screenhandler/include/dscreen_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -37,6 +37,7 @@ public:
     int32_t Initialize() override;
     std::vector<DHItem> QueryMeta() override;
     std::vector<DHItem> Query() override;
+    std::vector<DHItem> RealQuery();
     std::map<std::string, std::string> QueryExtraInfo() override;
     bool IsSupportPlugin() override;
     void RegisterPluginListener(std::shared_ptr<PluginListener> listener) override;
diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp
index d4c0ecf9..18b3f147 100644
--- a/screenhandler/src/dscreen_handler.cpp
+++ b/screenhandler/src/dscreen_handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -127,12 +127,19 @@ void DScreenHandler::UnPluginHardware(const std::string &dhId)
 
 std::vector<DHItem> DScreenHandler::QueryMeta()
 {
-    return {};
+    DHLOGI("DScreenHandler query meta hardware info");
+    return RealQuery();
 }
 
 std::vector<DHItem> DScreenHandler::Query()
 {
-    DHLOGI("DScreenHandler query hardware info");
+    DHLOGI("DScreenHandler query full hardware info");
+    return RealQuery();
+}
+
+std::vector<DHItem> DScreenHandler::RealQuery()
+{
+    DHLOGI("DScreenHandler RealQuery");
     std::vector<DHItem> dhItemVec;
     std::vector<sptr<Rosen::Screen>> screens;
     Rosen::ScreenManager::GetInstance().GetAllScreens(screens);
-- 
Gitee