增加websocket的客户端和服务器端代码

andrewgithub · andrewgithub · commit 7e244bdd3ce3 · 2022-06-28T19:40:30.000+08:00
diff --git a/inc/dlms_bash.h b/inc/dlms_bash.h
@@ -5,9 +5,13 @@
 #ifndef DLMS_DLMS_BASH_H
 #define DLMS_DLMS_BASH_H
 #include <iostream>
+#include <functional>
 
 class Plugin;
 class IDlms {
+public:
+    typedef typename std::function<int32_t ()> Func;
+
 public:
     virtual ~IDlms() = default;
 
@@ -45,6 +49,11 @@ class IDlms {
      * @return nullptr:失败，其他：成功
      */
     virtual Plugin *GetPlugin(std::string &pluginName) = 0;
+
+    // 将需要工作的线程放到Push里面
+    virtual uint32_t PushWork(Func workFunction) = 0;
+    // 如果某些函数不需要再执行了就Pop掉，之后主框架就不在执行该函数了
+    virtual int32_t PopWork(uint32_t Index) = 0;
 };
 
 
diff --git a/inc/plugin.h b/inc/plugin.h
@@ -73,6 +73,13 @@ class Plugin {
     std::string handleName; // name of the plugin
 };
 
+#ifdef __cplusplus
+extern "C" {
+const char* GetVersion();
+Plugin *CreatePlugin(const char* pluginName);
+}
+
+#endif
 
 
 
diff --git a/plugins/websocket/websocket_client.cpp b/plugins/websocket/websocket_client.cpp
@@ -0,0 +1,5 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#include "websocket_client.h"
diff --git a/plugins/websocket/websocket_client.h b/plugins/websocket/websocket_client.h
@@ -0,0 +1,14 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#ifndef DLMS_WEBSOCKET_CLIENT_H
+#define DLMS_WEBSOCKET_CLIENT_H
+
+
+class websocket_client {
+
+};
+
+
+#endif //DLMS_WEBSOCKET_CLIENT_H
diff --git a/plugins/websocket/websocket_plugin.cpp b/plugins/websocket/websocket_plugin.cpp
@@ -0,0 +1,5 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#include "websocket_plugin.h"
diff --git a/plugins/websocket/websocket_plugin.h b/plugins/websocket/websocket_plugin.h
@@ -0,0 +1,14 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#ifndef DLMS_WEBSOCKET_PLUGIN_H
+#define DLMS_WEBSOCKET_PLUGIN_H
+
+
+class websocket_plugin {
+
+};
+
+
+#endif //DLMS_WEBSOCKET_PLUGIN_H
diff --git a/plugins/websocket/websocket_server.cpp b/plugins/websocket/websocket_server.cpp
@@ -0,0 +1,5 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#include "websocket_server.h"
diff --git a/plugins/websocket/websocket_server.h b/plugins/websocket/websocket_server.h
@@ -0,0 +1,14 @@
+//
+// Created by wangyz38535 on 2022/6/28.
+//
+
+#ifndef DLMS_WEBSOCKET_SERVER_H
+#define DLMS_WEBSOCKET_SERVER_H
+
+
+class websocket_server {
+
+};
+
+
+#endif //DLMS_WEBSOCKET_SERVER_H

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +//
 +// Created by wangyz38535 on 2022/6/28.
 +//
++
 +#include "websocket_client.h"