Commit Graph

1088 Commits (db78ce77288e27d6103f7fdbcc955b571f93db47)

Author SHA1 Message Date
Matthew 5001581438 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 0f2b29a61e 修复编译错误 4 months ago
Matthew f9ca260bcc 增加日志 4 months ago
XI.CHEN 3633fda081 增加拍照日志 4 months ago
Matthew 4de735fb19 增加照片对象的有效性判断 4 months ago
Matthew 8fc0354f0c 增加日志 4 months ago
Matthew 12035d2990 供应商接口封装 4 months ago
Matthew ee68539dde 流媒体实现 4 months ago
Matthew 04b8ce7796 减小系统重启后第一次启动的延迟,避免运维重启mpapp 4 months ago
Matthew 515864c93d 心跳广播处理 4 months ago
Matthew 876ab5ab05 网络拍照重试次数增加,避免网络不稳定导致拍照失败 4 months ago
Matthew d8ab5050b3 优化注释 4 months ago
Matthew 78101816a4 6mipi 版本的网络需要打开 131 4 months ago
Matthew 291d72b135 调整河南统一编号 4 months ago
Matthew 1a36d83b29 避免两次调用 4 months ago
Matthew 9ae985965c Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 4e16d4ff74 增加流媒体接口定义 4 months ago
Matthew 20736f0c56 增加马达定义 4 months ago
XI.CHEN 8f45e88547 增加拍照调试日志 4 months ago
Matthew 160dffd274 优化日志 4 months ago
Matthew 54e35bce2c 优化网络摄像头电源控制 4 months ago
Matthew bba91ff3a6 显示app启动时间 4 months ago
Matthew a8c945be2b 文件写完后立即要求系统刷新缓存 4 months ago
Matthew bf91569905 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 5e93009f25 优化日志 4 months ago
XI.CHEN 95bd8ff7b3 统一云台控制和拍照的电源状态判断 4 months ago
Matthew 84597d0108 设备重启后的启动,延迟进行 4 months ago
Matthew 97eb35e169 移除重复的锁 4 months ago
Matthew 856c1a8b10 打开电源的操作也仅在没有电源时执行 4 months ago
Matthew a98dc5126c 临时移除自动重启设备 4 months ago
Matthew 5a4840dcbf 增加日志 4 months ago
Matthew 486805b469 加大重启的延迟时间 4 months ago
Matthew 70ff5e7ea2 增加错误处理 4 months ago
Matthew a205ee22f9 优化照片写入文件的实现,增加日志 4 months ago
XI.CHEN d8ecf26722 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 4 months ago
XI.CHEN 522d0b96e3 增加拍照临时调试信息 4 months ago
Matthew ef8efd48b0 底层把云台电压的两个GPIO设反 4 months ago
Matthew 4ca8e83188 增加日志 4 months ago
Matthew 52e2b5f064 空图片的保护处理 4 months ago
Matthew 7fbffb2930 增加错误保护 4 months ago
Matthew 033e632e3b 网卡上电之后等待1秒 4 months ago
Matthew fa3bb289bf 启动时不判断服务是否运行 4 months ago
Matthew cae5b6996b 优化自启动 4 months ago
Matthew 6129d10749 空指针保护 4 months ago
Matthew 2be8a53a67 优化代码 4 months ago
Matthew c186ab9098 优化重启的机制 4 months ago
Matthew ac43db4e4a 网络摄像机拍照的拍照时间不人为调整 4 months ago
Matthew 600c46f024 优化日志控制方式 4 months ago
Matthew 46bc13a608 绑定网络暂时去除 4 months ago
Matthew e27cd3e5fe 优化代码 4 months ago
Matthew d6dc5729fe 优化照片保存处理 4 months ago
Matthew 5a74b57eb1 调整云台的电源控制 4 months ago
XI.CHEN dc448adc34 增加日志和销毁mImageReader前释放资源 4 months ago
Matthew 0001c9dc5a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 6162c220b4 修改参数传递方式,避免内存提前被释放 4 months ago
XI.CHEN 5275d0c272 删除拍照测试日志 4 months ago
Matthew 50ee50f3d9 优化代码 4 months ago
Matthew e20f442512 增加日志 4 months ago
XI.CHEN b751429199 增加拍照临时测试日志 4 months ago
XI.CHEN 99b0d9ef70 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 4 months ago
XI.CHEN 50adc38110 增加拍照失败日志 4 months ago
Matthew 46b1c48c5c 处理以太网变化标记 4 months ago
Matthew 28d58199bf 增加日志 4 months ago
Matthew dc692d05b1 优化日志 4 months ago
Matthew 6be75f4a8e 云台电源和网络电源分开控制 4 months ago
Matthew 31954a3f17 增加以太网变化时检测网络是否断连 4 months ago
Matthew b7f6631672 启动服务之后再监控以太网 4 months ago
Matthew c4d8bd7f92 修复bug 4 months ago
Matthew 3c3cb9b130 增加网络信息的设置
重启MPApp使用临时方案,通过MpMaster来完成,解决自身不能重启的问题
4 months ago
Matthew 101c8f41a4 修改通知栏图标 4 months ago
Matthew 53df77733d DNS 设置为 0.0.0.0 4 months ago
Matthew 3d3a02158e 优化函数名称 4 months ago
Matthew e0ed5615c3 优化变量名字 4 months ago
Matthew 7adebb3019 增加重启延时控制 4 months ago
Matthew b7bfefe3e6 Refactor 4 months ago
Matthew 384d999ead Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew fc3f5fafa1 移除USB摄像头的处理 4 months ago
XI.CHEN b9ba8135cd 错误处理优化 4 months ago
XI.CHEN 63264f8e1c 延长云台预置位调用等待时间 4 months ago
XI.CHEN 04504794a0 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 4 months ago
XI.CHEN 7d7234037f 串口log文件名后缀改为txt 4 months ago
Matthew f2db516071 补拍的时间处理保护
补拍应该不会存在拍照计划时间为0的情况,这儿这样处理,是为了外部特殊处理,故意把拍照计划时间置为0
4 months ago
Matthew 5bfd1f58ea 优化日志 4 months ago
XI.CHEN 055cd6cc7f 放宽温度传感器取值范围限制 4 months ago
Matthew c307b7e56e cmdid未设置的异常保护 5 months ago
jxjajs 72c2ebebc6 修改海康球机网络抓拍 5 months ago
jxjajs 378bc2d0fb 读取图片返回错误,包号不增加 5 months ago
Matthew 6a7295d9c3 调整网络拍照延时关闭时间 5 months ago
Matthew f1c6153852 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 5 months ago
Matthew dfac4eeba6 如果IP已经是设置的IP,则跳过 5 months ago
XI.CHEN ac3e4627e9 电源控制 修正自检判断条件 5 months ago
XI.CHEN 697fe83f5e 云台 在调用预置位前等待自检 5 months ago
XI.CHEN f3b2f01f8b 串口log文件名统一 5 months ago
Matthew 417d5c5083 网络打开时需要同时打开485 5 months ago
XI.CHEN c408fa2e68 去除双重水印 5 months ago
XI.CHEN 34f0c173cb 修复938凌晨重启问题,串口log路径统一 5 months ago
XI.CHEN 5a8b7427c4 修改网络摄像头分辨率设置参数错误 5 months ago
XI.CHEN a76b654593 修复通过app和配置工具手动拍照时不延时关电 5 months ago
XI.CHEN 950e520fb2 修复编译错误 5 months ago
XI.CHEN 5cc05c373d 增加宇视分辨率设置 5 months ago
XI.CHEN de288c860f 增加文件锁日志 5 months ago
Matthew dc2b8c1504 libcurl增加错误处理 5 months ago
Matthew b71fcebdf2 修复bug 5 months ago
Matthew 128a0a0003 改一下网络电源控制的时间 5 months ago
Matthew dfd970d1a9 优化错误处理 5 months ago
XI.CHEN 5d318b62c8 增加网络拍照失败日志 5 months ago
Matthew a29b471633 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 5 months ago
Matthew 680b763ff6 优化配置文件的初始化
把日志显示移到独立的activity
5 months ago
jxjajs eb26477067 Merge remote-tracking branch 'origin/main' 5 months ago
jxjajs 8dbe00c8f9 读取图片返回错误,包号不增加 5 months ago
XI.CHEN a423c07820 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
XI.CHEN e4b9245bed 网络连续拍照不重复自检 6 months ago
Matthew 0d9b6a1736 优化日志 6 months ago
Matthew f910187a48 优化对焦 6 months ago
Matthew 8b79de9208 修复警告 6 months ago
Matthew 7eac44e6ce 移除异常处理 6 months ago
Matthew c7c91af66d 调整日志 6 months ago
XI.CHEN dd35758e59 修复云台控制开启条件判断 6 months ago
Matthew 9231d205ca Fix bug 6 months ago
Matthew 0243d9b7d4 修复gpio bug和优化 6 months ago
Matthew 69a634edab 网络摄像机的通道号需要独立设置
复用CameraId字段
6 months ago
Matthew 03628c4a70 调整配置 6 months ago
Matthew 25ae7ec464 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew fa7b1d2bfa 使用IPv4 6 months ago
XI.CHEN d5b46fb343 右上OSD换行位置 6 months ago
Matthew 8c1492052d 修复手动拍照各数据组合的错误 6 months ago
XI.CHEN 3b03dce9e4 修复数据缓冲区太小导致报错 6 months ago
jxjajs 4967f47036 Merge remote-tracking branch 'origin/main' 6 months ago
jxjajs b482a184a0 修改气象数据雨量、日照数据处理,及数据处理日志信息 6 months ago
jxjajs ef1a061fad 气象数据打印错误 6 months ago
XI.CHEN 09073b86b0 增加多合一气象传感器处理 6 months ago
XI.CHEN a6d4e065b3 网络拍照规约上送时间与水印时间一致 6 months ago
XI.CHEN 4cca774a09 串口规约上送时间与水印时间一致 6 months ago
XI.CHEN 2f176a0a33 网络定时拍照电源关闭不延时 6 months ago
XI.CHEN e07de45f59 气象采集函数修改 6 months ago
jxjajs a6134b860d 气象数据打印错误 6 months ago
XI.CHEN af0de16a67 增加释放唤醒锁 6 months ago
XI.CHEN a24345e01f 禁用传感器后不导致重采 6 months ago
XI.CHEN 816881fd89 修改定时拍照不延时 6 months ago
XI.CHEN c410e1e6a9 定时拍照不会延时关闭摄像机电源 6 months ago
XI.CHEN e0d926efb1 未开启电源时,控制云台不会打开电源 6 months ago
XI.CHEN 907836d3d6 增加电源控制关闭计数判断条件 6 months ago
XI.CHEN 23877165ab 增加串口配置系数和偏移值 6 months ago
XI.CHEN 470d2be42a 修改摄像机手动电源控制 6 months ago
Matthew 56ceb40f6d 优化代码 6 months ago
Matthew eebf9b5a03 增加云台摄像机的拍照处理 6 months ago
XI.CHEN c501b689de 增加立即关闭摄像机电源函数,实现手动关闭 6 months ago
XI.CHEN 162d7624af 调整时间类型长度 6 months ago
XI.CHEN 99efe9c91f 加长拍照时间表更新的时间类型长度 6 months ago
XI.CHEN ddff8bdaca 串口拍照调用预置位BUG修复 6 months ago
XI.CHEN cd1e7b8a8c Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
XI.CHEN ebe0def611 加长云台时间控制类型 6 months ago
Matthew a10f029175 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
XI.CHEN 7cc3de572b 网络摄像机规约上传时间与水印一致 6 months ago
Matthew 48d37afa1e Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 2b26a090a0 航煜新款摄像头的接口实现 6 months ago
XI.CHEN c3f7d99a0b 调整云台电源关闭逻辑 6 months ago
XI.CHEN a4deb30423 云台控制增加唤醒锁,调整判断条件 6 months ago
Matthew 7a2acd5f97 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 3a98b0a451 优化日志 6 months ago
XI.CHEN 4af9c92440 PendingIntent请求码改回固定值 6 months ago
XI.CHEN 7aa553b1fa 修复规约上传时间与水印时间不一致问题 6 months ago
Matthew 77aa962521 调整闹钟的实现 6 months ago
Matthew 7ae11e40fe 移除无用代码 6 months ago
Matthew 2ddb82a345 Update version to 1.1.28
Based Core Version to 1.2.20
6 months ago
Matthew 8311ad8ba9 优化日志 6 months ago
Matthew fc7a00d10c 优化心跳定时器的代码 6 months ago
Matthew d92bc67606 增加日志 6 months ago
Matthew bc01722f5d 优化心跳周期控制 6 months ago
Matthew feadee8ae4 优化日志 6 months ago
Matthew 224659c163 优化日志 6 months ago
Matthew fa08064340 优化心跳时间和相关日志 6 months ago
Matthew 6f8772d6a3 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 09c7af6947 增加日志 6 months ago
XI.CHEN d6392eb1d3 修正云台控制传入文件地址错误 6 months ago
XI.CHEN b2d2100dfc 修复云台控制阻塞问题 6 months ago
XI.CHEN ab9ba337dc 云台命令映射关系调整 6 months ago
Matthew 653812fa56 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew c2687cc87e 增加航煜新接口 6 months ago
XI.CHEN fcd78f02a6 云台控制线程 6 months ago
Matthew 99c8e158c2 优化日志 6 months ago
Matthew bec5b74a4f 优化日志 6 months ago
Matthew dc69600477 有效性检查 6 months ago
XI.CHEN 20f93c20bf 修正采样周期设置实现 6 months ago
XI.CHEN 467d042a7b 修复重启后多拍问题 6 months ago
Matthew 99ee66139b 完善采样周期设置的实现 6 months ago
Matthew b24798af08 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 8d05947395 修正文件名 6 months ago
XI.CHEN 1633412d17 延长预置位转动等待时间 6 months ago
Matthew 30d69e378a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew d435bab3c2 传感器采样复用拍照的定时器机制 6 months ago
XI.CHEN da14135af3 串口拍照增加水印 6 months ago
Matthew 5f48449da6 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 6908711c3a 增加HDR曝光增益的控制 6 months ago
jxjajs 0fef92ddaf get photo state error 6 months ago
Matthew 4ba68b4d82 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
XI.CHEN e664a5f766 日照降雨量等未配置传255 6 months ago
Matthew a07e656a56 调整实现 6 months ago
Matthew 66a4fa7f00 优化电源管理 6 months ago
Matthew 77184e796d HDR特殊处理 6 months ago
Matthew 6bd0ebf5b1 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew ae02d3b366 增加OpenCV HDR的支持 6 months ago
XI.CHEN e943c79efc 修改等值覆冰厚度等计算 6 months ago
XI.CHEN dc4b2fbeed 等值覆冰厚度等计算 6 months ago
XI.CHEN bccff01bbd sensorprotocol.h移回termapp 6 months ago
XI.CHEN fed405d585 修改时间参数类型,拍照增加唤醒 6 months ago
Matthew 601c47b11b Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 7a35404099 不判断认证类型 6 months ago
Matthew 24856c5fb4 更新云台GPIO定义 6 months ago
XI.CHEN 3ccd293f4a 实现摄像机控制延时关闭 6 months ago
Matthew 973000aa6b 移除日志 6 months ago
Matthew af475d2795 修复对焦处理 6 months ago
Matthew 70f6f69fc3 修改参数类型 6 months ago
Matthew bca5c93430 修类参数类型 6 months ago
Matthew ce5e543f6b 增加日志 6 months ago
XI.CHEN a282111810 串口拍照完毕后自动延时关闭电源 6 months ago
jxjajs 9767036d54 格式修改 6 months ago
jxjajs 30b57fcce5 格式修改 6 months ago
jxjajs 8122341f79 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
jxjajs a43965639a 修改标志 6 months ago
XI.CHEN 30a1706af5 增加电源延时 6 months ago
jxjajs 821dd34c18 修改风速风向标志位错误标识 6 months ago
XI.CHEN c2aa754b4b 未接传感器不作为采集失败处理 6 months ago
jxjajs 915259ba2f 修改串口读取时间延长等问题 6 months ago
XI.CHEN 78ceadc24e 增加打开电源延时 6 months ago
jxjajs a7b7623c93 串口通讯加锁 6 months ago
XI.CHEN d3a6903f5e 增加数据采集判断条件 6 months ago
XI.CHEN 101f136036 修改多线程采集数据 6 months ago
jxjajs 517323a28e 修改串口拍照方式 6 months ago
XI.CHEN c2c6a2a10f 完善气象覆冰逻辑 6 months ago
XI.CHEN 5f1f788694 修改覆冰气象数据采集重试逻辑 6 months ago
Matthew bd125e73fb Fix Typo 6 months ago
Matthew c98472d1fb 云台网络摄像机的电源控制调整 6 months ago
Matthew 9cb881ce0a 938加密芯片对应的设备文件名调整 6 months ago
Matthew 856dc1c239 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
Matthew 76e6770cac 阻止程序发起的半小时内的设备重启 6 months ago
jxjajs cf9e7b8264 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
jxjajs 1fe9648704 增加串口持续接收数据时间 6 months ago
Matthew 1b96064578 938强制调用设置静态ip的函数,以监听网络变化
后面需要优化
6 months ago
Matthew b236eb40d2 修复编译警告 6 months ago
XI.CHEN 58b01573ad 串口拍照调用函数修改 6 months ago
jxjajs e59497e159 修改摄像机串口接收 6 months ago
jxjajs e7a0a3b290 修改波特率设置 6 months ago
jxjajs dbbfd96de2 摄像机串口独立 6 months ago
XI.CHEN 3e26f35c65 串口重试时间延长 7 months ago
XI.CHEN 98c99e016c 串口拍照启用线程 7 months ago
XI.CHEN ceb89a0c70 延长预置位调用等待时间 7 months ago
XI.CHEN bd706d1cf4 删除反复读取传感器波特率 7 months ago
jxjajs 385ae48185 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 7 months ago
jxjajs f1cfe67f72 恢复串口拍照从1开始取包 7 months ago