diff --git a/jsapp/rich/JsAppImpl.cpp b/jsapp/rich/JsAppImpl.cpp index d1e38c6..c130024 100644 --- a/jsapp/rich/JsAppImpl.cpp +++ b/jsapp/rich/JsAppImpl.cpp @@ -61,12 +61,12 @@ void JsAppImpl::Start() VirtualScreenImpl::GetInstance().InitAll(pipeName, pipePort); isFinished = false; ILOG("Start run js app"); - OHOS::AppExecFwk::EventHandler::Current().SetMainThreadId(std::this_thread::get_id()); + OHOS::AppExecFwk::EventHandler::SetMainThreadId(std::this_thread::get_id()); RunJsApp(); ILOG("Js app run finished"); while (!isStop) { // Execute all tasks in the main thread - OHOS::AppExecFwk::EventHandler::Current().Run(); + OHOS::AppExecFwk::EventHandler::Run(); glfwRenderContext->PollEvents(); std::this_thread::sleep_for(std::chrono::milliseconds(1)); } diff --git a/jsapp/rich/external/EventHandler.cpp b/jsapp/rich/external/EventHandler.cpp index 0107635..55e8ecc 100644 --- a/jsapp/rich/external/EventHandler.cpp +++ b/jsapp/rich/external/EventHandler.cpp @@ -16,12 +16,6 @@ #include "EventHandler.h" namespace OHOS::AppExecFwk { - EventHandler& EventHandler::Current() - { - static EventHandler currentEventHandler; - return currentEventHandler; - } - void EventHandler::SetMainThreadId(std::thread::id id) { EventRunner::Current().SetMainThreadId(id); diff --git a/jsapp/rich/external/EventHandler.h b/jsapp/rich/external/EventHandler.h index 84df1a1..8e47f41 100644 --- a/jsapp/rich/external/EventHandler.h +++ b/jsapp/rich/external/EventHandler.h @@ -23,17 +23,16 @@ class EventHandler final { public: EventHandler() = default; ~EventHandler() = default; - static EventHandler& Current(); - void SetMainThreadId(std::thread::id id); - bool IsCurrentRunnerThread(); + static void SetMainThreadId(std::thread::id id); + static bool IsCurrentRunnerThread(); /** * Post a task. * * @param callback Task callback. * @param delayTime Process the event after 'delayTime' milliseconds. */ - bool PostTask(const Callback &callback, int64_t delayTime = 0); - void Run(); + static bool PostTask(const Callback &callback, int64_t delayTime = 0); + static void Run(); private: EventHandler(const EventHandler&) = delete;