Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: long connection

Browse Source
This commit is contained in:
semenov
2024-09-10 12:15:41 +03:00
parent 429ccfb185
commit d3e03d6d91
15 changed files with 53 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Core/tcpclient.cpp
View File

@@ -30,21 +30,11 @@ void TCPClient::setConnect(ServerSettings *serverSettings)
connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection); connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection);
connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect); connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect);
connect(socket,&QTcpSocket::connected,this,&TCPClient::slotConnectNotify);
connect(this,&TCPClient::sigRecognize,recognizeSystem,&RecognizeSystem::recognize,Qt::DirectConnection); connect(this,&TCPClient::sigRecognize,recognizeSystem,&RecognizeSystem::recognize,Qt::DirectConnection);
socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort()); socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort());
emit sigSendDebugLog("Try connect..."); 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() 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() void TCPClient::slotReadyRead()
{ {
if(!socket){ if(!socket){

1
Core/tcpclient.h
View File

@@ -41,6 +41,7 @@ signals:
public slots: public slots:
void slotMessageEntered(QString message); void slotMessageEntered(QString message);
void slotConnectNotify();
private slots: private slots:
void slotReadyRead(); void slotReadyRead();

43
Makefile.Debug
View File

@@ -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/qcontiguouscache.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.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 \ debug/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe 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 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/qcontiguouscache.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.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 \
D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.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/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
ui_mainwindow.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 \
D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h

43
Makefile.Release
View File

@@ -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/qcontiguouscache.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.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 \ release/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe 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 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/qcontiguouscache.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.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 \
D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qeventloop.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/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
ui_mainwindow.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 \
D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h

2
RRJClient.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-09-05T14:57:52. --> <!-- Written by QtCreator 4.11.1, 2024-09-09T16:42:06. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

6
StaticData/hash.xml
View File

@@ -28,6 +28,7 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/> <FileData Path="/Application/RRJLoader/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
@@ -185,9 +186,7 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/> <FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="92ce18bfb39496d9601f59fe561fcc89"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="92ce18bfb39496d9601f59fe561fcc89"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file0.txt" Hash="878a83f23ce989da8ae151a37aac3e0f"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file0.txt" Hash="6df5b19544bd9db4fe37e5e650647f86"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1.txt" Hash="4b546cc4773f5f0bf9f67f94041c5796"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file2.txt" Hash="decf041e4d38c066dd44558f9b374be2"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
@@ -197,6 +196,7 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp/UserData.xml" Hash="229331a9f2b42840aa928b55856e9e47"/>
<FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/> <FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/>
<FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/> <FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/>
</FileDataList> </FileDataList>

2
StaticData/settings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ServerSettingsContainer> <ServerSettingsContainer>
<ServerSettings Address="127.0.0.17" Port="6000" Language="RUS" AutoStart="0"/> <ServerSettings Address="192.168.100.241" Port="6000" Language="RUS" AutoStart="0"/>
</ServerSettingsContainer> </ServerSettingsContainer>

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/externalexecuter.o
View File

Binary file not shown.

37
debug/moc_tcpclient.cpp
View File

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_TCPClient_t { struct qt_meta_stringdata_TCPClient_t {
QByteArrayData data[12]; QByteArrayData data[13];
char stringdata0[140]; char stringdata0[158];
}; };
#define QT_MOC_LITERAL(idx, ofs, len) \ #define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(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(8, 86, 4), // "flag"
QT_MOC_LITERAL(9, 91, 15), // "sigGetXmlAnswer" QT_MOC_LITERAL(9, 91, 15), // "sigGetXmlAnswer"
QT_MOC_LITERAL(10, 107, 18), // "slotMessageEntered" 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" "TCPClient\0sigSendDebugLog\0\0message\0"
"sigRecognize\0QTcpSocket*\0socket\0" "sigRecognize\0QTcpSocket*\0socket\0"
"sigConnectionState\0flag\0sigGetXmlAnswer\0" "sigConnectionState\0flag\0sigGetXmlAnswer\0"
"slotMessageEntered\0slotReadyRead" "slotMessageEntered\0slotConnectNotify\0"
"slotReadyRead"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
@@ -59,7 +61,7 @@ static const uint qt_meta_data_TCPClient[] = {
8, // revision 8, // revision
0, // classname 0, // classname
0, 0, // classinfo 0, 0, // classinfo
6, 14, // methods 7, 14, // methods
0, 0, // properties 0, 0, // properties
0, 0, // enums/sets 0, 0, // enums/sets
0, 0, // constructors 0, 0, // constructors
@@ -67,14 +69,15 @@ static const uint qt_meta_data_TCPClient[] = {
4, // signalCount 4, // signalCount
// signals: name, argc, parameters, tag, flags // signals: name, argc, parameters, tag, flags
1, 1, 44, 2, 0x06 /* Public */, 1, 1, 49, 2, 0x06 /* Public */,
4, 1, 47, 2, 0x06 /* Public */, 4, 1, 52, 2, 0x06 /* Public */,
7, 1, 50, 2, 0x06 /* Public */, 7, 1, 55, 2, 0x06 /* Public */,
9, 1, 53, 2, 0x06 /* Public */, 9, 1, 58, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags // slots: name, argc, parameters, tag, flags
10, 1, 56, 2, 0x0a /* Public */, 10, 1, 61, 2, 0x0a /* Public */,
11, 0, 59, 2, 0x08 /* Private */, 11, 0, 64, 2, 0x0a /* Public */,
12, 0, 65, 2, 0x08 /* Private */,
// signals: parameters // signals: parameters
QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, QMetaType::QString, 3,
@@ -84,6 +87,7 @@ static const uint qt_meta_data_TCPClient[] = {
// slots: parameters // slots: parameters
QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, QMetaType::QString, 3,
QMetaType::Void,
QMetaType::Void, QMetaType::Void,
0 // eod 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]))); case 3: { QByteArray _r = _t->sigGetXmlAnswer((*reinterpret_cast< QString(*)>(_a[1])));
if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break; if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break;
case 4: _t->slotMessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); 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: ; default: ;
} }
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
@@ -177,13 +182,13 @@ int TCPClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0) if (_id < 0)
return _id; return _id;
if (_c == QMetaObject::InvokeMetaMethod) { if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 6) if (_id < 7)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 6; _id -= 7;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 6) if (_id < 7)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 6; _id -= 7;
} }
return _id; return _id;
} }

BIN
debug/moc_tcpclient.o
View File

Binary file not shown.

2
debug/qrc_resources.cpp
View File

@@ -113,7 +113,7 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/new/resoures/plane.png // :/new/resoures/plane.png
0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, 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,
}; };

BIN
debug/qrc_resources.o
View File

Binary file not shown.

BIN
debug/tcpclient.o
View File

Binary file not shown.

2
save.xml
View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ServerNotify Code="END"/>