添加系统监听的websocket和Http库

andrewbytecoder · andrewbytecoder · commit c4513ef0261e · 2022-06-10T00:25:17.000+08:00
diff --git a/inc/dlms_bash.h b/inc/dlms_bash.h
@@ -6,7 +6,7 @@
 #define DLMS_DLMS_BASH_H
 #include <iostream>
 
-class IPlugin;
+class Plugin;
 class IDlms {
 public:
     virtual ~IDlms() = default;
@@ -37,14 +37,14 @@ class IDlms {
      *
      * @return 0:成功，其他：失败
      */
-    virtual int32_t Exit() = 0;
+    virtual int32_t Reset() = 0;
 
     /**
      * @brief 获取插件对象
      *
      * @return nullptr:失败，其他：成功
      */
-    virtual IPlugin *GetPluginByName(std::string &pluginName) = 0;
+    virtual Plugin *GetPlugin(std::string &pluginName) = 0;
 };
 
 
diff --git a/inc/plugin.h b/inc/plugin.h
@@ -5,25 +5,44 @@
 #ifndef DLMS_PLUGIN_H
 #define DLMS_PLUGIN_H
 #include <iostream>
+#include <memory>
+
 #include "dlms_bash.h"
 
 /*
  * 实际项目中随时可以替换成动态库插件形式，这里为demo代码采用直接链接编译的方式使用
  * */
 
+enum PluginType
+{
+    /// \brief A World plugin
+    WORLD_PLUGIN,
+    /// \brief A Model plugin
+    MODEL_PLUGIN,
+    /// \brief A Sensor plugin
+    SENSOR_PLUGIN,
+    /// \brief A System plugin
+    SYSTEM_PLUGIN,
+    /// \brief A Visual plugin
+    VISUAL_PLUGIN,
+    /// \brief A GUI plugin
+    GUI_PLUGIN
+};
+
 
-class IPlugin {
+class Plugin {
 public:
     enum PluginStatus : uint8_t {
         PLUGIN_UNKNOWN             = 0,
         PLUGIN_INIT                = 1,
         PLUGIN_RUNNING             = 2,
         PLUGIN_STOP                = 3,
-        PLUGIN_EXIT                = 4,
+        PLUGIN_Reset                = 4,
     };
+    //
 
 public:
-    virtual ~IPlugin() = default;
+    virtual ~Plugin() = default;
 
     /**
      * @brief 插件初始化
@@ -36,13 +55,17 @@ class IPlugin {
 
     virtual int32_t Stop() = 0;
 
-    virtual int32_t Exit() = 0;
+    virtual int32_t Reset() = 0;
 
+    // 获取插件名字
+    virtual std::string GetHandleName() = 0;
 
 
 
 protected:
     volatile PluginStatus       m_pluginStatus{PLUGIN_UNKNOWN};
+    PluginType type;
+    std::string handleName; // name of the plugin
 };
 
 
diff --git a/src/dlms/dlms.cpp b/src/dlms/dlms.cpp
@@ -45,11 +45,11 @@ int32_t CDlms::Stop() {
     return 0;
 }
 
-int32_t CDlms::Exit() {
+int32_t CDlms::Reset() {
     return 0;
 }
 
-IPlugin *CDlms::GetPluginByName(std::string &pluginName) {
+Plugin *CDlms::GetPlugin(std::string &pluginName) {
 
     auto iter = m_mapPlugin.find(pluginName);
     if (iter == m_mapPlugin.end()) {
diff --git a/src/dlms/dlms.h b/src/dlms/dlms.h
@@ -9,6 +9,7 @@
 
 #include "plugin.h"
 #include <dlms_bash.h>
+#include "plugin_manager.h"
 
 class CDlms : public IDlms {
 public:
@@ -20,15 +21,14 @@ class CDlms : public IDlms {
 
     int32_t Stop() override;
 
-    int32_t Exit() override;
-
-    IPlugin* GetPluginByName(std::string& pluginName) override;
+    int32_t Reset() override;
 
+    Plugin* GetPlugin(std::string& pluginName) override;
 
 
 
 private:
-    std::map<std::string, IPlugin*> m_mapPlugin;
+    PluginManager pluginManager;
 
 };
 
diff --git a/src/dlms/plugin_manager.cpp b/src/dlms/plugin_manager.cpp
@@ -0,0 +1,17 @@
+//
+// Created by andrew on 2022/6/10.
+//
+
+#include "plugin_manager.h"
+
+int32_t PluginManager::LoadPlugin(const std::string &path, const std::string &pluginName) {
+    return 0;
+}
+
+int32_t PluginManager::LoadPlugin(const std::string &path) {
+    return 0;
+}
+
+Plugin *PluginManager::GetPlugin(const std::string &pluginName) {
+    return nullptr;
+}
diff --git a/src/dlms/plugin_manager.h b/src/dlms/plugin_manager.h
@@ -0,0 +1,30 @@
+//
+// Created by andrew on 2022/6/10.
+//
+
+#ifndef DLMS_PLUGIN_MANAGER_H
+#define DLMS_PLUGIN_MANAGER_H
+#include <map>
+#include <string>
+
+
+#include "plugin.h"
+
+
+class PluginManager {
+public:
+    int32_t LoadPlugin(const std::string& path, const std::string& pluginName);
+
+    int32_t LoadPlugin(const std::string& path);
+
+    Plugin *GetPlugin(const std::string& pluginName);
+
+
+
+private:
+    std::map<std::string, Plugin*> mapPlugins;
+
+};
+
+
+#endif //DLMS_PLUGIN_MANAGER_H

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ int32_t CDlms::Stop() {`
`45`	`45`	`return 0;`
`46`	`46`	`}`
`47`	`47`
`48`		`-int32_t CDlms::Exit() {`
	`48`	`+int32_t CDlms::Reset() {`
`49`	`49`	`return 0;`
`50`	`50`	`}`
`51`	`51`
`52`		`-IPlugin *CDlms::GetPluginByName(std::string &pluginName) {`
	`52`	`+Plugin *CDlms::GetPlugin(std::string &pluginName) {`
`53`	`53`
`54`	`54`	`auto iter = m_mapPlugin.find(pluginName);`
`55`	`55`	`if (iter == m_mapPlugin.end()) {`