From 2e0bb207fa1f9b0e69cd079309435b95ff99f9b1 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Thu, 19 Sep 2024 09:11:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0exe=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=8B=89=E6=B5=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PayloadAPP.pro | 4 +++- SDFP3.ico | Bin 0 -> 4286 bytes Src/GDDC/gddcSet.cpp | 4 ++-- Src/Video/ffmpegpushstream.cpp | 3 ++- mainwindow.cpp | 6 +++--- mainwindow.qrc | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 SDFP3.ico 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 0000000000000000000000000000000000000000..20c3eee862b464996147ceed0a0a9e3e98c5314a GIT binary patch literal 4286 zcmeI0dsNJ67{|YwuG6Tb5F!qC*KN02XDy2)H8a0oMN-lUk^5#V_ehaaO-YR|(~T09 zQmRc#YQkhE2;mR- zY>9~w=s+aULo%a^B#MaNAK`r7XVniC>TzO)nhumDRA2LR>PHE*5hc_%N@P@TB{FJ{ z!~*VD6l}K|`aupNgo7bsC|#BvhUobwh<2KQBo|XeI#2n)w>NJhZFq>V*5M`y)sE8` z+72>WvlCc#?BW|kWHk``Y`VS=8Y7J_+-?mBFH#_EX+ss0#=55tj0x}ze_3zacHqU?}gk7L+lp@VI6Mq}BGX)0lS-MM0+ zrbHsth?OuJB8gBvDuGe$%FCrBhI2oeRe6!Zs&uA0a7pHpp(JnJ#Ezn^GZdwP_9^9& z%V(F0z0~S5_n@{Y0d)n@XqF!BQ5?JG8Y94ZFrF^fgjk?$PW6u_vz#`nMGmq3KE$>k zIpWA8S?O3L>lTy zF2<}PHECN(LvHB(rjo>McVt=mtyS50&>;P&ez!y5EJM6{-H!G*9o&xgXZ&Z6TE~S= zg|T=J9BC|(2@K~721) z8ZX0R3^v&qA-6`C=Qi>*7f%+|Jx?|JnI9WrU=*^W3KXNI> zn^e(f?p&lBsSIWp$F*^9#}Lq=G*CXZ&r*sV&nF~xSe5-^}8KwvqX^7+IECa$kTSBD!~h+awZA`7wZ@J*_!8XoaL6i z-Yh6{`PgIWiw9SvIPmI|Sk=493`a?8+3Q4B{lP(&XPZImdbq7Y_p-gVUziL*afBy| z_AN)TXbshOL7^XuqRlf=;WHV&_ES~%FEHUAur)Lg3;U0X6>v@Cgc{ayjHY`ut8E)B zG~`6E|K0DKY#%EeUNa3bOD96&VU9T035aqWfdh1pR3EWIE@&S?678w+wAU?jwMT@5 zQLp#?sWf$lw)q6(10W>;6o#@{U?;I7>zM_x-%DbihQR#0v8QbUp literal 0 HcmV?d00001 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