1.日志更新使用方式为不用参数

fmp_he_handlers.cpp

@@ -23,6 +23,6 @@ void FMPStartEventHandler::handleEvent(const ctkEvent &event)
         _home->PostEvent(ack_topic, props);
     }
     else {
-        FMP_DEBUG_CTX(_ctx) << "No handler instance for event" << event.getTopic();
+        FMP_DEBUG() << "No handler instance for event" << event.getTopic();
     }
 }

fmp_home_navwindow.cpp

@@ -218,7 +218,7 @@ int NavWindow::addBlink(FMPluginInterface *plugin, const QString &image)
         blink();
     }
 
-    HOME_DEBUG() << "Add blink: " << blinkId;
+    FMP_DEBUG() << "Add blink: " << blinkId;
 
     return blinkId;
 }
@@ -242,7 +242,7 @@ bool NavWindow::removeBlink(int blinkId)
         }
     } while(0);
 
-    HOME_DEBUG() << "Stop blink: " << blinkId << " isOk: " << isOk;
+    FMP_DEBUG() << "Stop blink: " << blinkId << " isOk: " << isOk;
 
     return isOk;
 }
@@ -287,7 +287,7 @@ void NavWindow::blink()
                 loop.exec();
             }
             if(_blinkObjIdSet.contains(blinkObject.id)) {
-                HOME_DEBUG() << "Active blink plugin: " << blinkObject.id;
+                FMP_DEBUG() << "Active blink plugin: " << blinkObject.id;
                 // 如果blinkObject.id还在set中，说明没有调用该闪烁的stop方法，可以发送激活插件信号
                 emit pluginActived(blinkObject.plugin);
                 _blinkObjIdSet.remove(blinkObject.id);

fmp_home_p.cpp

@@ -19,6 +19,7 @@ FMPHomePrivate::FMPHomePrivate(FMPHome *q)
       _userName(""),
       _errorMsg("")
 {
+    FMPLoggerInterface::InitContext(q->_ctx);
 }
 
 FMPHomePrivate::~FMPHomePrivate()
@@ -29,9 +30,8 @@ FMPHomePrivate::~FMPHomePrivate()
 int FMPHomePrivate::Init()
 {
     Q_Q(FMPHome);
-    FMPLoggerInterface* logger = q->GetService<FMPLoggerInterface>(q->_ctx);
     _settings = q->GetService<FMPSettingsInterface>(q->_ctx);
-    FMPHomeSettings::instance()->init(_settings, logger);
+    FMPHomeSettings::instance()->init(_settings);
 
     _navWindow = new NavWindow;
 
@@ -62,7 +62,7 @@ int FMPHomePrivate::Uninit()
 
 void FMPHomePrivate::StartPlugins(const QVariantList &pids)
 {
-    HOME_DEBUG() << pids;
+    FMP_DEBUG() << pids;
 }
 
 int FMPHomePrivate::login()
@@ -113,10 +113,10 @@ void FMPHomePrivate::onPluginActived(FMPBaseInterface *plugin)
 void FMPHomePrivate::onMenuBtnClicked(QString btnName)
 {
     Q_Q(FMPHome);
-    FMP_DEBUG_CTX(q->_ctx) << "Menu clicked: " << btnName;
+    FMP_DEBUG() << "Menu clicked: " << btnName;
 
     if(btnName == "quit") {
-        FMP_DEBUG_CTX(q->_ctx) << "Will Quit!";
+        FMP_DEBUG() << "Will Quit!";
         q->PostEvent(FMP_TOPICS_QUIT);
         return;
     }
@@ -142,6 +142,6 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
 //        FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);
 //        e->StartService();
     } else if(btnName == "tool") {
-        HOME_DEBUG() << "tool menu";
+        FMP_DEBUG() << "tool menu";
     }
 }

fmp_home_settings.cpp

@@ -12,16 +12,11 @@ FMPHomeSettings *FMPHomeSettings::instance()
     return &homeSettings;
 }
 
-void FMPHomeSettings::init(FMPSettingsInterface *settings, FMPLoggerInterface *logger)
+void FMPHomeSettings::init(FMPSettingsInterface *settings)
 {
     this->_settings = settings;
-    this->_logger = logger;
 }
 
-FMPLoggerInterface *FMPHomeSettings::getLogger()
-{
-    return _logger;
-}
 
 bool FMPHomeSettings::getIsUseAnimation()
 {
@@ -71,7 +66,7 @@ QVariant FMPHomeSettings::_GetValue(const QString &key, QVariant defaultValue)
         return _settings->GetValue(key);
     }
     else {
-        HOME_WARN() << "Settings service not available";
+        FMP_WARN() << "Settings service not available";
     }
 
     return defaultValue;
@@ -84,7 +79,7 @@ bool FMPHomeSettings::_SetValue(const QString &key, QVariant value)
         return true;
     }
     else {
-        HOME_WARN() << "Settings service not available";
+        FMP_WARN() << "Settings service not available";
     }
 
     return false;

fmp_home_settings.h

@@ -12,9 +12,7 @@ class FMPHomeSettings : public QObject
     Q_OBJECT
 public:
     static FMPHomeSettings *instance();
-    void init(FMPSettingsInterface *settings, FMPLoggerInterface *logger);
-
-    FMPLoggerInterface *getLogger();
+    void init(FMPSettingsInterface *settings);
 
     /**
      * @brief getIsUseAnimation
@@ -61,12 +59,7 @@ private:
 
 private:
     FMPSettingsInterface *_settings;
-    FMPLoggerInterface *_logger;
 };
 
-#define HOME_DEBUG() FMP_DEBUG(FMPHomeSettings::instance()->getLogger())
-#define HOME_INFO()  FMP_INFO(FMPHomeSettings::instance()->getLogger())
-#define HOME_WARN()  FMP_WARN(FMPHomeSettings::instance()->getLogger())
-#define HOME_ERROR() FMP_ERROR(FMPHomeSettings::instance()->getLogger())
 
 #endif // FMP_VIP_SETTINGS_H

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 35
+#define VER_BUILD 4
 
 //! Convert version numbers to string
 #define _STR(S)  #S