做了一些修改
This commit is contained in:
parent
6ff281c4fa
commit
84cbe95aed
|
@ -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 6.0.2, 2023-01-14T14:51:27. -->
|
<!-- Written by QtCreator 6.0.2, 2023-01-15T17:08:29. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
|
|
|
@ -9,6 +9,7 @@ DataManager::DataManager(QObject *parent)
|
||||||
connect(tcpclient, &TCPClient::TCPClientDisconnected, this, &DataManager::TCPClientDisconnected);
|
connect(tcpclient, &TCPClient::TCPClientDisconnected, this, &DataManager::TCPClientDisconnected);
|
||||||
connect(tcpclient, &TCPClient::recv_data, this, &DataManager::recv_from_server);
|
connect(tcpclient, &TCPClient::recv_data, this, &DataManager::recv_from_server);
|
||||||
tcpclient->setServer("ourdocs.cn",35137);
|
tcpclient->setServer("ourdocs.cn",35137);
|
||||||
|
tcpclient->setTimeOut(500);
|
||||||
tcpclient->configAndrun();
|
tcpclient->configAndrun();
|
||||||
// tcpclient->setCallBack(recv_from_server);
|
// tcpclient->setCallBack(recv_from_server);
|
||||||
protocol = Protocol::getInstance();
|
protocol = Protocol::getInstance();
|
||||||
|
|
|
@ -78,7 +78,7 @@ void MainWidget::on_send_text_clicked()
|
||||||
QString currentTime = QTime::currentTime().toString("H:mm A");
|
QString currentTime = QTime::currentTime().toString("H:mm A");
|
||||||
QString html = "<a href=\"file:///" + filePath + "\">" + filename + "</a>";
|
QString html = "<a href=\"file:///" + filePath + "\">" + filename + "</a>";
|
||||||
qDebug() << html;
|
qDebug() << html;
|
||||||
ui->textEdit->append("<span><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] send a file \"" + html + "\"</b></font></span>");
|
ui->textEdit->append("<p><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] send a file \"" + html + "\"</b></font></p>");
|
||||||
this->sendFile(filePath,filename);
|
this->sendFile(filePath,filename);
|
||||||
}
|
}
|
||||||
else //私发文件
|
else //私发文件
|
||||||
|
@ -108,7 +108,7 @@ void MainWidget::on_send_text_clicked()
|
||||||
QString currentTime = QTime::currentTime().toString("H:mm A");
|
QString currentTime = QTime::currentTime().toString("H:mm A");
|
||||||
QString html = "<a href=\"file:///" + filePath + "\">" + filename + "</a>";
|
QString html = "<a href=\"file:///" + filePath + "\">" + filename + "</a>";
|
||||||
qDebug() << html;
|
qDebug() << html;
|
||||||
ui->textEdit->append("<span><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] send " + name + " a private file \"" + html + "\"</b></font><span>");
|
ui->textEdit->append("<p><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] send " + name + " a private file \"" + html + "\"</b></font><p>");
|
||||||
this->sendFile(filePath,filename,name);
|
this->sendFile(filePath,filename,name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -207,14 +207,14 @@ void MainWidget::on_send_btn_clicked()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QString currentTime = QTime::currentTime().toString("H:m A");
|
QString currentTime = QTime::currentTime().toString("H:m A");
|
||||||
ui->textEdit->append("<span><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] </b> " + text_self + "</font></span>");
|
ui->textEdit->append("<p><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] </b> " + text_self + "</font></p>");
|
||||||
emit send_to_user(username,to_user,data_text);
|
emit send_to_user(username,to_user,data_text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QString currentTime = QTime::currentTime().toString("H:m A");
|
QString currentTime = QTime::currentTime().toString("H:m A");
|
||||||
ui->textEdit->append("<span><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] :</b> " + text + "</font></span>");
|
ui->textEdit->append("<p><font color=\"MediumBlue\"><b>" + username + " [" + currentTime + "] :</b> " + text + "</font></p>");
|
||||||
emit send_text(username,text);
|
emit send_text(username,text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -272,7 +272,7 @@ void MainWidget::on_stop_clicked()
|
||||||
void MainWidget::update_text(QString sendname,QString data)
|
void MainWidget::update_text(QString sendname,QString data)
|
||||||
{
|
{
|
||||||
QString currentTime = QTime::currentTime().toString("H:m A");
|
QString currentTime = QTime::currentTime().toString("H:m A");
|
||||||
ui->textEdit->append("<span>" + sendname + " [" + currentTime + "] : " + data + "</span>");
|
ui->textEdit->append("<p>" + sendname + " [" + currentTime + "] : " + data + "</p>");
|
||||||
qDebug() << sendname + " [" + currentTime + "] : " + data;
|
qDebug() << sendname + " [" + currentTime + "] : " + data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -281,7 +281,7 @@ void MainWidget::update_file(QString sendname,QString filename,QString file_data
|
||||||
readFile(filename,QByteArray::fromHex(file_data.toUtf8()));
|
readFile(filename,QByteArray::fromHex(file_data.toUtf8()));
|
||||||
QString currentTime = QTime::currentTime().toString("H:m A");
|
QString currentTime = QTime::currentTime().toString("H:m A");
|
||||||
QString html = "<a href=\"file:///./Document/" + filename + "\">" + filename + "</a>";
|
QString html = "<a href=\"file:///./Document/" + filename + "\">" + filename + "</a>";
|
||||||
QString msg = "<span>" + username + " [" + currentTime + "] : " + QString("收到了一个来自%1的群发文件:").arg(sendname) + html + "</span>";
|
QString msg = "<p>" + username + " [" + currentTime + "] : " + QString("收到了一个来自%1的群发文件:").arg(sendname) + html + "</p>";
|
||||||
ui->textEdit->append(msg);
|
ui->textEdit->append(msg);
|
||||||
qDebug() << msg;
|
qDebug() << msg;
|
||||||
}
|
}
|
||||||
|
@ -291,7 +291,7 @@ void MainWidget::update_file_private(QString sendname,QString filename,QString f
|
||||||
readFile(filename,QByteArray::fromHex(file_data.toUtf8()));
|
readFile(filename,QByteArray::fromHex(file_data.toUtf8()));
|
||||||
QString currentTime = QTime::currentTime().toString("H:m A");
|
QString currentTime = QTime::currentTime().toString("H:m A");
|
||||||
QString html = "<a href=\"file:///./Document/" + filename + "\">" + filename + "</a>";
|
QString html = "<a href=\"file:///./Document/" + filename + "\">" + filename + "</a>";
|
||||||
QString msg = "<span>" + username + " [" + currentTime + "] : " + QString("收到了一个来自%1的私发文件:").arg(sendname) + html + "</span>";
|
QString msg = "<p>" + username + " [" + currentTime + "] : " + QString("收到了一个来自%1的私发文件:").arg(sendname) + html + "</p>";
|
||||||
ui->textEdit->append(msg);
|
ui->textEdit->append(msg);
|
||||||
qDebug() << msg;
|
qDebug() << msg;
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,7 +70,7 @@ void TCPClient::readSocket()
|
||||||
while(socket.bytesAvailable())//循环接收
|
while(socket.bytesAvailable())//循环接收
|
||||||
{
|
{
|
||||||
recv += socket.readAll();
|
recv += socket.readAll();
|
||||||
if (!socket.waitForReadyRead(500))//超时停止接收
|
if (!socket.waitForReadyRead(_timeout))//超时停止接收
|
||||||
{
|
{
|
||||||
/*QString error = sock->errorString();
|
/*QString error = sock->errorString();
|
||||||
string error_t = error.toStdString();
|
string error_t = error.toStdString();
|
||||||
|
@ -87,6 +87,12 @@ void TCPClient::readSocket()
|
||||||
emit recv_data(recv);
|
emit recv_data(recv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TCPClient::setTimeOut(int timeout)
|
||||||
|
{
|
||||||
|
_timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void TCPClient::setCallBack(void (*callback)(QString &mac, quint16 port, QByteArray &data))
|
void TCPClient::setCallBack(void (*callback)(QString &mac, quint16 port, QByteArray &data))
|
||||||
{
|
{
|
||||||
_callback = callback;
|
_callback = callback;
|
||||||
|
|
|
@ -14,6 +14,7 @@ public:
|
||||||
void configAndrun();
|
void configAndrun();
|
||||||
void setCallBack(void (*callback)(QString &ip, quint16 port,QByteArray &data));
|
void setCallBack(void (*callback)(QString &ip, quint16 port,QByteArray &data));
|
||||||
void setServer(QString IP, quint16 port);
|
void setServer(QString IP, quint16 port);
|
||||||
|
void setTimeOut(int timeout);
|
||||||
private slots:
|
private slots:
|
||||||
void readSocket();
|
void readSocket();
|
||||||
void connected();
|
void connected();
|
||||||
|
@ -24,6 +25,7 @@ private:
|
||||||
static void _sleep(int msec);
|
static void _sleep(int msec);
|
||||||
static QTcpSocket socket;
|
static QTcpSocket socket;
|
||||||
static TCPClient tcpclient_instance;
|
static TCPClient tcpclient_instance;
|
||||||
|
int _timeout = 20;
|
||||||
QString server_ip = "127.0.0.1";
|
QString server_ip = "127.0.0.1";
|
||||||
quint16 server_port = 7890;
|
quint16 server_port = 7890;
|
||||||
bool has_found = false;
|
bool has_found = false;
|
||||||
|
|
Loading…
Reference in New Issue