改进部分代码

This commit is contained in:
feiyangqingyun
2021-04-13 09:36:48 +08:00
parent bc5acc612e
commit 788da958fb
40 changed files with 1181 additions and 289 deletions

View File

@@ -22,34 +22,34 @@ void frmUdpClient::initForm()
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(on_btnSend_clicked()));
ui->cboxInterval->addItems(App::Intervals);
ui->cboxData->addItems(App::Datas);
ui->cboxInterval->addItems(AppConfig::Intervals);
ui->cboxData->addItems(AppConfig::Datas);
}
void frmUdpClient::initConfig()
{
ui->ckHexSend->setChecked(App::HexSendUdpClient);
ui->ckHexSend->setChecked(AppConfig::HexSendUdpClient);
connect(ui->ckHexSend, SIGNAL(stateChanged(int)), this, SLOT(saveConfig()));
ui->ckHexReceive->setChecked(App::HexReceiveUdpClient);
ui->ckHexReceive->setChecked(AppConfig::HexReceiveUdpClient);
connect(ui->ckHexReceive, SIGNAL(stateChanged(int)), this, SLOT(saveConfig()));
ui->ckAscii->setChecked(App::AsciiUdpClient);
ui->ckAscii->setChecked(AppConfig::AsciiUdpClient);
connect(ui->ckAscii, SIGNAL(stateChanged(int)), this, SLOT(saveConfig()));
ui->ckDebug->setChecked(App::DebugUdpClient);
ui->ckDebug->setChecked(AppConfig::DebugUdpClient);
connect(ui->ckDebug, SIGNAL(stateChanged(int)), this, SLOT(saveConfig()));
ui->ckAutoSend->setChecked(App::AutoSendUdpClient);
ui->ckAutoSend->setChecked(AppConfig::AutoSendUdpClient);
connect(ui->ckAutoSend, SIGNAL(stateChanged(int)), this, SLOT(saveConfig()));
ui->cboxInterval->setCurrentIndex(ui->cboxInterval->findText(QString::number(App::IntervalUdpClient)));
ui->cboxInterval->setCurrentIndex(ui->cboxInterval->findText(QString::number(AppConfig::IntervalUdpClient)));
connect(ui->cboxInterval, SIGNAL(currentIndexChanged(int)), this, SLOT(saveConfig()));
ui->txtServerIP->setText(App::UdpServerIP);
ui->txtServerIP->setText(AppConfig::UdpServerIP);
connect(ui->txtServerIP, SIGNAL(textChanged(QString)), this, SLOT(saveConfig()));
ui->txtServerPort->setText(QString::number(App::UdpServerPort));
ui->txtServerPort->setText(QString::number(AppConfig::UdpServerPort));
connect(ui->txtServerPort, SIGNAL(textChanged(QString)), this, SLOT(saveConfig()));
this->changeTimer();
@@ -57,23 +57,23 @@ void frmUdpClient::initConfig()
void frmUdpClient::saveConfig()
{
App::HexSendUdpClient = ui->ckHexSend->isChecked();
App::HexReceiveUdpClient = ui->ckHexReceive->isChecked();
App::AsciiUdpClient = ui->ckAscii->isChecked();
App::DebugUdpClient = ui->ckDebug->isChecked();
App::AutoSendUdpClient = ui->ckAutoSend->isChecked();
App::IntervalUdpClient = ui->cboxInterval->currentText().toInt();
App::UdpServerIP = ui->txtServerIP->text().trimmed();
App::UdpServerPort = ui->txtServerPort->text().trimmed().toInt();
App::writeConfig();
AppConfig::HexSendUdpClient = ui->ckHexSend->isChecked();
AppConfig::HexReceiveUdpClient = ui->ckHexReceive->isChecked();
AppConfig::AsciiUdpClient = ui->ckAscii->isChecked();
AppConfig::DebugUdpClient = ui->ckDebug->isChecked();
AppConfig::AutoSendUdpClient = ui->ckAutoSend->isChecked();
AppConfig::IntervalUdpClient = ui->cboxInterval->currentText().toInt();
AppConfig::UdpServerIP = ui->txtServerIP->text().trimmed();
AppConfig::UdpServerPort = ui->txtServerPort->text().trimmed().toInt();
AppConfig::writeConfig();
this->changeTimer();
}
void frmUdpClient::changeTimer()
{
timer->setInterval(App::IntervalUdpClient);
if (App::AutoSendUdpClient) {
timer->setInterval(AppConfig::IntervalUdpClient);
if (AppConfig::AutoSendUdpClient) {
if (!timer->isActive()) {
timer->start();
}
@@ -135,9 +135,9 @@ void frmUdpClient::readData()
data.resize(socket->pendingDatagramSize());
socket->readDatagram(data.data(), data.size(), &host, &port);
if (App::HexReceiveUdpClient) {
if (AppConfig::HexReceiveUdpClient) {
buffer = QUIHelper::byteArrayToHexStr(data);
} else if (App::AsciiUdpClient) {
} else if (AppConfig::AsciiUdpClient) {
buffer = QUIHelper::byteArrayToAsciiStr(data);
} else {
buffer = QString(data);
@@ -152,11 +152,11 @@ void frmUdpClient::readData()
QString str = QString("[%1:%2] %3").arg(ip).arg(port).arg(buffer);
append(1, str);
if (App::DebugUdpClient) {
int count = App::Keys.count();
if (AppConfig::DebugUdpClient) {
int count = AppConfig::Keys.count();
for (int i = 0; i < count; i++) {
if (App::Keys.at(i) == buffer) {
sendData(ip, port, App::Values.at(i));
if (AppConfig::Keys.at(i) == buffer) {
sendData(ip, port, AppConfig::Values.at(i));
break;
}
}
@@ -167,9 +167,9 @@ void frmUdpClient::readData()
void frmUdpClient::sendData(const QString &ip, int port, const QString &data)
{
QByteArray buffer;
if (App::HexSendUdpClient) {
if (AppConfig::HexSendUdpClient) {
buffer = QUIHelper::hexStrToByteArray(data);
} else if (App::AsciiUdpClient) {
} else if (AppConfig::AsciiUdpClient) {
buffer = QUIHelper::asciiStrToByteArray(data);
} else {
buffer = data.toUtf8();
@@ -184,7 +184,7 @@ void frmUdpClient::sendData(const QString &ip, int port, const QString &data)
void frmUdpClient::on_btnSave_clicked()
{
QString data = ui->txtMain->toPlainText();
App::saveData(data);
AppConfig::saveData(data);
on_btnClear_clicked();
}
@@ -200,5 +200,5 @@ void frmUdpClient::on_btnSend_clicked()
return;
}
sendData(App::UdpServerIP, App::UdpServerPort, data);
sendData(AppConfig::UdpServerIP, AppConfig::UdpServerPort, data);
}