diff --git a/Core/tcpclient.cpp b/Core/tcpclient.cpp index 7a2d8c9..ae75b0e 100644 --- a/Core/tcpclient.cpp +++ b/Core/tcpclient.cpp @@ -30,21 +30,11 @@ void TCPClient::setConnect(ServerSettings *serverSettings) connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection); connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect); + connect(socket,&QTcpSocket::connected,this,&TCPClient::slotConnectNotify); connect(this,&TCPClient::sigRecognize,recognizeSystem,&RecognizeSystem::recognize,Qt::DirectConnection); socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort()); emit sigSendDebugLog("Try connect..."); - - socket->waitForReadyRead(); - - if(socket->state() != QTcpSocket::ConnectedState){ - emit sigSendDebugLog("Connect invalid"); - emit sigConnectionState(false); - return; - }else{ - emit sigSendDebugLog("Connect complete"); - emit sigConnectionState(true); - } } void TCPClient::sendClientAutorization() @@ -167,6 +157,18 @@ void TCPClient::slotMessageEntered(QString message) } } +void TCPClient::slotConnectNotify() +{ + if(socket->state() != QTcpSocket::ConnectedState){ + emit sigSendDebugLog("Connect invalid"); + emit sigConnectionState(false); + return; + }else{ + emit sigSendDebugLog("Connect complete"); + emit sigConnectionState(true); + } +} + void TCPClient::slotReadyRead() { if(!socket){ diff --git a/Core/tcpclient.h b/Core/tcpclient.h index fee4225..93001e8 100644 --- a/Core/tcpclient.h +++ b/Core/tcpclient.h @@ -41,6 +41,7 @@ signals: public slots: void slotMessageEntered(QString message); + void slotConnectNotify(); private slots: void slotReadyRead(); diff --git a/Makefile.Debug b/Makefile.Debug index 1c56d2f..b55e488 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -413,6 +413,9 @@ debug/moc_externalexecuter.cpp: Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \ + Core/tools.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ debug/moc_predefs.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\externalexecuter.h -o debug\moc_externalexecuter.cpp @@ -1432,6 +1435,9 @@ debug/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \ + Core/tools.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCoreApplication \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h @@ -2437,43 +2443,6 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QGridLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h diff --git a/Makefile.Release b/Makefile.Release index ce448ed..9acbaad 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -413,6 +413,9 @@ release/moc_externalexecuter.cpp: Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \ + Core/tools.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ release/moc_predefs.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\externalexecuter.h -o release\moc_externalexecuter.cpp @@ -1432,6 +1435,9 @@ release/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontiguouscache.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h \ + Core/tools.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCoreApplication \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.h @@ -2437,43 +2443,6 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QGridLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 92759c0..b653bd6 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/StaticData/hash.xml b/StaticData/hash.xml index 19d8b99..a36eeca 100644 --- a/StaticData/hash.xml +++ b/StaticData/hash.xml @@ -28,6 +28,7 @@ + @@ -185,9 +186,7 @@ - - - + @@ -197,6 +196,7 @@ + diff --git a/StaticData/settings.xml b/StaticData/settings.xml index e8b58bd..bcd528d 100644 --- a/StaticData/settings.xml +++ b/StaticData/settings.xml @@ -1,4 +1,4 @@ - + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index ed5ea4d..b06cef1 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/externalexecuter.o b/debug/externalexecuter.o index a6e43d0..5cab441 100644 Binary files a/debug/externalexecuter.o and b/debug/externalexecuter.o differ diff --git a/debug/moc_tcpclient.cpp b/debug/moc_tcpclient.cpp index 81832ba..63e07e0 100644 --- a/debug/moc_tcpclient.cpp +++ b/debug/moc_tcpclient.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_TCPClient_t { - QByteArrayData data[12]; - char stringdata0[140]; + QByteArrayData data[13]; + char stringdata0[158]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -43,13 +43,15 @@ QT_MOC_LITERAL(7, 67, 18), // "sigConnectionState" QT_MOC_LITERAL(8, 86, 4), // "flag" QT_MOC_LITERAL(9, 91, 15), // "sigGetXmlAnswer" QT_MOC_LITERAL(10, 107, 18), // "slotMessageEntered" -QT_MOC_LITERAL(11, 126, 13) // "slotReadyRead" +QT_MOC_LITERAL(11, 126, 17), // "slotConnectNotify" +QT_MOC_LITERAL(12, 144, 13) // "slotReadyRead" }, "TCPClient\0sigSendDebugLog\0\0message\0" "sigRecognize\0QTcpSocket*\0socket\0" "sigConnectionState\0flag\0sigGetXmlAnswer\0" - "slotMessageEntered\0slotReadyRead" + "slotMessageEntered\0slotConnectNotify\0" + "slotReadyRead" }; #undef QT_MOC_LITERAL @@ -59,7 +61,7 @@ static const uint qt_meta_data_TCPClient[] = { 8, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -67,14 +69,15 @@ static const uint qt_meta_data_TCPClient[] = { 4, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 44, 2, 0x06 /* Public */, - 4, 1, 47, 2, 0x06 /* Public */, - 7, 1, 50, 2, 0x06 /* Public */, - 9, 1, 53, 2, 0x06 /* Public */, + 1, 1, 49, 2, 0x06 /* Public */, + 4, 1, 52, 2, 0x06 /* Public */, + 7, 1, 55, 2, 0x06 /* Public */, + 9, 1, 58, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 10, 1, 56, 2, 0x0a /* Public */, - 11, 0, 59, 2, 0x08 /* Private */, + 10, 1, 61, 2, 0x0a /* Public */, + 11, 0, 64, 2, 0x0a /* Public */, + 12, 0, 65, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, @@ -84,6 +87,7 @@ static const uint qt_meta_data_TCPClient[] = { // slots: parameters QMetaType::Void, QMetaType::QString, 3, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -101,7 +105,8 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 3: { QByteArray _r = _t->sigGetXmlAnswer((*reinterpret_cast< QString(*)>(_a[1]))); if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break; case 4: _t->slotMessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 5: _t->slotReadyRead(); break; + case 5: _t->slotConnectNotify(); break; + case 6: _t->slotReadyRead(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -177,13 +182,13 @@ int TCPClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } return _id; } diff --git a/debug/moc_tcpclient.o b/debug/moc_tcpclient.o index 27e71ea..a1df8b3 100644 Binary files a/debug/moc_tcpclient.o and b/debug/moc_tcpclient.o differ diff --git a/debug/qrc_resources.cpp b/debug/qrc_resources.cpp index fdb365a..4f63a7c 100644 --- a/debug/qrc_resources.cpp +++ b/debug/qrc_resources.cpp @@ -113,7 +113,7 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/new/resoures/plane.png 0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x91,0x9c,0xe6,0x26,0x16, +0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f, }; diff --git a/debug/qrc_resources.o b/debug/qrc_resources.o index 38636ed..9aed195 100644 Binary files a/debug/qrc_resources.o and b/debug/qrc_resources.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index ebcfe0b..6cb32f8 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/save.xml b/save.xml deleted file mode 100644 index 4902929..0000000 --- a/save.xml +++ /dev/null @@ -1,2 +0,0 @@ - -