diff --git a/3rdlib/DeviceManage/bin/DeviceManage.dll b/3rdlib/DeviceManage/bin/DeviceManage.dll new file mode 100644 index 0000000..6660ae2 Binary files /dev/null and b/3rdlib/DeviceManage/bin/DeviceManage.dll differ diff --git a/3rdlib/DeviceManage/bin/x64/FTD3XX.dll b/3rdlib/DeviceManage/bin/FTD3XX.dll similarity index 100% rename from 3rdlib/DeviceManage/bin/x64/FTD3XX.dll rename to 3rdlib/DeviceManage/bin/FTD3XX.dll diff --git a/3rdlib/DeviceManage/bin/x64/ScriptProcess.dll b/3rdlib/DeviceManage/bin/ScriptProcess.dll similarity index 100% rename from 3rdlib/DeviceManage/bin/x64/ScriptProcess.dll rename to 3rdlib/DeviceManage/bin/ScriptProcess.dll diff --git a/3rdlib/DeviceManage/bin/x64/UAVTransport.dll b/3rdlib/DeviceManage/bin/UAVTransport.dll similarity index 100% rename from 3rdlib/DeviceManage/bin/x64/UAVTransport.dll rename to 3rdlib/DeviceManage/bin/UAVTransport.dll diff --git a/3rdlib/DeviceManage/bin/x64/ftd2xx64.dll b/3rdlib/DeviceManage/bin/ftd2xx64.dll similarity index 100% rename from 3rdlib/DeviceManage/bin/x64/ftd2xx64.dll rename to 3rdlib/DeviceManage/bin/ftd2xx64.dll diff --git a/3rdlib/DeviceManage/bin/x64/libgsl-dll.dll b/3rdlib/DeviceManage/bin/libgsl-dll.dll similarity index 100% rename from 3rdlib/DeviceManage/bin/x64/libgsl-dll.dll rename to 3rdlib/DeviceManage/bin/libgsl-dll.dll diff --git a/3rdlib/DeviceManage/bin/x64/DeviceManage.dll b/3rdlib/DeviceManage/bin/x64/DeviceManage.dll deleted file mode 100644 index 6ca2ae6..0000000 Binary files a/3rdlib/DeviceManage/bin/x64/DeviceManage.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/DeviceManage.dll b/3rdlib/DeviceManage/bin/x86/DeviceManage.dll deleted file mode 100644 index 65224d1..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/DeviceManage.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/FTD3XX.dll b/3rdlib/DeviceManage/bin/x86/FTD3XX.dll deleted file mode 100644 index 51c58a4..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/FTD3XX.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/ScriptProcess.dll b/3rdlib/DeviceManage/bin/x86/ScriptProcess.dll deleted file mode 100644 index b464306..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/ScriptProcess.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/UAVTransport.dll b/3rdlib/DeviceManage/bin/x86/UAVTransport.dll deleted file mode 100644 index 0400cc3..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/UAVTransport.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/ftd2xx.dll b/3rdlib/DeviceManage/bin/x86/ftd2xx.dll deleted file mode 100644 index ecafeb7..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/ftd2xx.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/bin/x86/libgsl-dll.dll b/3rdlib/DeviceManage/bin/x86/libgsl-dll.dll deleted file mode 100644 index 9ab9286..0000000 Binary files a/3rdlib/DeviceManage/bin/x86/libgsl-dll.dll and /dev/null differ diff --git a/3rdlib/DeviceManage/lib/x64/DeviceManage.lib b/3rdlib/DeviceManage/lib/x64/DeviceManage.lib deleted file mode 100644 index fe8d90b..0000000 Binary files a/3rdlib/DeviceManage/lib/x64/DeviceManage.lib and /dev/null differ diff --git a/3rdlib/DeviceManage/lib/x86/DeviceManage.lib b/3rdlib/DeviceManage/lib/x86/DeviceManage.lib deleted file mode 100644 index 2910ea5..0000000 Binary files a/3rdlib/DeviceManage/lib/x86/DeviceManage.lib and /dev/null differ diff --git a/src/MeasureTask.cpp b/src/MeasureTask.cpp index 8fd28cf..5f39783 100644 --- a/src/MeasureTask.cpp +++ b/src/MeasureTask.cpp @@ -14,13 +14,14 @@ MeasureTask::MeasureTask(int socketDescriptor, QObject *parent) void MeasureTask::run() { - QTcpSocket tcpSocket; - if (!tcpSocket.setSocketDescriptor(socketDescriptor)) { + QTcpSocket tcp_socket; + if (!tcp_socket.setSocketDescriptor(socketDescriptor)) { + emit errorOccurred(tcp_socket.errorString()); return; } QByteArray buffer; - while (tcpSocket.waitForReadyRead(500)) { - buffer.append(tcpSocket.readAll()); + while (tcp_socket.waitForReadyRead(500)) { + buffer.append(tcp_socket.readAll()); } if ( buffer.size() ) { QDataStream requst_data_stream(buffer); @@ -28,32 +29,32 @@ void MeasureTask::run() requst_data_stream >> cmd_type >> device_guid; if ( cmd_type == "START" ) { requst_data_stream >> cmd_data; - processStartMeasureCmd(&tcpSocket, device_guid, cmd_data); + processStartMeasureCmd(&tcp_socket, device_guid, cmd_data); } else if (cmd_type == "STOP") { - processStopMeasureCmd(&tcpSocket, device_guid); + processStopMeasureCmd(&tcp_socket, device_guid); } else if (cmd_type == "SET") { requst_data_stream >> cmd_data; - processSetDeviceMeasureConfigParamsCmd(&tcpSocket, device_guid, cmd_data); + processSetDeviceMeasureConfigParamsCmd(&tcp_socket, device_guid, cmd_data); } else if (cmd_type == "CLEAR") { - processClearDataCmd(&tcpSocket, device_guid); + processClearDataCmd(&tcp_socket, device_guid); } else if (cmd_type == "DEVICE") { - processGetMeasureDeviceListCmd(&tcpSocket); + processGetMeasureDeviceListCmd(&tcp_socket); } else { QByteArray replay_data; QDataStream replay_data_stream(replay_data); replay_data_stream << QString("UNKNOW") << false << QStringLiteral(u"未知请求"); - tcpSocket.write(replay_data); - tcpSocket.flush(); + tcp_socket.write(replay_data); + tcp_socket.flush(); } } else { QByteArray replay_data; QDataStream replay_data_stream(replay_data); replay_data_stream << QString("UNKNOW") << false << QStringLiteral(u"未知请求"); - tcpSocket.write(replay_data); - tcpSocket.flush(); + tcp_socket.write(replay_data); + tcp_socket.flush(); } - tcpSocket.disconnectFromHost(); - tcpSocket.waitForDisconnected(1000); + tcp_socket.disconnectFromHost(); + tcp_socket.waitForDisconnected(1000); } void MeasureTask::processStartMeasureCmd(QTcpSocket* socket, const QString &device_guid, const QString &cmd_data) diff --git a/src/MeasureTask.h b/src/MeasureTask.h index a97608a..fe83839 100644 --- a/src/MeasureTask.h +++ b/src/MeasureTask.h @@ -21,7 +21,7 @@ private: void processGetMeasureDeviceListCmd(QTcpSocket* socket); signals: - void error(QTcpSocket::SocketError socketError); + void errorOccurred(const QString &errorString); private: int socketDescriptor; diff --git a/src/src.pro b/src/src.pro index de16ac8..d6514ad 100644 --- a/src/src.pro +++ b/src/src.pro @@ -24,11 +24,13 @@ SOURCES += \ $${PWD}/MeasureServer.cpp \ $${PWD}/MeasureTask.cpp \ $${PWD}/main.cpp \ + MeasureClient.cpp \ MeasureDeviceController.cpp HEADERS += \ $${PWD}/MeasureServer.h \ $${PWD}/MeasureTask.h \ + MeasureClient.h \ MeasureDeviceController.h