diff --git a/DeviceHub/DeviceHubWindow.cpp b/DeviceHub/DeviceHubWindow.cpp index ff2ceed..77975b3 100644 --- a/DeviceHub/DeviceHubWindow.cpp +++ b/DeviceHub/DeviceHubWindow.cpp @@ -16,7 +16,7 @@ this->setWindowFlags(Qt::FramelessWindowHint); // 窗口大小为占满一屏 - QRect screenRect = QApplication::desktop()->screenGeometry(); + QRect screenRect = QApplication::desktop()->availableGeometry(); resize(screenRect.width(), screenRect.height()); // 将窗口移动到左上角 @@ -121,7 +121,6 @@ QJsonObject response = httpReq->getTokenByClientId(SettingConfig::getInstance().CLIENT_ID, SettingConfig::getInstance().APP_KEY); - std::cout << SettingConfig::getInstance().CLIENT_ID.toStdString() << " - " << SettingConfig::getInstance().APP_KEY.toStdString() << std::endl; return response.find("code")->toInt(); } diff --git a/DeviceHub/DeviceHubWindow.cpp b/DeviceHub/DeviceHubWindow.cpp index ff2ceed..77975b3 100644 --- a/DeviceHub/DeviceHubWindow.cpp +++ b/DeviceHub/DeviceHubWindow.cpp @@ -16,7 +16,7 @@ this->setWindowFlags(Qt::FramelessWindowHint); // 窗口大小为占满一屏 - QRect screenRect = QApplication::desktop()->screenGeometry(); + QRect screenRect = QApplication::desktop()->availableGeometry(); resize(screenRect.width(), screenRect.height()); // 将窗口移动到左上角 @@ -121,7 +121,6 @@ QJsonObject response = httpReq->getTokenByClientId(SettingConfig::getInstance().CLIENT_ID, SettingConfig::getInstance().APP_KEY); - std::cout << SettingConfig::getInstance().CLIENT_ID.toStdString() << " - " << SettingConfig::getInstance().APP_KEY.toStdString() << std::endl; return response.find("code")->toInt(); } diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp index 79b9af4..926c351 100644 --- a/DeviceHub/device/FrequencyTuning.cpp +++ b/DeviceHub/device/FrequencyTuning.cpp @@ -51,6 +51,16 @@ void FrequencyTuning::dataReceivedHandler(QByteArray data) { this->dataBuff.append(data); + + QDateTime now = QDateTime::currentDateTime(); + // 0. 输出到日志文件中 + QString date = now.toString("yyyy-MM-dd"); + + // 1. 原始字节数组数据 + QString filename = "serial_" + devCode + ".log"; + QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [recv] " + data + "\r\n[buffer]" + dataBuff.toHex(); + QLogUtil::writeRawDataLogByDate(date, filename, content); + int start = dataBuff.indexOf("$"); if (start < 0) { diff --git a/DeviceHub/DeviceHubWindow.cpp b/DeviceHub/DeviceHubWindow.cpp index ff2ceed..77975b3 100644 --- a/DeviceHub/DeviceHubWindow.cpp +++ b/DeviceHub/DeviceHubWindow.cpp @@ -16,7 +16,7 @@ this->setWindowFlags(Qt::FramelessWindowHint); // 窗口大小为占满一屏 - QRect screenRect = QApplication::desktop()->screenGeometry(); + QRect screenRect = QApplication::desktop()->availableGeometry(); resize(screenRect.width(), screenRect.height()); // 将窗口移动到左上角 @@ -121,7 +121,6 @@ QJsonObject response = httpReq->getTokenByClientId(SettingConfig::getInstance().CLIENT_ID, SettingConfig::getInstance().APP_KEY); - std::cout << SettingConfig::getInstance().CLIENT_ID.toStdString() << " - " << SettingConfig::getInstance().APP_KEY.toStdString() << std::endl; return response.find("code")->toInt(); } diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp index 79b9af4..926c351 100644 --- a/DeviceHub/device/FrequencyTuning.cpp +++ b/DeviceHub/device/FrequencyTuning.cpp @@ -51,6 +51,16 @@ void FrequencyTuning::dataReceivedHandler(QByteArray data) { this->dataBuff.append(data); + + QDateTime now = QDateTime::currentDateTime(); + // 0. 输出到日志文件中 + QString date = now.toString("yyyy-MM-dd"); + + // 1. 原始字节数组数据 + QString filename = "serial_" + devCode + ".log"; + QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [recv] " + data + "\r\n[buffer]" + dataBuff.toHex(); + QLogUtil::writeRawDataLogByDate(date, filename, content); + int start = dataBuff.indexOf("$"); if (start < 0) { diff --git a/DeviceHub/protocol/FrequencyTuningProtocolTX.cpp b/DeviceHub/protocol/FrequencyTuningProtocolTX.cpp index af4a1f7..77e60da 100644 --- a/DeviceHub/protocol/FrequencyTuningProtocolTX.cpp +++ b/DeviceHub/protocol/FrequencyTuningProtocolTX.cpp @@ -45,13 +45,17 @@ { ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = content.at(0); QList subValues = content.split(0x20); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->freqAdjust = subValues.at(1).toDouble(); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->freqAdjustAcc = subValues.at(2).toDouble(); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->phaseShift = subValues.at(3).toLongLong(); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->pulseWidth = subValues.at(4).toLongLong(); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->phaseAdjust = subValues.at(5).toDouble(); - ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; - return true; + if (subValues.size() == 6) + { + ((FrequencyTuningStatusFreqDto *)ftFrameData)->freqAdjust = subValues.at(1).toDouble(); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->freqAdjustAcc = subValues.at(2).toDouble(); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->phaseShift = subValues.at(3).toLongLong(); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->pulseWidth = subValues.at(4).toLongLong(); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->phaseAdjust = subValues.at(5).toDouble(); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; + return true; + } + return false; } case FrequencyTuningProtocolTX::FREQUENCY_TUNING_FRAME_TYPE::LOCK_FRAME : {