WolfSpirit/EJM_Display
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode

Browse Source
This commit is contained in:
陈俊鹏
2025-10-20 22:29:29 +08:00
parent 7d148d79c9 f88b815723
commit ec14de02e7
17 changed files with 451 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FileOperation/ConfigFiles.cpp
View File

@@ -66,10 +66,17 @@ void ConfigFiles::SystemConfig(){
// 读取刷新时间配置，失败时自动写入默认值10
<<<<<<< HEAD
TrailRefreshTime = readAndSetDefault(Path,"RefreshTime", "TrailRefreshTime(s)", 10);
// 读取UI刷新时间，失败时自动写入默认值100
UIRefreshTime = readAndSetDefault(Path,"RefreshTime", "UIRefreshTime(ms)", 100);
=======
TrailRefreshTime = readAndSetDefault(Path,"RefreshTime", "TrailRefreshTime(s)", 10u);
// 读取UI刷新时间，失败时自动写入默认值100
UIRefreshTime = readAndSetDefault(Path,"RefreshTime", "UIRefreshTime(ms)", 100u);
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
// 读取RTSP地址，失败时自动写入默认URL
RTSP_Url = readAndSetDefault(Path,"System", "RTSP_Url", QString("rtsp://admin:sshw1212@192.168.1.64:554/Streaming/Channels/101")