Commit 220f6485 by 李定达

1.修复界面展示bug

parent c3d3e16d
#include "ping.h" #include "ping.h"
#include "QsLog.h"
USHORT CPing::s_usPacketSeq = 0; USHORT CPing::s_usPacketSeq = 0;
...@@ -21,9 +22,14 @@ CPing::CPing() : ...@@ -21,9 +22,14 @@ CPing::CPing() :
if (m_szICMPData == NULL) if (m_szICMPData == NULL)
{ {
QLOG_ERROR() << "m_szICMPData ERROR code : " << WSAGetLastError();
m_bIsInitSucc = FALSE; m_bIsInitSucc = FALSE;
} }
} }
else
{
QLOG_ERROR() << "WSASocket failed code : " << WSAGetLastError();
}
} }
CPing::~CPing() CPing::~CPing()
...@@ -56,6 +62,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout) ...@@ -56,6 +62,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout)
//判断初始化是否成功 //判断初始化是否成功
if (!m_bIsInitSucc) if (!m_bIsInitSucc)
{ {
QLOG_DEBUG() << "m_bIsInitSucc failed : " << m_bIsInitSucc;
return FALSE; return FALSE;
} }
...@@ -81,6 +88,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout) ...@@ -81,6 +88,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout)
//发送ICMP报文 //发送ICMP报文
if (sendto(m_sockRaw, m_szICMPData, nICMPDataSize, 0, (struct sockaddr*)&sockaddrDest, nSockaddrDestSize) == SOCKET_ERROR) if (sendto(m_sockRaw, m_szICMPData, nICMPDataSize, 0, (struct sockaddr*)&sockaddrDest, nSockaddrDestSize) == SOCKET_ERROR)
{ {
QLOG_DEBUG() << "sendto failed";
return FALSE; return FALSE;
} }
...@@ -126,6 +134,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout) ...@@ -126,6 +134,7 @@ BOOL CPing::PingCore(DWORD dwDestIP, PingReply *pPingReply, DWORD dwTimeout)
//超时 //超时
if (GetTickCountCalibrate() - ulSendTimestamp >= dwTimeout) if (GetTickCountCalibrate() - ulSendTimestamp >= dwTimeout)
{ {
QLOG_DEBUG() << "GetTickCountCalibrate() - ulSendTimestamp >= dwTimeout failed";
return FALSE; return FALSE;
} }
} }
......
...@@ -14,6 +14,14 @@ NetworkCheckWork::NetworkCheckWork(WorkObject *parent) : WorkObject(parent) ...@@ -14,6 +14,14 @@ NetworkCheckWork::NetworkCheckWork(WorkObject *parent) : WorkObject(parent)
QString filename = qApp->applicationDirPath() + "/" + CONFIG_NAME; QString filename = qApp->applicationDirPath() + "/" + CONFIG_NAME;
_checkIP = QSettings(filename, QSettings::IniFormat).value(CONFIG_CHECKIP_IP).toString(); _checkIP = QSettings(filename, QSettings::IniFormat).value(CONFIG_CHECKIP_IP).toString();
_checkNum = QSettings(filename, QSettings::IniFormat).value(CONFIG_CHECKIP_INDEX).toInt(); _checkNum = QSettings(filename, QSettings::IniFormat).value(CONFIG_CHECKIP_INDEX).toInt();
if(_checkIP.isEmpty())
_checkIP= QString("114.114.114.114");
if(_checkNum == 0)
_checkNum = 2;
index = 0;
} }
NetworkCheckWork::~NetworkCheckWork() NetworkCheckWork::~NetworkCheckWork()
...@@ -52,6 +60,11 @@ void NetworkCheckWork::workstart() ...@@ -52,6 +60,11 @@ void NetworkCheckWork::workstart()
bool status = index < _checkNum; bool status = index < _checkNum;
QLOG_DEBUG() << "status : " << status;
QLOG_DEBUG() << "flag : " << flag;
QLOG_DEBUG() << "index : " << index;
QVariantMap map; QVariantMap map;
map.insert(EVENT_KEY_NETWORKSTATUS, status); map.insert(EVENT_KEY_NETWORKSTATUS, status);
POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap); POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap);
......
...@@ -166,12 +166,12 @@ void OrderPushWork::networkouttime(bool networkstatus) ...@@ -166,12 +166,12 @@ void OrderPushWork::networkouttime(bool networkstatus)
_networkstatic_index=0; _networkstatic_index=0;
QVariantMap map; QVariantMap map;
map.insert(EVENT_KEY_NETWORKSTATUS, networkstatus); map.insert(EVENT_KEY_NETWORKSTATUS, networkstatus);
POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap); //POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap);
}else if(!networkstatus && _networkstatic_index == 0){ }else if(!networkstatus && _networkstatic_index == 0){
_networkstatic_index++; _networkstatic_index++;
QVariantMap map; QVariantMap map;
map.insert(EVENT_KEY_NETWORKSTATUS, networkstatus); map.insert(EVENT_KEY_NETWORKSTATUS, networkstatus);
POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap); //POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap);
QLOG_INFO() << "static: s_network_outtime ..."; QLOG_INFO() << "static: s_network_outtime ...";
} }
......
...@@ -670,7 +670,7 @@ bool NewMainForm::event(QEvent *e) ...@@ -670,7 +670,7 @@ bool NewMainForm::event(QEvent *e)
GETEVENTINFO(value,e,QVariantMap); GETEVENTINFO(value,e,QVariantMap);
if(value.contains(EVENT_KEY_NETWORKSTATUS) && value[EVENT_KEY_NETWORKSTATUS].toBool() == true) if(value.contains(EVENT_KEY_NETWORKSTATUS) && value[EVENT_KEY_NETWORKSTATUS].toBool() == true)
{ {
onSetNetStatus(QString::fromUtf8("")); onSetNetStatus(QString("<font color='#ffffff'>%1</font>").arg(QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE6\xAD\xA3\xE5\xB8\xB8")));
}else{ }else{
QLOG_INFO() << "STATIC: EVENT_KEY_NETWORKSTATUS:false"; QLOG_INFO() << "STATIC: EVENT_KEY_NETWORKSTATUS:false";
onSetNetStatus(QString("<font color='#ff0000'>%1</font>").arg(QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE5\xBC\x82\xE5\xB8\xB8"))); onSetNetStatus(QString("<font color='#ff0000'>%1</font>").arg(QString::fromUtf8("\xE7\xBD\x91\xE7\xBB\x9C\xE5\xBC\x82\xE5\xB8\xB8")));
...@@ -695,7 +695,7 @@ bool NewMainForm::event(QEvent *e) ...@@ -695,7 +695,7 @@ bool NewMainForm::event(QEvent *e)
void NewMainForm::onSetNetStatus(const QString &netstatus) void NewMainForm::onSetNetStatus(const QString &netstatus)
{ {
ui->newmainlabel_net->setText(netstatus); ui->newmainlabel_netstatus->setText(netstatus);
} }
void NewMainForm::onMainTableItemClicked(QTableWidgetItem *item) void NewMainForm::onMainTableItemClicked(QTableWidgetItem *item)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment