From 45d0acca40397744b7b28c474161c9fca891a0af Mon Sep 17 00:00:00 2001 From: zhoulongyu <1790731762@qq.com> Date: Tue, 6 Aug 2024 00:36:51 +0800 Subject: [PATCH] [zhoulongyu]: Modify the names of some of the abstract classes associated with Lvgl --- middleware/GuiEngine/include/GuiEngine.h | 42 +++++++++---------- middleware/GuiEngine/lvgl_board/LvglBoard.cpp | 4 +- middleware/GuiEngine/lvgl_common/GuiLvgl.cpp | 18 ++++---- middleware/GuiEngine/lvgl_common/GuiLvgl.h | 22 +++++----- .../GuiEngine/lvgl_common/LvglWidget.cpp | 2 +- middleware/GuiEngine/lvgl_common/LvglWidget.h | 6 +-- .../GuiEngine/lvgl_x86/LvglLinux_x86.cpp | 4 +- test/GuiInterface/src/GuiInterface.cpp | 4 +- test/GuiInterface/src/GuiInterfaceTest.cpp | 6 +-- test/GuiInterface/src/GuiInterfaceTest.h | 4 +- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/middleware/GuiEngine/include/GuiEngine.h b/middleware/GuiEngine/include/GuiEngine.h index fc8e1e2..23f2a67 100755 --- a/middleware/GuiEngine/include/GuiEngine.h +++ b/middleware/GuiEngine/include/GuiEngine.h @@ -53,17 +53,17 @@ enum class i_lv_align_t{ typedef void (*i_lv_event_cb_t)(i_lv_event_code_t e, void * userData); -class Widget +class VWidget { public: - Widget() = default; - virtual ~Widget() {} + VWidget() = default; + virtual ~VWidget() {} virtual void ImageSetSrc(const void *src) {} virtual void SetSize(const int16_t width, const int16_t height) {} virtual void SetColor(uint32_t color) {} virtual void Load(void) {} virtual void SetText(const char *text) {} - virtual void AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) {} + virtual void AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) {} virtual void SetPos(int16_t posX, int16_t posY) {} virtual void Center(void) {} virtual void SetEventCb(i_lv_event_cb_t eventCb) {} @@ -82,23 +82,23 @@ public: }; -class GuiEngine +class VGuiEngine { public: - GuiEngine() = default; - virtual ~GuiEngine() = default; + VGuiEngine() = default; + virtual ~VGuiEngine() = default; /** * @brief Get the Instance object - * Return reference for runing faster. Usage : GuiEngine::GetInstance()->Init(); - * Don't use GuiEngine like this: - * std::shared_ptr &log = GuiEngine::GetInstance(); - * or std::shared_ptr log = GuiEngine::GetInstance(); + * Return reference for runing faster. Usage : VGuiEngine::GetInstance()->Init(); + * Don't use VGuiEngine like this: + * std::shared_ptr &log = VGuiEngine::GetInstance(); + * or std::shared_ptr log = VGuiEngine::GetInstance(); * @param impl - * @return std::shared_ptr& + * @return std::shared_ptr& */ - static std::shared_ptr &GetInstance(std::shared_ptr *impl = nullptr) + static std::shared_ptr &GetInstance(std::shared_ptr *impl = nullptr) { - static auto instance = std::make_shared(); + static auto instance = std::make_shared(); if (impl) { /** @@ -121,13 +121,13 @@ public: virtual const int16_t GetScreenWidth(void) { return 1;} virtual const int16_t GetScreenHeight(void) { return 1;} virtual StatusCode CreateFrameParObject(int16_t widht = 100, int16_t height = 100, int16_t posX = 0, int16_t posY = 0) { return CreateStatusCode(STATUS_CODE_OK); } // 这个界面不应该放出来, 在应用层初始化的时候使用 - virtual std::shared_ptr GetFrameParObject(void) { return std::make_shared(); } - virtual StatusCode SetNowNode(std::shared_ptr) { return CreateStatusCode(STATUS_CODE_OK); } // 这个函数不应该放出来, 在切换界面的时候使用 - virtual std::shared_ptr GetNowNode(void) { return nullptr; } - virtual std::shared_ptr NewWidget(void) { return std::make_shared(); } - virtual std::shared_ptr NewPage(void) { return std::make_shared(); } - virtual std::shared_ptr NewImage(void) { return std::make_shared(); } - virtual std::shared_ptr NewButton(void) { return std::make_shared(); } + virtual std::shared_ptr GetFrameParObject(void) { return std::make_shared(); } + virtual StatusCode SetNowNode(std::shared_ptr) { return CreateStatusCode(STATUS_CODE_OK); } // 这个函数不应该放出来, 在切换界面的时候使用 + virtual std::shared_ptr GetNowNode(void) { return nullptr; } + virtual std::shared_ptr NewWidget(void) { return std::make_shared(); } + virtual std::shared_ptr NewPage(void) { return std::make_shared(); } + virtual std::shared_ptr NewImage(void) { return std::make_shared(); } + virtual std::shared_ptr NewButton(void) { return std::make_shared(); } }; diff --git a/middleware/GuiEngine/lvgl_board/LvglBoard.cpp b/middleware/GuiEngine/lvgl_board/LvglBoard.cpp index 0fdbbb0..4e8aa56 100755 --- a/middleware/GuiEngine/lvgl_board/LvglBoard.cpp +++ b/middleware/GuiEngine/lvgl_board/LvglBoard.cpp @@ -4,8 +4,8 @@ #include bool CreateGuiEngineImpl() { - std::shared_ptr impl = std::move(std::make_shared()); - GuiEngine::GetInstance(&impl); + std::shared_ptr impl = std::move(std::make_shared()); + VGuiEngine::GetInstance(&impl); return true; } bool LvglLinuxBoard::Init(const unsigned int width, const unsigned int height, void (*appInit)()) diff --git a/middleware/GuiEngine/lvgl_common/GuiLvgl.cpp b/middleware/GuiEngine/lvgl_common/GuiLvgl.cpp index bf6ca2d..468a6e9 100644 --- a/middleware/GuiEngine/lvgl_common/GuiLvgl.cpp +++ b/middleware/GuiEngine/lvgl_common/GuiLvgl.cpp @@ -44,9 +44,9 @@ const int16_t GuiLvgl::GetScreenHeight(void) void FrameParObjectCb(i_lv_event_code_t e, void *userData) { - if(GuiEngine::GetInstance()->GetNowNode() != nullptr) + if(VGuiEngine::GetInstance()->GetNowNode() != nullptr) { - GuiEngine::GetInstance()->GetNowNode()->EventSend(e, userData); + VGuiEngine::GetInstance()->GetNowNode()->EventSend(e, userData); } else { @@ -69,24 +69,24 @@ StatusCode GuiLvgl::CreateFrameParObject(int16_t widht, int16_t height, int16_t } -std::shared_ptr GuiLvgl::GetFrameParObject(void) +std::shared_ptr GuiLvgl::GetFrameParObject(void) { return std::static_pointer_cast(_ParWidget); } -StatusCode GuiLvgl::SetNowNode(std::shared_ptr widget) +StatusCode GuiLvgl::SetNowNode(std::shared_ptr widget) { _NowNode = widget; return CreateStatusCode(STATUS_CODE_OK); } -std::shared_ptr GuiLvgl::GetNowNode(void) +std::shared_ptr GuiLvgl::GetNowNode(void) { return _NowNode; } -std::shared_ptr GuiLvgl::NewWidget(void) +std::shared_ptr GuiLvgl::NewWidget(void) { std::shared_ptr widget = std::make_shared(); widget->mWidget = lv_obj_create(JudgeParent()); @@ -94,13 +94,13 @@ std::shared_ptr GuiLvgl::NewWidget(void) } -std::shared_ptr GuiLvgl::NewPage(void) +std::shared_ptr GuiLvgl::NewPage(void) { return nullptr; } -std::shared_ptr GuiLvgl::NewImage(void) +std::shared_ptr GuiLvgl::NewImage(void) { std::shared_ptr widget = std::make_shared(); widget->mWidget = lv_img_create(JudgeParent()); @@ -108,7 +108,7 @@ std::shared_ptr GuiLvgl::NewImage(void) } -std::shared_ptr GuiLvgl::NewButton(void) +std::shared_ptr GuiLvgl::NewButton(void) { std::shared_ptr widget = std::make_shared(); widget->mWidget = lv_btn_create(JudgeParent()); diff --git a/middleware/GuiEngine/lvgl_common/GuiLvgl.h b/middleware/GuiEngine/lvgl_common/GuiLvgl.h index e12bef0..5becaba 100644 --- a/middleware/GuiEngine/lvgl_common/GuiLvgl.h +++ b/middleware/GuiEngine/lvgl_common/GuiLvgl.h @@ -20,7 +20,7 @@ #include "lvgl.h" -class GuiLvgl : public GuiEngine +class GuiLvgl : public VGuiEngine { public: GuiLvgl(); @@ -28,20 +28,20 @@ public: const int16_t GetScreenWidth(void) override; const int16_t GetScreenHeight(void) override; StatusCode CreateFrameParObject(int16_t widht, int16_t height, int16_t posX, int16_t posY) override; - std::shared_ptr GetFrameParObject(void) override; - StatusCode SetNowNode(std::shared_ptr) override; - std::shared_ptr GetNowNode(void) override; - std::shared_ptr NewWidget(void) override; - std::shared_ptr NewPage(void) override; - std::shared_ptr NewImage(void) override; - std::shared_ptr NewButton(void) override; + std::shared_ptr GetFrameParObject(void) override; + StatusCode SetNowNode(std::shared_ptr) override; + std::shared_ptr GetNowNode(void) override; + std::shared_ptr NewWidget(void) override; + std::shared_ptr NewPage(void) override; + std::shared_ptr NewImage(void) override; + std::shared_ptr NewButton(void) override; private: lv_obj_t* JudgeParent(void); private: - std::shared_ptr _LvglParWidget = nullptr; - std::shared_ptr _ParWidget = nullptr; - std::shared_ptr _NowNode = nullptr; + std::shared_ptr _LvglParWidget = nullptr; + std::shared_ptr _ParWidget = nullptr; + std::shared_ptr _NowNode = nullptr; }; #endif // !GUI_LVGL_H diff --git a/middleware/GuiEngine/lvgl_common/LvglWidget.cpp b/middleware/GuiEngine/lvgl_common/LvglWidget.cpp index b360da8..b421b8b 100644 --- a/middleware/GuiEngine/lvgl_common/LvglWidget.cpp +++ b/middleware/GuiEngine/lvgl_common/LvglWidget.cpp @@ -96,7 +96,7 @@ lv_align_t transitionAlignCode_AppMid(i_lv_align_t align) } } -void LvglWidget::AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) +void LvglWidget::AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) { if (mWidget) { diff --git a/middleware/GuiEngine/lvgl_common/LvglWidget.h b/middleware/GuiEngine/lvgl_common/LvglWidget.h index b0317f3..b0d106e 100644 --- a/middleware/GuiEngine/lvgl_common/LvglWidget.h +++ b/middleware/GuiEngine/lvgl_common/LvglWidget.h @@ -20,7 +20,7 @@ -class LvglWidget : public Widget +class LvglWidget : public VWidget { public: LvglWidget() @@ -29,10 +29,10 @@ public: } virtual ~LvglWidget() = default; void SetSize(const int16_t width, const int16_t height) override; - // void Load(void) override; // 好像挺有用的, 但不知道什么意思 + // void Load(void) override; void Center(void) override; void SetColor(uint32_t color) override; - void AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) override; + void AlignTo(std::shared_ptr base, i_lv_align_t align, int16_t posX, int16_t posY) override; void SetPos(int16_t posX, int16_t posY) override; void SetOpa(const uint8_t opaValue) override; void SetEventCb(i_lv_event_cb_t eventCb) override; diff --git a/middleware/GuiEngine/lvgl_x86/LvglLinux_x86.cpp b/middleware/GuiEngine/lvgl_x86/LvglLinux_x86.cpp index aae3652..153e0bf 100755 --- a/middleware/GuiEngine/lvgl_x86/LvglLinux_x86.cpp +++ b/middleware/GuiEngine/lvgl_x86/LvglLinux_x86.cpp @@ -16,8 +16,8 @@ extern "C" #endif bool CreateGuiEngineImpl() { - std::shared_ptr impl = std::move(std::make_shared()); - GuiEngine::GetInstance(&impl); + std::shared_ptr impl = std::move(std::make_shared()); + VGuiEngine::GetInstance(&impl); return true; } bool LvglLinuxX86::Init(const unsigned int width, const unsigned int height, void (*appInit)()) diff --git a/test/GuiInterface/src/GuiInterface.cpp b/test/GuiInterface/src/GuiInterface.cpp index da5d6c2..2fb9abd 100644 --- a/test/GuiInterface/src/GuiInterface.cpp +++ b/test/GuiInterface/src/GuiInterface.cpp @@ -84,10 +84,10 @@ TEST_F(GuiInterfaceTest, Demo) { CreateGuiEngineImpl(); - GuiEngine::GetInstance()->Init(LV_SCREEN_WIDTH, LV_SCREEN_HEIGHT, GuiTestMainWindow); + VGuiEngine::GetInstance()->Init(LV_SCREEN_WIDTH, LV_SCREEN_HEIGHT, GuiTestMainWindow); GuiTest::GetInstance()->GuiTestUninit(); - GuiEngine::GetInstance()->UnInit(); + VGuiEngine::GetInstance()->UnInit(); } }; // namespace GuiInterfaceTest diff --git a/test/GuiInterface/src/GuiInterfaceTest.cpp b/test/GuiInterface/src/GuiInterfaceTest.cpp index 8054b97..8dbb37a 100644 --- a/test/GuiInterface/src/GuiInterfaceTest.cpp +++ b/test/GuiInterface/src/GuiInterfaceTest.cpp @@ -40,13 +40,13 @@ void TestButtonCb(i_lv_event_code_t e, void *userData) const StatusCode GuiTest::GuiTestInit(const unsigned int width, const unsigned int height) { - _guiTestPar = GuiEngine::GetInstance()->NewWidget(); + _guiTestPar = VGuiEngine::GetInstance()->NewWidget(); _guiTestPar->SetSize(width, height); _guiTestPar->SetColor(0x077290); _guiTestPar->SetOpa(127); _guiTestPar->AlignTo(NULL, i_lv_align_t::I_LV_ALIGN_RIGHT_MID, 0, 0); - _testButton = GuiEngine::GetInstance()->NewButton(); + _testButton = VGuiEngine::GetInstance()->NewButton(); _testButton->SetSize(50, 50); /*Set its size*/ _testButton->SetEventCb(TestButtonCb); _testButton->AlignTo(_guiTestPar, i_lv_align_t::I_LV_ALIGN_CENTER, 0, 0); @@ -62,6 +62,6 @@ const StatusCode GuiTest::GuiTestUninit(void) void GuiTestMainWindow(void) { // Create a parent window for the application layer - GuiEngine::GetInstance()->CreateFrameParObject(LV_SCREEN_WIDTH, LV_SCREEN_HEIGHT, 0, 0); + VGuiEngine::GetInstance()->CreateFrameParObject(LV_SCREEN_WIDTH, LV_SCREEN_HEIGHT, 0, 0); GuiTest::GetInstance()->GuiTestInit(LV_SCREEN_WIDTH, LV_SCREEN_HEIGHT); } \ No newline at end of file diff --git a/test/GuiInterface/src/GuiInterfaceTest.h b/test/GuiInterface/src/GuiInterfaceTest.h index 596b0d3..30f3832 100644 --- a/test/GuiInterface/src/GuiInterfaceTest.h +++ b/test/GuiInterface/src/GuiInterfaceTest.h @@ -28,8 +28,8 @@ public: static std::shared_ptr &GetInstance(std::shared_ptr *impl = nullptr); private: - std::shared_ptr _guiTestPar; - std::shared_ptr _testButton; + std::shared_ptr _guiTestPar; + std::shared_ptr _testButton; }; void GuiTestMainWindow(void);