完善插件信息

andrewbytecoder · andrewbytecoder · commit 7755c5d14593 · 2022-06-11T19:15:01.000+08:00
diff --git a/inc/dlms_error.h b/inc/dlms_error.h
@@ -0,0 +1,8 @@
+//
+// Created by andrew on 2022/6/11.
+//
+
+#ifndef DLMS_DLMS_ERROR_H
+#define DLMS_DLMS_ERROR_H
+
+#endif //DLMS_DLMS_ERROR_H
diff --git a/inc/plugin.h b/inc/plugin.h
@@ -13,23 +13,22 @@
  * 实际项目中随时可以替换成动态库插件形式，这里为demo代码采用直接链接编译的方式使用
  * */
 
-enum PluginType
+// 服务函数根据类型进行参数和返回值的确认
+enum PluginServiceType
 {
-    /// \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
+    String  = 0x1,
+    JSON    = 0x2,
+    Binary  = 0x4,
+    Integer = 0x8,
 };
 
+enum NotifyTypes
+{
+    NetBroken = 0,
+    Quit = 1,
+};
 
+class IDlms;
 class Plugin {
 public:
     enum PluginStatus : uint8_t {
@@ -49,7 +48,7 @@ class Plugin {
      *
      * @param lpIDlms 主框架对象指针
      */
-    virtual int32_t Init(IDlms *lpIDlms) = 0;
+    virtual int32_t Init(IDlms *lpIDlms, std::string& pluginName) = 0;
 
     virtual int32_t Start() = 0;
 
@@ -60,11 +59,17 @@ class Plugin {
     // 获取插件名字
     virtual std::string GetHandleName() = 0;
 
+    virtual int32_t SendAndReceive(PluginServiceType in, void *lpInData, PluginServiceType out, void *lpOutData) = 0;
+
+    virtual int32_t Send(PluginServiceType in, void *lpInData) = 0;
+
+    virtual int32_t Notify(PluginServiceType in, void *lpInData) = 0;
 
+    virtual bool ServiceSupport(PluginServiceType serviceType) = 0;
 
 protected:
-    volatile PluginStatus       m_pluginStatus{PLUGIN_UNKNOWN};
-    PluginType type;
+    volatile PluginStatus       pluginStatus{PLUGIN_UNKNOWN};
+    uint32_t serviceSupportList;
     std::string handleName; // name of the plugin
 };
 
diff --git a/src/dlms/dlms.cpp b/src/dlms/dlms.cpp
@@ -38,8 +38,6 @@ void JsonTest() {
 
 
 
-
-
     // 也可以通过直接赋值方式创建json对象，两种方式创建结果相同
     json j2 = {
             {"pi", 3.141},
@@ -68,14 +66,18 @@ int main(int argc, char* argv[]) {
 
     google::InitGoogleLogging(argv[0]);
     FLAGS_log_dir = "./log";
-
     LOG(INFO) << "Hello, world!";
 
-    std::string data;
-    data = 'a';
+    CDlms dlms;
+    // 1. 解析命令行参数
+    dlms.ParseCommandLine(argc, argv);
+
+
+
+
+
+
 
-    data = 65;
-    std::cout << data << std::endl;
 
     //...... DoSomething
     //Shutdown google's logging library.
@@ -118,49 +120,59 @@ Plugin *CDlms::GetPlugin(std::string &pluginName) {
     return nullptr;
 }
 
-//#define GET_CASE_INFO(X)                            \
-//do {                                                \
-//    case X:                                         \
-//    \
-//                                                    \
-//                                                    };
-int32_t CConfig::ParseCommandLine(int32_t argc, char **argv) {
+int32_t CDlms::ParseCommandLine(int32_t argc, char **argv) {
+    return config.ParseCommandLine(argc, argv);
+}
 
+#define POINTER_SAFE(lp)        ((nullptr == lp) ? "null" : lp)
 
+#define GET_CASE_INFO(X)                                                \
+    case X:                                                             \
+      configMap.emplace(std::make_pair(X, POINTER_SAFE(optarg)));       \
+      break;
 
-    int ch;
+int32_t CConfig::ParseCommandLine(int32_t argc, char *argv[]) {
 
-    opterr = 0;  //使getopt不行stderr输出错误信息
+    int ch;
     std::string opts = "a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:w:x:y:z:"
                        "A:B:C:D:E:F:G:H:I:J:K:L:M:N:O:P:Q:R:S:T:U:V:W:X:Y:Z:";
     while( (ch = getopt(argc, argv, opts.c_str())) != -1 )
     {
         switch(ch)
         {
-            case 'a':
-                printf("option=a, optopt=%c, optarg=%s\n", optopt, optarg);
-                break;
-            case 'b':
-                printf("option=b, optopt=%c, optarg=%s\n", optopt, optarg);
-                break;
-            case 'c':
-                printf("option=c, optopt=%c, optarg=%s\n", optopt, optarg);
-                break;
+            GET_CASE_INFO('a');
+            GET_CASE_INFO('b');
+            GET_CASE_INFO('c');
+            GET_CASE_INFO('d');
+            GET_CASE_INFO('e');
+            GET_CASE_INFO('f');
+            GET_CASE_INFO('g');
+            GET_CASE_INFO('h');
+            GET_CASE_INFO('i');
+            GET_CASE_INFO('j');
+            GET_CASE_INFO('k');
+            GET_CASE_INFO('l');
+            GET_CASE_INFO('m');
+            GET_CASE_INFO('n');
+            GET_CASE_INFO('o');
+            GET_CASE_INFO('p');
+            GET_CASE_INFO('q');
+            GET_CASE_INFO('r');
+            GET_CASE_INFO('s');
+            GET_CASE_INFO('t');
+            GET_CASE_INFO('u');
+            GET_CASE_INFO('v');
+            GET_CASE_INFO('w');
+            GET_CASE_INFO('x');
+            GET_CASE_INFO('y');
+            GET_CASE_INFO('z');
             case '?':
-                printf("result=?, optopt=%c, optarg=%s\n", optopt, optarg);
+                configMap['?'] = "Bad option!";
                 break;
             default:
                 printf("default, result=%c\n",ch);
                 break;
         }
-        printf("argv[%d]=%s\n", optind, argv[optind]);
     }
-    printf("result=-1, optind=%d\n", optind);   //看看最后optind的位置
-
-
     return 0;
-
-
-
-
 }
diff --git a/src/dlms/dlms.h b/src/dlms/dlms.h
@@ -14,6 +14,19 @@
 #include "json_proxy.h"
 
 
+
+class CConfig : public IConfig {
+public:
+    ~CConfig() override = default;
+
+    int32_t ParseCommandLine(int32_t argc, char* argv[]);
+
+
+private:
+    std::unordered_map<char, std::string> configMap;
+    JsonProxy* jsonProxy;
+};
+
 class CDlms : public IDlms {
 public:
     ~CDlms() override = default;
@@ -28,26 +41,12 @@ class CDlms : public IDlms {
 
     Plugin* GetPlugin(std::string& pluginName) override;
 
-
-
-private:
-    PluginManager pluginManager;
-
-
-};
-
-
-
-class CConfig : public IConfig {
-public:
-    ~CConfig() override = default;
-
     int32_t ParseCommandLine(int32_t argc, char* argv[]);
 
 
 private:
-    std::unordered_map<char, std::string> config;
-    JsonProxy* jsonProxy;
+    PluginManager pluginManager;
+    CConfig        config;
 };
 
 
