Commit Graph

102 Commits (12dcbffa09c42df71032b1120a2931f002b061b1)
 

Author SHA1 Message Date
WuChengbo 12dcbffa09 Merge pull request 'WuChengBo' () from WuChengBo into main
Reviewed-on: 
cbwu d0db97d0e6 fix: 推流优化,光电吊舱暂未设置
cbwu 6861abaf29 Merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP into WuChengBo
cbwu 945bca9356 feat: 新增视频推流(待优化)
WuChengbo 717914a589 Merge pull request 'feat: 网页新增右键导航菜单' () from WuChengBo into main
Reviewed-on: 
cbwu 2eb9906370 feat: 网页新增右键导航菜单
caoyuhui 475b9a0c01 修复软件关闭时崩溃问题
caoyuhui 805072f882 Merge branch 'cyh'
caoyuhui 79b1260c2a merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP
caoyuhui b7be176237 1、优化网络监测;2、主页、光电吊舱页设置页面改为模态对话框
cbwu eacfb0348f feat: 新增PDT外部程序调用
caoyuhui 996ff1a459 解决冲突
cbwu 6115e86104 fix: 合并代码,解决冲突
cbwu f70fb6115e feat: 新增拉流视频保存(暂时存为h264格式)
caoyuhui c49efb509c 增加网络监测延迟显示;增加rtsp流本地保存功能(进行中)
shiyi f4695b5d5f fix: 修复搜救地图数据更新时,选中数据无法放大地图的问题
caoyuhui 1f5324cbf8 增加网络监测延迟显示;增加rtsp流本地保存功能(进行中)
shiyi 725faf4bb4 fix: 修复搜救地图数据更新时,选中数据无法放大地图的问题
caoyuhui aba562c473 增加网络监测延迟显示;增加rtsp流本地保存功能(进行中)
WuChengbo e14b81431c Merge pull request 'fix: 修复三维相机跨线程传数问题' () from WuChengBo into main
Reviewed-on: 
cbwu dbc6994100 fix: 修复三维相机跨线程传数问题
cbwu d3a6ab5d1d fix: 修复三维相机跨线程传数问题
WuChengbo 91622576ad Merge pull request 'fix: 修复发出指令问题' () from WuChengBo into main
Reviewed-on: 
cbwu 56d8c8108a fix: 修复发出指令问题
WuChengbo 1e0b0e7b0f Merge pull request 'WuChengBo' () from WuChengBo into main
Reviewed-on: 
caoyuhui 1aa55856c5 增加主页设置三维建模通信设置及状态监测
cbwu c12eb1d8c4 fix: 三维相机状态栏设为只读
cbwu b6ada507a7 fix: 三维建模页面ui调整
CaoYuhui f67967ff71 Merge pull request 'WuChengBo' () from WuChengBo into main
Reviewed-on: 
cbwu 4273feac19 fix: 修复三方库版本不同导致的编译错误问题
cbwu 0e2f84924c Merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP into WuChengBo
shiyi cff7223a0c feat: 搜救地图更改为天地图;增加点击列表项跳转到地图对应位置
cbwu c276cb8180 Merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP into WuChengBo
caoyuhui 2a21e3d8ff 三维建模页面布局优化
caoyuhui 5cd4255abf 优化光电吊舱代码逻辑
cbwu 4885ad71e6 Merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP into WuChengBo
cbwu dadfe2e40f fix: 修复WebEngine内存泄露问题
caoyuhui 03fcfc0981 优化主页、网址设置页面、网络监测页面接口和交互逻辑
caoyuhui 115375311f 优化视频解析代码;修改拉流方式为UDP
caoyuhui 9b9834be4d 主页设置页面增加光电吊舱ip设置及网络监测关系映射
WuChengbo d2aa56628b Merge pull request 'WuChengBo' () from WuChengBo into main
Reviewed-on: 
cbwu 7827e364c7 fix: 合并main,解决冲突
caoyuhui 9112bd8b43 增加主页面设备状态监测功能;增加视频推流功能。
cbwu df3ef2bb7b fix: 拍照时间间隔最大设置为25s
cbwu 9c694fa004 fix: 调整时间间隔框样式,修复线程问题
cbwu e65ea9bc03 Merge branch 'WuChengBo' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP into WuChengBo
zhaipx 5131adb206 增加相机状态查询指令和反馈解析“
git commit -m增加相机状态查询指令和反馈解析“
caoyuhui a95cb2c121 光电吊舱页面bug修复;主页面界面调整
caoyuhui deb121f667 修复PayloadAPP.pro文件
CaoYuhui de33a9f801 Merge pull request 'WuChengBo' () from WuChengBo into main
Reviewed-on: