插件更新

fmp_settings.cpp

@@ -2,7 +2,6 @@
 #include <QSettings>
 #include <fmp_logger_i.h>
 #include <ctkServiceReference.h>
-#include <ctkPluginContext.h>
 #include "ui/window.h"
 #include <QDebug>
 
@@ -13,10 +12,10 @@
 /**
  * @brief The FMPSettings class
  */
-FMPSettings::FMPSettings(ctkPluginContext *context)
-    : d_ptr(new FMPSettingsPrivate(context))
+FMPSettings::FMPSettings(const FMPContext ctx)
+    : context(ctx),
+      d_ptr(new FMPSettingsPrivate())
 {
-    FMPLoggerInterface::InitContext(context);
     StartService();
 }
 
@@ -48,14 +47,14 @@ int FMPSettings::PostEvent(const QString &topic, const FMPProps &pps)
 }
 
 
-QVariant FMPSettings::GetValue(const QString &k, QVariant default_val)
+QVariant FMPSettings::GetValue(const QString &k, const QVariant &default_val)
 {
     Q_D(FMPSettings);
 
     return d->GetValue(k, default_val);
 }
 
-bool FMPSettings::SetValue(const QString &k, QVariant v)
+bool FMPSettings::SetValue(const QString &k, const QVariant &v)
 {
     Q_D(FMPSettings);
 
@@ -65,9 +64,8 @@ bool FMPSettings::SetValue(const QString &k, QVariant v)
 /**
  ***************************************************************
  */
-FMPSettingsPrivate::FMPSettingsPrivate(ctkPluginContext *ctx)
-    : _ctx(ctx),
-      _sets(0)
+FMPSettingsPrivate::FMPSettingsPrivate()
+    : _sets(0)
 { 
 
 }
@@ -75,11 +73,10 @@ FMPSettingsPrivate::FMPSettingsPrivate(ctkPluginContext *ctx)
 int FMPSettingsPrivate::Init()
 {
     if (!_sets) {
-        _sets = new QSettings(_ctx->getProperty(FMP_PROPKEY_CFG).toString(), QSettings::IniFormat);
+        _sets = new QSettings(FMP::GetProperties()[FMP_PROPKEY_CFG].toString(), QSettings::IniFormat);
     }
     else {
         FMPSettingsWindow * set_dlg = new FMPSettingsWindow(q_ptr);
-        set_dlg->SetPluginContext(_ctx);
         set_dlg->setsettings(_sets);
         set_dlg->show();
         connect(set_dlg,&FMPSettingsWindow::settingChanged,this,&FMPSettingsPrivate::SetValue);
@@ -98,12 +95,12 @@ int FMPSettingsPrivate::Uninit()
     return FMP_SUCCESS;
 }
 
-QVariant FMPSettingsPrivate::GetValue(const QString &k, QVariant default_val)
+QVariant FMPSettingsPrivate::GetValue(const QString &k, const QVariant &default_val)
 {
     return _sets->value(k, default_val);
 }
 
-bool FMPSettingsPrivate::SetValue(const QString &k, QVariant v)
+bool FMPSettingsPrivate::SetValue(const QString &k, const QVariant &v)
 {
     _sets->setValue(k, v);
     return (_sets->value(k) == v);

fmp_settings.h

@@ -4,7 +4,6 @@
 #include "fmp_settings_i.h"
 #include "ui./window.h"
 
-class ctkPluginContext;
 class FMPSettingsPrivate;
 
 /**
@@ -18,7 +17,7 @@ class FMPSettings : public QObject, public FMPSettingsInterface
     Q_DECLARE_PRIVATE(FMPSettings)
 
 public:
-    explicit            FMPSettings(ctkPluginContext *context);
+    explicit            FMPSettings(const FMPContext ctx);
     virtual             ~FMPSettings();
 
 protected:
@@ -26,14 +25,16 @@ protected:
     void                InitService();
     void                UninitService();
     int                 PostEvent(const QString &topic, const FMPProps &pps = FMPProps());
+    const FMPContext    GetContext() const { return context; }
 
     //! SettingsInterface
 public:
-    QVariant            GetValue(const QString &k, QVariant default_val);
-    bool                SetValue(const QString&k, QVariant v);
+    QVariant            GetValue(const QString &k, const QVariant &default_val);
+    bool                SetValue(const QString&k, const QVariant &v);
 
 private:
     FMPSettingsPrivate *d_ptr;
+    const FMPContext    context;
 };
 
 
@@ -46,16 +47,15 @@ class FMPSettingsPrivate:public QObject
     Q_OBJECT
     Q_DECLARE_PUBLIC(FMPSettings)
 public:
-    explicit            FMPSettingsPrivate(ctkPluginContext *ctx);
+    explicit            FMPSettingsPrivate();
 
     int                 Init();
     int                 Uninit();
-    QVariant            GetValue(const QString &k, QVariant default_val);
-    bool                SetValue(const QString&k, QVariant v);
+    QVariant            GetValue(const QString &k, const QVariant &default_val);
+    bool                SetValue(const QString&k, const QVariant &v);
 
 public:
     FMPSettings        *q_ptr;
-    ctkPluginContext   *_ctx;
     QSettings          *_sets;
 private:
     FMPSettingsWindow *settingwindow;

fmp_settings_def.h

@@ -3,17 +3,16 @@
 
 
 //! 插件全局属性
-#define FMP_PROPKEY_PLUGINPATH      "FMPPath"
+#define FMP_PROPKEY_LOADER          "Loader"
+#define FMP_PROPKEY_PLUGINPATH      "PluginPath"
 #define FMP_PROPKEY_CFG             "FMPConfig"
-#define FMP_PROPKEY_ENTRY           "FMPEntry"
+#define FMP_PROPKEY_ENTRY           "EntryService"
 #define FMP_PROPKEY_PID             "PMPPid"
 
 //! 配置文件 Key
 #define FMP_INIKEY_SERVICENAME      "Service/Name"
 #define FMP_INIKEY_SERVICEDESC      "Service/Desc"
 #define FMP_INIKEY_SERVICESTARTTYPE "Service/StartType"
-#define FMP_INIKEY_ENTRYSERVICE     "Plugin/EntryService"
-#define FMP_INIKEY_PLUGINPATH       "Plugin/Path"
 #define FMP_INIKEY_ANIMATION        "Plugin/Animation"
 
 
@@ -21,7 +20,7 @@
 
 #define FMP_INIKEY_SYNCNTERVAL      "Syncer/Interval"
 
-#define FMP_APPNAME                 "非码POS"
+#define FMP_APPNAME                 "非码 POS 插件"
 
 
 

fmp_settings_i.h

@@ -13,8 +13,10 @@
 class FMPSettingsInterface : public FMPBaseInterface
 {
 public:
-    virtual QVariant    GetValue(const QString& k, QVariant default_val = QVariant()) = 0;
-    virtual bool        SetValue(const QString&k, QVariant v) = 0;
+    virtual long        GetPluginId() const { return GetContext()->getPlugin()->getPluginId(); }
+
+    virtual QVariant    GetValue(const QString& k, const QVariant &default_val = QVariant()) = 0;
+    virtual bool        SetValue(const QString&k, const QVariant &v) = 0;
 
 
     bool                GetBool(const QString& k) { return GetValue(k).toBool(); }
@@ -27,6 +29,6 @@ public:
     QString             GetString(const QString& k) { return GetValue(k).toString(); }
 };
 
-Q_DECLARE_INTERFACE(FMPSettingsInterface, "com.fmp.settings")
+Q_DECLARE_INTERFACE(FMPSettingsInterface, "fmp.settings")
 
 #endif // FMP_SETTINGS_I_H

res/MANIFEST.MF

 Plugin-SymbolicName: fmp.settings
-Plugin-Version: 0.1.1
+Plugin-Version: 0.1.0
 Plugin-Name: fmp.settings
 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017
 Plugin-Vendor: Freemud

ui/window.cpp

@@ -163,10 +163,10 @@ void FMPSettingsWindow::on_btn_showwidget_clicked()
 void FMPSettingsWindow::OnTestPrintClicked()
 {
     if (_fmp_sets) {
-        FMPPrinterInterface *printer = _fmp_sets->GetService<FMPPrinterInterface>(_ctx);
+        FMPPrinterInterface *printer = FMP::GetService<FMPPrinterInterface>();
         if (printer) {
             printer->GetPrintName();
-            printer->DoPrint(QString::fromLocal8Bit("这是一个测试页看到此页说明打印正常!\r\n\r\n\r\n"));
+//            printer->DoPrint(QString::fromLocal8Bit("这是一个测试页看到此页说明打印正常!\r\n\r\n\r\n"));
         }
     }
 }

ui/window.h

@@ -22,7 +22,6 @@ public:
     explicit FMPSettingsWindow(FMPSettingsInterface *fmp_sets, QWidget *parent = 0);
     ~FMPSettingsWindow();
     void setsettings(QSettings *set);
-    void SetPluginContext(ctkPluginContext *ctx) { _ctx = ctx; }
 signals:
     bool settingChanged(const QString&,QVariant);
 
@@ -31,7 +30,6 @@ private:
     QSettings *m_set;
     QWidget *getwidget(QString widgetname);
     FMPSettingsInterface    *_fmp_sets;
-    ctkPluginContext        *_ctx;
 
 private slots:
     void onSettingeditingFinished();