diff --git a/PayloadAPP.pro b/PayloadAPP.pro
index 53933f9..1f14fc0 100644
--- a/PayloadAPP.pro
+++ b/PayloadAPP.pro
@@ -11,7 +11,7 @@ QMAKE_PROJECT_DEPTH = 0
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
#给exe默认管理员权限,否则无法调起管理员权限的第三方程序
-#QMAKE_LFLAGS += /MANIFESTUAC:\"level=\'requireAdministrator\' uiAccess=\'false\'\"
+# QMAKE_LFLAGS += /MANIFESTUAC:\"level=\'requireAdministrator\' uiAccess=\'false\'\"
SOURCES += \
global.cpp \
@@ -48,6 +48,8 @@ DISTFILES += \
res/Qss/qss.qss \
style.qss
+RC_ICONS = SDFP3.ico
+
INCLUDEPATH += $$PWD/ffmpeg/include \
$$PWD/Src/Video/
diff --git a/SDFP3.ico b/SDFP3.ico
new file mode 100644
index 0000000..20c3eee
Binary files /dev/null and b/SDFP3.ico differ
diff --git a/Src/GDDC/gddcSet.cpp b/Src/GDDC/gddcSet.cpp
index f53c10a..fe40f5f 100644
--- a/Src/GDDC/gddcSet.cpp
+++ b/Src/GDDC/gddcSet.cpp
@@ -38,8 +38,8 @@ void GDDCSet::initParam() {
// ui->comboBox_streamType->addItem("UDP 422");
// ui->comboBox_streamType->addItem("UDP TS");
ui->comboBox_playURL1->addItem("rtsp://192.168.55.65:554/live/track0");
- ui->comboBox_playURL1->addItem(
- "rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid");
+ // ui->comboBox_playURL1->addItem(
+ // "rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid");
ui->comboBox_playURL1->setEditable(true);
ui->lineEdit_pushURL->setText(
diff --git a/Src/Video/ffmpegpushstream.cpp b/Src/Video/ffmpegpushstream.cpp
index 588fd53..24079f9 100644
--- a/Src/Video/ffmpegpushstream.cpp
+++ b/Src/Video/ffmpegpushstream.cpp
@@ -114,7 +114,8 @@ int FFmpegPushStream::pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
auto now_time = av_gettime() - startTime; // 获取差值
int64_t delay = streamTime - now_time;
if (delay > 0) {
- qDebug() << "****************sleep time:" << QString::number(delay / 1000);
+ // qDebug() << "****************sleep time:" << QString::number(delay /
+ // 1000);
av_usleep(delay);
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6417ec9..469628b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -40,8 +40,8 @@ MainWindow::~MainWindow() {
delete m_SDFPDlg;
delete m_GDDCdlg;
delete m_HomePagedlg;
- //delete processPDT;
- // delete mWeb;
+ // delete processPDT;
+ // delete mWeb;
delete lLinkWeb;
delete adHocNetworkWeb;
delete satelliteCommWeb;
@@ -65,7 +65,7 @@ void MainWindow::initFile() {
}
}
void MainWindow::initWindow() {
- setWindowIcon(QIcon(":/res/SDFP.png"));
+ setWindowIcon(QIcon(":/res/SDFP3.png"));
// 设置主窗口背景颜色
QPalette palette;
diff --git a/mainwindow.qrc b/mainwindow.qrc
index 5ee3888..a9a244e 100644
--- a/mainwindow.qrc
+++ b/mainwindow.qrc
@@ -18,7 +18,6 @@
res/right.png
res/981csNew.png
res/SDFP2.png
- res/SDFP3.png
res/settings2.png
res/lamp/black.png
res/lamp/blue.png
@@ -38,5 +37,6 @@
res/switch/switch_open2.png
res/switch/switch_close3.png
res/switch/switch_open3.png
+ res/SDFP3.png