增加悬浮窗的显示与隐藏功能

takeout/control/ordergetwork.cpp

@@ -609,7 +609,7 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
             //if(orderObject.status == ServiceOrder || orderObject.status == CompleteOrder){
             if(orderObject.status == FirmOrder){
                 QString error;
-                if(!RpaInterface::sendToRPA(QJsonDocument(jsonObject).toJson(QJsonDocument::Compact),error)){
+                if(!RpaInterface::Instance().sendToRPA(QJsonDocument(jsonObject).toJson(QJsonDocument::Compact),error)){
                     QLOG_ERROR()<<"send to rpa failed:"<<error;
                 }else{
                     QLOG_INFO()<<"send data to RPA,orderid:"<<orderObject.order_id;

takeout/control/rpainterface.cpp

@@ -13,12 +13,23 @@ RpaInterface::RpaInterface()
     :    QTcpServer(),
          socket(nullptr)
 {
+    FMApplication::subscibeEvent(this, PosEvent::s_show_float);
+    FMApplication::subscibeEvent(this, PosEvent::s_hide_mainform);
+    FMApplication::subscibeEvent(this, PosEvent::s_hide_float);
+
+    QLOG_INFO()<<"listen port:"<<SERVER_PORT;
     if(!this->listen(QHostAddress::Any, SERVER_PORT)) {
         QLOG_INFO() << "Listen error: " << this->errorString();
     }
     connect(this, &QTcpServer::newConnection, this, &RpaInterface::onNewConnection);
 }
 
+RpaInterface &RpaInterface::Instance()
+{
+    static RpaInterface rpa;
+    return rpa;
+}
+
 void RpaInterface::onNewConnection()
 {
     socket = nextPendingConnection();
@@ -45,8 +56,10 @@ void RpaInterface::onReadyRead()
             if(recvObj.contains("show_window")){
                 bool show=recvObj["show_window"].toBool();
                 if(show){
+                    QLOG_INFO() << "s_show_float show";
                     DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
                 }else{
+                    QLOG_INFO() << "s_show_float hide";
                     DEFAULTPOSTEVENT(PosEvent::s_hide_mainform, "");
                     DEFAULTPOSTEVENT(PosEvent::s_hide_float, "");
                 }

takeout/control/rpainterface.h

@@ -2,6 +2,7 @@
 #define RPAINTERFACE_H
 #include <QTcpServer>
 #include <QTcpSocket>
+#include "workobject.h"
 
 #define FMSOCKFLAG 0x4d46
 
@@ -16,8 +17,9 @@ class RpaInterface:public QTcpServer
 {
     Q_OBJECT
 public:
-    RpaInterface();
-    static bool sendToRPA(const QByteArray &orderData,QString& error);
+    static RpaInterface& Instance();
+
+    bool sendToRPA(const QByteArray &orderData,QString& error);
 private slots:
     void onNewConnection();
     void onDisconnected();
@@ -25,7 +27,11 @@ private slots:
 
     int socketRecvData(char * recvBuf, int bufSize, QTcpSocket *sockClient);
 private:
+    RpaInterface();
+
+private:
     QTcpSocket *socket;
+    QString _token;
 };
 
 #endif // RPAINTERFACE_H

takeout/preDefine.h

@@ -18,12 +18,12 @@
 #define DEFAULT_PRTFORM             "prtlist"
 #define DEFAULT_PRTMODELFORM        "prtmodellist"
 
-#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-#define DEFAULT_ACCESS_TOKEN        "3e0e8e1b-ad85-4ec0-a0ec-ad92bb5ae043"
+//#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+//#define DEFAULT_ACCESS_TOKEN        "3e0e8e1b-ad85-4ec0-a0ec-ad92bb5ae043"
 
 //正式环境
-//#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-//#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
+#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
 
 
 #define TIMEOUT_TRY_LOGING          20000

takeout/view/newfloatform.cpp

@@ -35,6 +35,7 @@ NewFloatForm::NewFloatForm(QWidget *parent) :
     FMApplication::subscibeEvent(this, PosEvent::s_login_status);
     FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
     FMApplication::subscibeEvent(this, PosEvent::s_pickuporder_remind);
+    FMApplication::subscibeEvent(this, PosEvent::s_hide_float);
 
     m_bReminding = false;
 
@@ -260,6 +261,13 @@ bool NewFloatForm::event(QEvent *e)
          return true;
      }
 
+     if(e->type() == PosEvent::s_hide_float)
+     {
+         QLOG_INFO() << "rpa hide float form";
+         this->hide();
+         return true;
+     }
+
     return QWidget::event(e);
 }
 

takeout/view/newmainform.cpp

@@ -51,6 +51,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
     FMApplication::subscibeEvent(this, PosEvent::s_show_stalls);
     FMApplication::subscibeEvent(this,PosEvent::s_driver_order_status);
     FMApplication::subscibeEvent(this,PosEvent::s_show_pickup);
+    FMApplication::subscibeEvent(this, PosEvent::s_hide_mainform);
 
     //this->show();
     this->showFullScreen();
@@ -796,6 +797,13 @@ bool NewMainForm::event(QEvent *e)
         return true;
     }
 
+    if(e->type() == PosEvent::s_hide_mainform)
+    {
+        QLOG_INFO() << "rpa hide main form";
+        this->hide();
+        return true;
+    }
+
     return QWidget::event(e);
 }