Commit Graph

1686 Commits (main)

Author SHA1 Message Date
Matthew 5151f9291a 优化前台服务实现 2 months ago
Matthew 7037eab930 调整id防止冲突 2 months ago
XI.CHEN 2d67c94bc9 航煜视频水印根据时间是否设置改变 2 months ago
Matthew 39b94cee90 Update version to 1.3.134
Based Core Version to 1.4.72
2 months ago
Matthew 801a9e98ba 静态抓拍强制改为预览的范围从150开始 2 months ago
Matthew 868fbebb6b Update version to 1.3.133
Based Core Version to 1.4.72
2 months ago
Matthew 1806c36148 增加更多拍照日志 2 months ago
Matthew f2f29482a0 输出照片日志信息 2 months ago
Matthew a52255e9d9 增加日志 2 months ago
Matthew 744057c407 Update version to 1.3.132
Based Core Version to 1.4.72
2 months ago
Matthew 3fab6d4542 保活时判断service是否存在 2 months ago
Matthew 21c789155c 优化日志 2 months ago
liuguijing 31c0d81e13 Update version to 1.3.131 2 months ago
liuguijing b58969cc5e Update version to 1.3.130 2 months ago
liuguijing 9bb9b6848c 修改短视频预览摄像头不正的bug 2 months ago
liuguijing 7a557ac8fd 修改短视频预览摄像头不正的bug 2 months ago
Matthew e0a23a6c3b Update version to 1.3.129
Based Core Version to 1.4.72
2 months ago
liuguijing 2d0fe6609b 为修复宁夏短视频拍照翻转的bug 临时修改方法 2 months ago
Matthew 7e57c3cc08 Update version to 1.3.128
Based Core Version to 1.4.71
2 months ago
Matthew 0fc7ff436e 统一GPIO
N938:
#define CMD_SET_3V3_PWR_EN                      360  // 改为132

云台:
#define CMD_SET_485_ENABLE                      512 // 改成131
#define CMD_SET_3V3_PWR_EN                      516 // 改成 132

固件从20250419的版本开始
2 months ago
Matthew 2009c6d472 调整hdr的代码 2 months ago
Matthew 24333d1882 优化逻辑 2 months ago
Matthew 04abdbeb61 Update version to 1.3.127
Based Core Version to 1.4.71
2 months ago
Matthew 4106ce8cb3 优化拍照时间的注册处理,避免始时钟丢失校时成功之后的错误 2 months ago
Matthew 7ad52b042c 增加HDR的支持 2 months ago
Matthew 6925da78b1 Update version to 1.3.126
Based Core Version to 1.4.71
2 months ago
Matthew 1c8372d5a2 优化调试信息的实现 2 months ago
Matthew 1782269938 Update version to 1.3.125
Based Core Version to 1.4.71
2 months ago
Matthew 8398ae8246 增加时间发生变化后的更新处理 2 months ago
Matthew b6932b116e 移除文件锁的实现 2 months ago
Matthew 897b53e44e 利用共享uid的方式来判断运维app是否正在运行
加入时间变化监控的一些定义
2 months ago
Matthew 621cf4f3ba Update version to 1.3.124
Based Core Version to 1.4.70
2 months ago
Matthew 476ebbd5e0 强制走预览模式的范围改成200-400 2 months ago
Matthew c54cecacf0 设置共享uid 2 months ago
Matthew 8e9597eaf4 Update version to 1.3.123
Based Core Version to 1.4.70
2 months ago
Matthew 6d2f4c7535 设置共享uid 2 months ago
Matthew 252e2575f5 调整回预览+静态抓拍模式
针对iso为200-300之间的粉色问题,做了补丁,强制走预览模式,临时绕过这个问题
2 months ago
Matthew 6587298604 Update version to 1.3.122
Based Core Version to 1.4.70
2 months ago
Matthew eb96c9c6c7 实现预览到静态抓拍的主动切换 2 months ago
Matthew d1d34ebcfc Update version to 1.3.121
Based Core Version to 1.4.70
2 months ago
Matthew 3a0a8b71a0 重启设备前记录日志 2 months ago
Matthew 030ca9c7d7 修复拍照设置的bug 2 months ago
Matthew a9535f2df7 增加对AIS的支持 2 months ago
Matthew 1ba1b9d56a Update version to 1.3.120
Based Core Version to 1.4.70
2 months ago
Matthew 7a51b96100 调整拍照的实现,改成一个request实现测光和拍照 2 months ago
Matthew 8a7d571e0e Update version to 1.3.119
Based Core Version to 1.4.70
2 months ago
Matthew 2336758523 Update version to 1.3.118
Based Core Version to 1.4.69
2 months ago
Matthew 95213a4ecd 网络摄像头实现自检等待 2 months ago
Matthew 8f49d82dec 优化日志 2 months ago
Matthew 0170e21b1d 优化网络重试次数和日志 2 months ago
Matthew 94ca4f77a4 Update version to 1.3.117
Based Core Version to 1.4.69
2 months ago
jxjajs 2af459d57a 解决查询云台位置命令不下发BUg 2 months ago
jxjajs 1f3943b34b 增加log,调试 2 months ago
Matthew ec5799f167 Update version to 1.3.116
Based Core Version to 1.4.69
2 months ago
Matthew 9f23994521 预览和拍照的模板改成同一个 2 months ago
Matthew e3aa7d04eb 移除ISP的设置
参考系统相机
2 months ago
Matthew 5049677133 Update version to 1.3.115
Based Core Version to 1.4.68
2 months ago
Matthew eb5aa8396a 移除全局变量的设置 2 months ago
Matthew d35bf3d71c 优化代码 2 months ago
Matthew 17e2ae7fd9 使用mtk内置扩展MFNR算法 2 months ago
Matthew 8108bf4c7c 修复系统相机bug 2 months ago
Matthew 996cb9109f Update version to 1.3.114
Based Core Version to 1.4.68
2 months ago
XI.CHEN 74f42bcfd3 增加网络拍照失败时的gpio日志信息 2 months ago
jxjajs 3ea1fbde25 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 2c53f2fc0a 增加云台200号预置点临时一次性自检处理
1、单独调用,直接置云台为自检状态;
2、拍照带200号预置点,等待调预置点时间使用设置的自检时间。
2 months ago
Matthew a74db09f67 Update version to 1.3.113
Based Core Version to 1.4.67
2 months ago
Matthew ae213c7a9b 增加权限 2 months ago
Matthew 13cb6722f3 使用mtk扩展的多帧降噪 2 months ago
Matthew 820158e650 breakpad的集成准备 2 months ago
Matthew 78cacaeba1 增加网络协议的处理 2 months ago
Matthew 40e9533d31 Update version to 1.3.112
Based Core Version to 1.4.66
2 months ago
jxjajs 357c58112f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 4afdbdae62 修改Bug,手动拍照过程中,收到关机指令,拍完照不关机 2 months ago
Matthew 79dc4e8ec7 Update version to 1.3.111
Based Core Version to 1.4.65
2 months ago
Matthew 6388002df2 优化网络拍照逻辑 2 months ago
Matthew ebe52ca252 Update version to 1.3.110
Based Core Version to 1.4.65
2 months ago
Matthew ce81c8dd4f 禁用HDR模式 2 months ago
jxjajs 7033ad7e0b Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 9397d53107 增加自动拍照等待时间,防止同一时间ptz拍多张图片时,中间会关电 2 months ago
Matthew 48856f0c0b 空指针保护 2 months ago
Matthew 2d5cc27c0e Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew e3c74db577 优化返回值 2 months ago
jxjajs dada0e876f 修改合并产生错误 2 months ago
XI.CHEN 9170d2bec0 增加照片长度有误时的日志 2 months ago
Matthew 06842bca13 Update version to 1.3.109
Based Core Version to 1.4.64
2 months ago
Matthew 410ded43f1 自定义HDR实现改为手动长曝光增亮 2 months ago
Matthew 1d92d624f8 优化代码 2 months ago
Matthew 5a26bd6353 Update version to 1.3.108
Based Core Version to 1.4.63

支持通过光敏自动切换日夜镜头
2 months ago
Matthew f247a6f4e0 实现获取光敏值的接口 2 months ago
Matthew 991fc0a449 Update version to 1.3.107
Based Core Version to 1.4.62
3 months ago
Matthew ac357883ac Merge branch 'PtzNew' 3 months ago
Matthew 604819a8a1 调整timer注册的默认值和内部判断逻辑 3 months ago
Matthew 95c0fb4415 移除不合理代码 3 months ago
Matthew 4e10f77ce3 Update version to 1.3.106
Based Core Version to 1.4.61
3 months ago
Matthew 3575377767 Update version to 1.3.105
Based Core Version to 1.4.60
3 months ago
Matthew f577a1be3d HTTP访问出错也计入网络出错
超过3次重启设备
3 months ago
Matthew 0b8c29eb91 直接注释代码 3 months ago
Matthew 4b09ea6428 Update version to 1.3.104
Based Core Version to 1.4.59
3 months ago
jxjajs 2b5916c9ce 云台控制逻辑优化 3 months ago
Matthew 0b5e19541e Update version to 1.3.103
Based Core Version to 1.4.58
3 months ago
Matthew bae16b9427 修复编译错误 3 months ago
Matthew 8951b8cdaf 每次心跳增加光敏值的采集,供后面规则设置 3 months ago
Matthew a2aef51df6 减少getInt的调用 3 months ago
Matthew 182c592f98 清理注释的代码 3 months ago
Matthew 385c456401 MPAPP对运维保活 3 months ago
Matthew c5d9e19aff Update version to 1.3.102
Based Core Version to 1.4.57
3 months ago
Matthew 9a227b149e 移动预置位等待15秒 3 months ago
jxjajs e6228f7dfa 修改电源控制 3 months ago
jxjajs 8381d6a0b9 增加云台控制时间精准控制
增加云台控制时间精准控制
3 months ago
Matthew a42bf5390c 修复编译错误 3 months ago
Matthew 44aeadbe2d 云台单线程实现 3 months ago
Matthew d7a9212d90 Update version to 1.3.101
Based Core Version to 1.4.57
3 months ago
Matthew c106ae42fd 用更安全的方式访问jstring 3 months ago
Matthew 5f4af242be Update version to 1.3.100
Based Core Version to 1.4.57
3 months ago
Matthew 7212994a5f 修复编译错误和警告 3 months ago
Matthew 09dae14725 修复编译错误或者报警 3 months ago
Matthew 7b0c32e7b9 Update version to 1.3.99
Based Core Version to 1.4.56
3 months ago
Matthew b0c9e5f412 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 180b2efe0b 938禁用AI识别
移除部分日志
3 months ago
XI.CHEN bd81fd52d0 Update version to 1.3.98
Based Core Version to 1.4.55
3 months ago
XI.CHEN eaf7bfb875 关电时开电时间清零 3 months ago
liuguijing ae3f25b14a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 9017c2bd7d 运维新增支持adb shell命令
修复sim卡2 在连接不上运维主站时  无法切换到sim卡1的情况
3 months ago
Matthew b1071b52c5 Update version to 1.3.97
Based Core Version to 1.4.54
3 months ago
Matthew 89443efa26 优化日志 3 months ago
Matthew d8defe3b63 移除5V的控制(固件层自动控制) 3 months ago
Matthew 496a6fbdce APP启动时重置所有电源 3 months ago
Matthew 3a9b85c868 增加马达相关的控制 3 months ago
Matthew e280e76015 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 41208a587c 增加马达相关的控制 3 months ago
Matthew b381fa562f 增加马达相关的控制定义 3 months ago
XI.CHEN 0375b13c67 电源关闭不对称 3 months ago
XI.CHEN 864a8dc0dd 增加关电时相机状态变更 3 months ago
Matthew a506598b42 Update version to 1.3.96
Based Core Version to 1.4.54
3 months ago
Matthew 441cdc40b1 以太网三次查询不到则重启设备 3 months ago
Matthew ab91aa6cef Update version to 1.3.95
Based Core Version to 1.4.54
3 months ago
Matthew b40f77076d 修复误删代码 3 months ago
Matthew 3fdf189af5 Update version to 1.3.94
Based Core Version to 1.4.54
3 months ago
Matthew 447f9999eb 修复误删代码 3 months ago
Matthew 0c33cc68c4 Update version to 1.3.93
Based Core Version to 1.4.54
3 months ago
Matthew e999149187 移除可能会导致粉色的测光操作 3 months ago
Matthew 0aabc2af52 Update version to 1.3.92
Based Core Version to 1.4.54
3 months ago
Matthew c17dc6a83e Update version to 1.3.91
Based Core Version to 1.4.53
3 months ago
Matthew 026508615d 删除无用代码 3 months ago
Matthew deaf5ec7e1 MIPI延迟关电 3 months ago
Matthew c8610406ef 重新实现关电控制
现在通过线程的方式来实现延迟关电,性能不是很好
3 months ago
Matthew 3902d69997 调整实现 3 months ago
Matthew 22e81844ac 修改云台宏 3 months ago
Matthew 4c426cf5ff 增加摄像头控制命令 3 months ago
Matthew 8f9fa84028 修复编译错误 3 months ago
Matthew 1925e923e2 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 9aa25b6d66 规约相关的源文件移到Core/Client目录 3 months ago
XI.CHEN 0cb2927b13 航煜、宇视OSD开关和设置,航煜分辨率设置 3 months ago
Matthew 5578b2e40f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew f0c6738887 实现云台视频流 3 months ago
jxjajs 9f8e92030a Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs f5c38b5127 提交南网mqtt(s938)代码 3 months ago
Matthew b18b9f54e4 修复误改的值 3 months ago
Matthew 808271c7f1 优化日志 3 months ago
Matthew 21fd57061c Update version to 1.3.90
Based Core Version to 1.4.51
3 months ago
Matthew 32698886d0 仍然绑定网络,确保当前不同版本的固件没有问题 3 months ago
Matthew 3dbb79e94c Update version to 1.3.89
Based Core Version to 1.4.51
3 months ago
Matthew ca7e8e5acf 修复编译错误 3 months ago
Matthew c8966009b8 实现视频流 3 months ago
Matthew ccc0e0e334 参数名格式一致 3 months ago
Matthew 5d312ed1f0 实现视频流 3 months ago
Matthew 120d7fdde7 优化代码 3 months ago
Matthew 238f0aeb4f 优化代码 3 months ago
Matthew 69a3997805 增加rtsp 认证的支持 3 months ago
Matthew ebcd0c4dca 扩展流媒体访问的接口 3 months ago
Matthew e74c0185a5 调整流转发的实现 3 months ago
Matthew b08adad0a4 Update version to 1.3.88
Based Core Version to 1.4.50
3 months ago
Matthew 955efa5389 RTSP录制视频 3 months ago
Matthew 2c0b32fe64 Update version to 1.3.87
Based Core Version to 1.4.50
3 months ago
Matthew 28315925ee 保存yuv原始数据 3 months ago
Matthew b4e7cf8fab 实现网络摄像机拍摄短视频 3 months ago
XI.CHEN fe97b3c5bc Update version to 1.3.86
Based Core Version to 1.4.50
3 months ago
XI.CHEN 1583dc6a46 增加日志 3 months ago
XI.CHEN 44dc885717 增加工作状态报日志 3 months ago
Matthew fb42203056 Update version to 1.3.85
Based Core Version to 1.4.49
3 months ago
Matthew 5cf252b12f 改为单个请求连拍4帧 3 months ago
Matthew 4d5020803c 增加MQTT选项,并优化UI逻辑 3 months ago
Matthew e05bcedb6e Update version to 1.3.84
Based Core Version to 1.4.49
3 months ago
Matthew 296858be26 优化日志 3 months ago
Matthew 34a1c4377b 以太网超过3次找不到,则重启设备(30分钟内不重复重启) 3 months ago
Matthew 620af9bb26 Update version to 1.3.82
Based Core Version to 1.4.49
3 months ago
Matthew 7624c2b249 常规拍照也曝光多张,挑最后一张上传 3 months ago
XI.CHEN 99784847e3 Update version to 1.3.81
Based Core Version to 1.4.49
3 months ago
XI.CHEN eba500f734 Update version to 1.3.80
Based Core Version to 1.4.48
3 months ago
Matthew c07508a711 修复bug 3 months ago
Matthew d51ff00473 修复bug 3 months ago
XI.CHEN b23224415e Update version to 1.3.79
Based Core Version to 1.4.47
3 months ago
XI.CHEN 4e80dced8b Update version to 1.3.78
Based Core Version to 1.4.46
3 months ago
Matthew b579a0062d Update version to 1.3.77
Based Core Version to 1.4.45
3 months ago
Matthew 2ae0368468 云台的5V和100M由固件控制 3 months ago
Matthew 9ad980f666 增加流量信息查询 3 months ago
Matthew 0cfd48ff92 电源打开和关闭成对 3 months ago
XI.CHEN 0957cc3a12 Update version to 1.3.76
Based Core Version to 1.4.43
3 months ago
XI.CHEN d37d4e0c13 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN c308feff90 Update version to 1.3.75
Based Core Version to 1.4.42
3 months ago
Matthew 0f50e62000 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 24321ae011 APP启动时间显示秒 3 months ago
XI.CHEN 485301e714 Update version to 1.3.74
Based Core Version to 1.4.41
3 months ago
XI.CHEN 0d92c10c60 Update version to 1.3.73
Based Core Version to 1.4.40
3 months ago
Matthew 8b51cfdefb Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew a7d3266624 938使用gpio机制重启 3 months ago
jxjajs b8416b8e1b 添加严格区分温湿度和风速风向及多要素气象传感器 3 months ago
jxjajs 2e12a1ac84 Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs 3453e2d221 添加严格区分温湿度和风速风向及多要素气象传感器 3 months ago
XI.CHEN a14c76c4ed Update version to 1.3.72
Based Core Version to 1.4.39
3 months ago
Matthew 4cae89014d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 89fe772caa 注册下一个拍照时间以当前拍照时间为参考
避免系统提早触发闹钟
3 months ago
XI.CHEN 216a053086 Update version to 1.3.71
Based Core Version to 1.4.39
3 months ago
XI.CHEN 5734762c07 修改串口拍照指令宏定义 3 months ago
Matthew 4ba4be427e 航煜网络相关调整 3 months ago
Matthew 02663dd08b 修复bug 3 months ago
Matthew fd84d84157 调整Toast位置 3 months ago
Matthew 70b795fe27 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew d206a59d9a 修复编译错误 3 months ago
陈曦 ee93791683 覆冰气象线程修改 3 months ago
陈曦 53578065f1 覆冰气象线程队列上传 3 months ago
Matthew 6f56bf0fe3 调整网络短视频实现 3 months ago
Matthew d1298663f3 调整网络短视频实现 3 months ago
XI.CHEN 83d9e4e6c9 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 79e8a8ff71 增加信号日志 3 months ago
Matthew d9f6c6e8ac Update version to 1.3.70
Based Core Version to 1.4.38
3 months ago
Matthew c912c70572 调整APP标题 3 months ago
Matthew bbb78f44b9 调整APP标题 3 months ago
Matthew df1fc220d1 Revert "调整编译脚本"
This reverts commit 341045651c.
3 months ago
Matthew 4de7693aaa Revert "调整顺序"
This reverts commit d908a36d3b.
3 months ago
XI.CHEN f2a965caf0 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 1bdc190a1b 修正拍照指令 3 months ago
Matthew 127b06de77 调整APP标题 3 months ago
Matthew d908a36d3b 调整顺序 3 months ago
Matthew 9eafc3d2f3 如果线程已经执行,则跳过 3 months ago
Matthew 2167afa1d8 优化代码 3 months ago
Matthew 341045651c 调整编译脚本 3 months ago
Matthew b6e58239d3 Update version to 1.3.66
Based Core Version to 1.4.37
3 months ago
Matthew b996c663a9 Update version to 1.3.65
Based Core Version to 1.4.36
3 months ago
Matthew 55a01c47b6 修改命令值 3 months ago
Matthew 87f9559cfd 调整接口 3 months ago
XI.CHEN cdd0fcc361 Update version to 1.3.64
Based Core Version to 1.4.35
3 months ago
jxjajs 6d84ed0ab7 Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs ed08d8099c 控制下发云台命令次数 3 months ago
XI.CHEN 8ddc778cc4 修复格式错误 3 months ago
XI.CHEN 63339c199d 删除无用代码 3 months ago
jxjajs b15f12bf5f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 964fa2a91b Update version to 1.3.63
Based Core Version to 1.4.34
3 months ago
XI.CHEN aa434414ed 删除读取电压的条件编译 3 months ago
jxjajs e1721d52d7 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago