From ea21b9df91a18714845ca701e9b6c16905220cd6 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Wed, 27 Mar 2024 21:54:33 +0800 Subject: [PATCH] Improve. --- .../StateMachine/include/IStateMachine.h | 50 +++++-------------- middleware/StateMachine/src/IStateMachine.cpp | 39 +++++++++++++++ 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/middleware/StateMachine/include/IStateMachine.h b/middleware/StateMachine/include/IStateMachine.h index bddb7d46..64885764 100644 --- a/middleware/StateMachine/include/IStateMachine.h +++ b/middleware/StateMachine/include/IStateMachine.h @@ -45,10 +45,7 @@ public: virtual void GoInState() = 0; virtual void GoOutState() = 0; virtual bool ExecuteStateMsg(VStateMachineData *msg) = 0; - std::string GetStateName() - { - return mStateName; - } + std::string GetStateName(); private: std::string mStateName; @@ -58,41 +55,18 @@ class VStateMachineHandle public: VStateMachineHandle() = default; virtual ~VStateMachineHandle() = default; - virtual bool InitialStateMachine() - { - return false; - } - virtual void StatePlus(State *state, State *upper) - { - } - virtual void SetCurrentState(State *firstState) - { - } - virtual void StartStateMachine() - { - } - virtual void SendMessage(int msgName) - { - } - virtual void StopHandlerThread() - { - } - virtual void SendMessage(int msgName, const std::shared_ptr &messageObj) - { - } + virtual bool InitialStateMachine(); + virtual void StatePlus(State *state, State *upper); + virtual void SetCurrentState(State *firstState); + virtual void StartStateMachine(); + virtual void SendMessage(int msgName); + virtual void StopHandlerThread(); + virtual void SendMessage(int msgName, const std::shared_ptr &messageObj); virtual void MessageExecutedLater(int msgName, const std::shared_ptr &messageObj, - int64_t delayTimeMs) - { - } - virtual void SwitchState(State *targetState) - { - } - virtual void StopTimer(int timerName) - { - } - virtual void DelayMessage(VStateMachineData *msg) - { - } + int64_t delayTimeMs); + virtual void SwitchState(State *targetState); + virtual void StopTimer(int timerName); + virtual void DelayMessage(VStateMachineData *msg); }; class IStateMachine { diff --git a/middleware/StateMachine/src/IStateMachine.cpp b/middleware/StateMachine/src/IStateMachine.cpp index 4bec08fe..1af3d751 100644 --- a/middleware/StateMachine/src/IStateMachine.cpp +++ b/middleware/StateMachine/src/IStateMachine.cpp @@ -15,6 +15,45 @@ #include "IStateMachine.h" #include "ILog.h" #include +std::string State::GetStateName() +{ + return mStateName; +} +bool VStateMachineHandle::InitialStateMachine() +{ + return false; +} +void VStateMachineHandle::StatePlus(State *state, State *upper) +{ +} +void VStateMachineHandle::SetCurrentState(State *firstState) +{ +} +void VStateMachineHandle::StartStateMachine() +{ +} +void VStateMachineHandle::SendMessage(int msgName) +{ +} +void VStateMachineHandle::StopHandlerThread() +{ +} +void VStateMachineHandle::SendMessage(int msgName, const std::shared_ptr &messageObj) +{ +} +void VStateMachineHandle::MessageExecutedLater(int msgName, const std::shared_ptr &messageObj, + int64_t delayTimeMs) +{ +} +void VStateMachineHandle::SwitchState(State *targetState) +{ +} +void VStateMachineHandle::StopTimer(int timerName) +{ +} +void VStateMachineHandle::DelayMessage(VStateMachineData *msg) +{ +} std::shared_ptr &IStateMachine::GetInstance(std::shared_ptr *impl) { static std::shared_ptr instance = std::make_shared();