初始化二

Control/flowControl.h

-/********************
+/********************
  * 流程控制
  * *****************/
 

DTools/clickedLineEdit.cpp

-#include "ClickedLineEdit.h"
+#include "ClickedLineEdit.h"

DTools/clickedLineEdit.h

-#ifndef CLICKEDLINEEDIT_H
+#ifndef CLICKEDLINEEDIT_H
 #define CLICKEDLINEEDIT_H
 
 #include <QMouseEvent>

DTools/dataManger.h

-#ifndef DATAMANGER_H
+#ifndef DATAMANGER_H
 #define DATAMANGER_H
 
 #include <QJsonObject>

DTools/headframe.cpp

-#include "headframe.h"
+#include "headframe.h"
 
 void HeadFrame::mouseMoveEvent(QMouseEvent *event)
 {

DTools/headframe.h

-#ifndef HEADFRAME_H
+#ifndef HEADFRAME_H
 #define HEADFRAME_H
 #include <QMouseEvent>
 #include <QFrame>

DTools/orderstatus.cpp

-#include "orderstatus.h"
+#include "orderstatus.h"
 #include "QsLog.h"
 #include <QCoreApplication>
 

DTools/orderstatus.h

-#ifndef ORDERSTATUS_H
+#ifndef ORDERSTATUS_H
 #define ORDERSTATUS_H
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>

DTools/sysTray.h

-#ifndef SYSTRAY_H
+#ifndef SYSTRAY_H
 #define SYSTRAY_H
 
 #include <QSystemTrayIcon>

DTools/util.cpp

-#include "util.h"
+#include "util.h"
 #include "preDefine.h"
 
 QString Penny2Dollar(int penny)

DTools/util.h

-#ifndef UTIL_H
+#ifndef UTIL_H
 #define UTIL_H
 
 #include <QString>

Model/baseObject.cpp

-#include "baseObject.h"
+#include "baseObject.h"
 #include <QStringList>
 #include <QVariant>
 #include "preDefine.h"

Model/baseObject.h

-#ifndef BASEOBJECT_H
+#ifndef BASEOBJECT_H
 #define BASEOBJECT_H
 
 #include <QObject>

Model/cashierObject.cpp

-#include "cashierObject.h"
+#include "cashierObject.h"

Model/cashierObject.h

-#ifndef CASHIEROBJECT_H
+#ifndef CASHIEROBJECT_H
 #define CASHIEROBJECT_H
 
 #include <QString>

Model/deliverObject.cpp

-#include "deliverObject.h"
+#include "deliverObject.h"
 
 QString DeliverObject::getId() const
 {

Model/deliverObject.h

-#ifndef DELIVEROBJECT_H
+#ifndef DELIVEROBJECT_H
 #define DELIVEROBJECT_H
 
 #include "baseObject.h"

Model/orderObject.cpp

-#include "orderObject.h"
+#include "orderObject.h"
 #include "preDefine.h"
 #include <QJsonArray>
 

Model/orderObject.h

-#ifndef ORDEROBJECT_H
+#ifndef ORDEROBJECT_H
 #define ORDEROBJECT_H
 
 #include "productObject.h"

Model/productObject.cpp

-#include "productObject.h"
+#include "productObject.h"
 
 QString ProductObject::getPid() const
 {

Model/productObject.h

-#ifndef PRODUCTOBJECT_H
+#ifndef PRODUCTOBJECT_H
 #define PRODUCTOBJECT_H
 
 #include "baseObject.h"

Network/billSocket.cpp

-#include "billSocket.h"
+#include "billSocket.h"
 
 #include <QtNetwork/QNetworkReply>
 #include "DTools/configManger.h"

Network/billSocket.h

-#ifndef BILLSOCKET_H
+#ifndef BILLSOCKET_H
 #define BILLSOCKET_H
 
 #include <QJsonObject>

RejectForm.cpp

-#include "RejectForm.h"
+#include "RejectForm.h"
 #include "ui_RejectForm.h"
 
 RejectForm::RejectForm(QWidget *parent) :

RejectForm.h

-#ifndef REJECTFORM_H
+#ifndef REJECTFORM_H
 #define REJECTFORM_H
 
 #include <QDialog>

RejectForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RejectForm</class>
  <widget class="QDialog" name="RejectForm">

alertForm.cpp

-#include "alertForm.h"
+#include "alertForm.h"
 #include "ui_alertForm.h"
 
 AlertForm::AlertForm(QWidget *parent) :

alertForm.h

-#ifndef ALERTFORM_H
+#ifndef ALERTFORM_H
 #define ALERTFORM_H
 
 // 通知窗口

alertForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AlertForm</class>
  <widget class="QDialog" name="AlertForm">

detailForm.h

-#ifndef DETAILFORM_H
+#ifndef DETAILFORM_H
 #define DETAILFORM_H
 
 #include <QDialog>

detailForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DetailForm</class>
  <widget class="QDialog" name="DetailForm">

floatForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FloatForm</class>
  <widget class="QDialog" name="FloatForm">

fmp_takeout.cpp

-#include "fmp_takeout_p.h"
+#include "fmp_takeout_p.h"
 #include "fmp_te_handlers.h"
 FMPTakeout::FMPTakeout(ctkPluginContext *context)
     : FMPTakeoutInterface(context),

fmp_takeout.pro

@@ -39,11 +39,6 @@ SOURCES +=fmp_takeout.cpp \
     Model/orderObject.cpp \
     Model/productObject.cpp \
     Network/billSocket.cpp \
-    QsLog/QsLog.cpp \
-    QsLog/QsLogDest.cpp \
-    QsLog/QsLogDestConsole.cpp \
-    QsLog/QsLogDestFile.cpp \
-    QsLog/QsLogDestFunctor.cpp \
     DTools/fmPlugin.cpp
 
 

fmp_takeout_i.h

-#ifndef FMPTAKEOUTINTERFACE_H
+#ifndef FMPTAKEOUTINTERFACE_H
 #define FMPTAKEOUTINTERFACE_H
 
 #include <fmp_plugin_i.h>

fmp_takeout_p.cpp

@@ -65,6 +65,8 @@ int FMPTakeoutPrivate::Uninit()
 
 void FMPTakeoutPrivate::InitTakeout()
 {
+    Q_Q(FMPTakeout);
+    _settings=q->GetService<FMPSettingsInterface>(q->_ctx);
     ConfigManger::GetInstance().InitConfigManger(_settings);
     inittask=new FMPInitTask();
     inittask->Init();

fmp_takeout_p.h

-#ifndef FMP_TAKEOUT_P_H
+#ifndef FMP_TAKEOUT_P_H
 #define FMP_TAKEOUT_P_H
 
 #include "fmp_takeout.h"

fmp_takeout_plugin.cpp

-/*=============================================================================
+/*=============================================================================
 
   Library: CTK
 
@@ -47,8 +47,6 @@ void FMPTakeoutPlugin::stop(ctkPluginContext* context)
     delete _takeout_service;
     _takeout_service = 0;
   }
-
-  int a = 0;
 }
 
 #if (QT_VERSION < QT_VERSION_CHECK(5,0,0))

fmp_takeout_plugin_p.h

-#ifndef FMP_EPAY_PLUGIN_P_H
+#ifndef FMP_EPAY_PLUGIN_P_H
 #define FMP_EPAY_PLUGIN_P_H
 
 #include <ctkPluginActivator.h>

fmp_te_handlers.cpp

@@ -6,6 +6,7 @@ FMPStartEventHandler::FMPStartEventHandler(ctkPluginContext *ctx, FMPTakeout *Ta
        Takeout),
       _ctx(ctx)
 {
+    qDebug()<<"Plugin number"<<QString::number(ctx->getPlugin()->getPluginId());
     FMPProps props;
     props[ctkEventConstants::EVENT_TOPIC] = _topic;
     _ctx->registerService<ctkEventHandler>(this, props);

fmp_te_handlers.h

-#ifndef FMPTAKEOUTEVENTHANDLER_H
+#ifndef FMPTAKEOUTEVENTHANDLER_H
 #define FMPTAKEOUTEVENTHANDLER_H
 
 #include <QObject>

fmpinittask.cpp

@@ -24,7 +24,7 @@ void FMPInitTask::LoadLogger()
     Logger& logger = Logger::instance();
     logger.setLoggingLevel(TraceLevel);
     QDir().mkdir(logDir);
-    QString logPath = QString("%1/%2").arg(logDir).arg("log");
+    QString logPath = QString("%1/%2").arg(logDir).arg("takeout_log.txt");
     DestinationPtr fileDst(DestinationFactory::MakeFileDestination(
     logPath, EnableLogRotation, MaxSizeBytes(2*1024*1024), MaxOldLogCount(50)));
     logger.addDestination(fileDst);
@@ -34,7 +34,8 @@ void FMPInitTask::LoadLogger()
 
 void FMPInitTask::LoadTheme(const QString &theme)
 {
-    QString rccPath = QString("%1/skin/%2.rcc").arg(g_appDir).arg(theme);
+
+    QString rccPath = QString("%1/skin/%2.rcc").arg(g_appDir.replace("bins","rcc")).arg(theme);
     qDebug()<<rccPath;
     if(!QFile(rccPath).exists())
     {

mainForm.cpp

-#include "mainForm.h"
-#include "QsLog.h"
+#include "mainForm.h"
 #include "ui_mainForm.h"
 #include "preDefine.h"
 #include "Control/flowControl.h"

mainForm.h

-#ifndef MAINFORM_H
+#ifndef MAINFORM_H
 #define MAINFORM_H
 
 #include <QDialog>

mainForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainForm</class>
  <widget class="QWidget" name="MainForm">

padForm.cpp

-#include "padForm.h"
+#include "padForm.h"
 #include "ui_padForm.h"
 
 PadForm::PadForm(QWidget *parent) :

padForm.h

-#ifndef PADFORM_H
+#ifndef PADFORM_H
 #define PADFORM_H
 
 #include <QDialog>

padForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PadForm</class>
  <widget class="QDialog" name="PadForm">

pickForm.cpp

-#include "pickForm.h"
+#include "pickForm.h"
 #include "ui_pickForm.h"
 #include "preDefine.h"
 #include "Control/flowControl.h"

pickForm.h

-#ifndef PICKFORM_H
+#ifndef PICKFORM_H
 #define PICKFORM_H
 
 #include <QDialog>

pickForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PickForm</class>
  <widget class="QDialog" name="PickForm">

settingForm.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SettingForm</class>
  <widget class="QDialog" name="SettingForm">

version.h

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