diff --git a/ChannelList.cpp b/ChannelList.cpp index 407293f..ff34df9 100644 --- a/ChannelList.cpp +++ b/ChannelList.cpp @@ -497,7 +497,6 @@ void CChannelList::putJson() QVector().swap(g_ChannelBaseInfo); QMap>().swap(g_MapChannel); - g_channelSetting = g_SqliteDB->GetDataMultiLine("t_ChannelSetting"); for (int i = 0; i < g_channelSetting.size(); i++) { diff --git a/mainwindow.cpp b/mainwindow.cpp index d3aa5a4..307e6b4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -129,7 +129,9 @@ void MainWindow::initWindow() ui->widgetLeft4->setProperty("nav", "left"); ui->widgetLeft4->setProperty("flag", "left"); - this->resize(1024,768); + + + this->resize(1024,767); QFont font; font.setPixelSize(15); @@ -701,8 +703,6 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload) }else if(TriggerObj.contains("cmd")){ qDebug() << TriggerObj << endl; } - - }else if(strTopic == m_triggerAlarmSatusTopic){ QString strReceive = QString(payload); customLogMessageHandler(QtDebugMsg,strReceive); @@ -737,7 +737,6 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload) } } } - } } @@ -777,10 +776,8 @@ void MainWindow::slotNetMgr(QString sAddr, const QVariant &msg) void MainWindow::on_pushButton_detail_clicked() { QJsonDocument jsonDoc; - QNetworkRequest req; QString sUrl = QString("http://%1/cgi-bin/General.cgi/").arg(IP); - QJsonObject allObj,cmdBody; allObj.insert("cmd", "87"); req.setUrl(sUrl);