linux下编译运行通过

fmp_vip.pro

@@ -81,7 +81,12 @@ unix {
 #Target name
 VER = $$system($$PWD/../fmprc.bat $$TARGET)
 ORIGIN_TARGET = $$TARGET
-TARGET = $${TARGET}_$${VER}
+win32{
+    TARGET = $${TARGET}_$${VER}
+}
+else{
+    TARGET = $${TARGET}
+}
 
 #Header path
 INCLUDEPATH += $$PWD/../include/ctk \
@@ -96,7 +101,11 @@ LIBS += -lws2_32 -luser32
 
 CONFIG(debug, debug|release) {
     #Linking library
+    win32 {
         LIBS += -lCTKCored -lCTKPluginFrameworkd
+    }else{
+        LIBS += -lCTKCore -lCTKPluginFramework
+    }
     #Destination path
     DESTDIR = $$PWD/../debug/plugins
 } else {

fmp_vip_server.cpp

@@ -63,8 +63,8 @@ void FMPVipServer::onReadyRead()
         //向23771发送数据
         SendToMonitor(rspData);
     }
-    socket->waitForDisconnected();
-
+    socket->waitForDisconnected(2000);
+    socket->close();
     socket->deleteLater();
     socket = nullptr;
 

fmvipdispatcher.cpp

@@ -3,7 +3,7 @@
 #include <QTimer>
 #include <QJsonParseError>
 #include "fmp_vip_settings.h"
-#include <winsock2.h>
+//#include <winsock2.h>
 #include "fmvipdispatcher.h"
 #include "fmtask.h"
 #include "taskfactory.h"

task/fmtask.cpp

@@ -7,13 +7,13 @@
 #include <QCryptographicHash>
 #include "fmp_vip_settings.h"
 
-#define RunFunction(function)   do {    \
-        function##();                   \
-        if(error() != FM_API_SUCCESS) { \
-            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
-            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
-        }                               \
-} while(0);
+//#define RunFunction(function)   do {    \
+//        function##();                   \
+//        if(error() != FM_API_SUCCESS) { \
+//            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
+//            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
+//        }                               \
+//} while(0);
 
 FMTask::FMTask(QJsonObject &jsonObj, FM_TYPE fmType, Session *session, QObject *parent) :
     QObject(parent),
@@ -45,10 +45,39 @@ FMTask::~FMTask()
 QByteArray FMTask::doTask()
 {
     FMP_DEBUG() << __FUNCTION__;
-    RunFunction(copyPros);
-    RunFunction(setWindow);
-    RunFunction(showWindow);
-    RunFunction(packagePOSRsp);
+//    RunFunction(copyPros);
+//    RunFunction(setWindow);
+//    RunFunction(showWindow);
+//    RunFunction(packagePOSRsp);
+
+    do {
+           copyPros();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+           setWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+           showWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+           packagePOSRsp();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
 
     QJsonDocument json(posRspJsonObj);
     return json.toJson(QJsonDocument::Compact);

task/tasklogin.cpp

@@ -5,13 +5,13 @@
 #include <QJsonDocument>
 #include <QCryptographicHash>
 
-#define RunFunction(function)   do {    \
-        function##();                   \
-        if(error() != FM_API_SUCCESS) { \
-            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
-            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
-        }                               \
-} while(0);
+//#define RunFunction(function)   do {    \
+//        function##();                   \
+//        if(error() != FM_API_SUCCESS) { \
+//            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
+//            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
+//        }                               \
+//} while(0);
 
 TaskLogin::TaskLogin(QJsonObject &jsonObj, Session *session, QObject *parent)
     :QObject(parent)
@@ -30,9 +30,31 @@ TaskLogin::~TaskLogin()
 QByteArray TaskLogin::doTask()
 {
     FMP_DEBUG() << __FUNCTION__;
-    RunFunction(setWindow);
-    RunFunction(showWindow);
-    RunFunction(packagePOSRsp);
+//    RunFunction(setWindow);
+//    RunFunction(showWindow);
+//    RunFunction(packagePOSRsp);
+
+    do {
+            setWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+            showWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+            packagePOSRsp();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
 
     QJsonDocument json(posRspJsonObj);
     return json.toJson(QJsonDocument::Compact);

task/taskpay.cpp

@@ -9,13 +9,13 @@
 #include <QJsonObject>
 #include <QCryptographicHash>
 
-#define RunFunction(function)   do {    \
-        function##();                   \
-        if(error() != FM_API_SUCCESS) { \
-            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
-            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
-        }                               \
-} while(0);
+//#define RunFunction(function)   do {    \
+//        function##();                   \
+//        if(error() != FM_API_SUCCESS) { \
+//            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
+//            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
+//        }                               \
+//} while(0);
 
 TaskPay::TaskPay(QJsonObject &jsonObj, Session *session, QObject *parent)
     :QObject(parent)
@@ -65,9 +65,31 @@ QByteArray TaskPay::doTask()
         serverRspJsonObj.remove(key);
     }
     
-    RunFunction(setWindow);                   
-    RunFunction(showWindow);
-    RunFunction(packagePOSRsp);
+//    RunFunction(setWindow);
+//    RunFunction(showWindow);
+//    RunFunction(packagePOSRsp);
+
+    do {
+           setWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+           showWindow();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
+    do {
+           packagePOSRsp();
+            if(error() != FM_API_SUCCESS) {
+                FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+                return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
+            }
+    } while(0);
     
     QJsonDocument json(posRspJsonObj);
     return json.toJson(QJsonDocument::Compact);

windows/fmvipwnd.cpp

@@ -50,12 +50,12 @@ void FMVipWnd::setIsBusy(const bool isBusy)
 int FMVipWnd::exec()
 {
     showNormal();
-    ::SetForegroundWindow((HWND)effectiveWinId());
+//    ::SetForegroundWindow((HWND)effectiveWinId());
 
-    ::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+//    ::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 
-    showNormal();
-    ::SetForegroundWindow((HWND)effectiveWinId());
+//    showNormal();
+//    ::SetForegroundWindow((HWND)effectiveWinId());
 
     QDesktopWidget w;
     QRect rc = w.availableGeometry();