Commit Graph

1265 Commits (Dataqueue)

Author SHA1 Message Date
Matthew 6a7295d9c3 调整网络拍照延时关闭时间 5 months ago
Matthew f1c6153852 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 5 months ago
Matthew 26725d8bdc Update version to 1.3.2
Based Core Version to 1.4.1
5 months ago
Matthew dfac4eeba6 如果IP已经是设置的IP,则跳过 5 months ago
XI.CHEN ac3e4627e9 电源控制 修正自检判断条件 5 months ago
XI.CHEN 697fe83f5e 云台 在调用预置位前等待自检 5 months ago
XI.CHEN cdfb158437 Update version to 1.3.1
Based Core Version to 1.4.01
5 months ago
XI.CHEN f3b2f01f8b 串口log文件名统一 5 months ago
Matthew d4a561f3c2 Update version to 1.1.55
Based Core Version to 1.2.36
5 months ago
Matthew 417d5c5083 网络打开时需要同时打开485 5 months ago
XI.CHEN 2c35ca4b3d Update version to 1.1.54
Based Core Version to 1.2.36
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 35ad7d8d25 Update version to 1.1.53
Based Core Version to 1.2.35
5 months ago
XI.CHEN 950e520fb2 修复编译错误 5 months ago
XI.CHEN 5cc05c373d 增加宇视分辨率设置 5 months ago
XI.CHEN de288c860f 增加文件锁日志 5 months ago
Matthew 7b240fd01b Update version to 1.1.52
Based Core Version to 1.2.34
5 months ago
Matthew dc2b8c1504 libcurl增加错误处理 5 months ago
Matthew 4e4904241c Update version to 1.1.51
Based Core Version to 1.2.33
5 months ago
Matthew b71fcebdf2 修复bug 5 months ago
Matthew 7baaae19d8 Update version to 1.1.50
Based Core Version to 1.2.33
5 months ago
Matthew 128a0a0003 改一下网络电源控制的时间 5 months ago
Matthew 26144c195b Update version to 1.1.49
Based Core Version to 1.2.33
5 months ago
Matthew dfd970d1a9 优化错误处理 5 months ago
XI.CHEN 5d318b62c8 增加网络拍照失败日志 5 months ago
XI.CHEN 9417980864 Update version to 1.1.48
Based Core Version to 1.2.32
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
Matthew 25e465df3b Update version to 1.1.47
Based Core Version to 1.2.31
6 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 5007405469 Update version to 1.1.46
Based Core Version to 1.2.31
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 a3599ccfc1 Update version to 1.1.45
Based Core Version to 1.2.30
6 months ago
XI.CHEN dd35758e59 修复云台控制开启条件判断 6 months ago
Matthew ac5905f9fc Update version to 1.1.44
Based Core Version to 1.2.29
6 months ago
Matthew 9231d205ca Fix bug 6 months ago
Matthew 0243d9b7d4 修复gpio bug和优化 6 months ago
Matthew a59144c97b Update version to 1.1.43
Based Core Version to 1.2.29
6 months ago
Matthew 69a634edab 网络摄像机的通道号需要独立设置
复用CameraId字段
6 months ago
Matthew 03628c4a70 调整配置 6 months ago
Matthew 65f9e617e8 Revert "多渠道打包"
This reverts commit 43fde7df76.
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 2b6db343be Update version to 1.1.42
Based Core Version to 1.2.29
6 months ago
XI.CHEN d5b46fb343 右上OSD换行位置 6 months ago
Matthew 8c1492052d 修复手动拍照各数据组合的错误 6 months ago
liuguijing 8dabf9aecc Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
liuguijing 43fde7df76 多渠道打包 6 months ago
XI.CHEN 2354403941 Update version to 1.1.41
Based Core Version to 1.2.28
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 b73e58bfe7 Update version to 1.1.40
Based Core Version to 1.2.28
6 months ago
XI.CHEN 09073b86b0 增加多合一气象传感器处理 6 months ago
XI.CHEN c2d4c3d296 Update version to 1.1.39
Based Core Version to 1.2.27
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 b5413de417 Update version to 1.1.38
Based Core Version to 1.2.26
6 months ago
XI.CHEN a24345e01f 禁用传感器后不导致重采 6 months ago
XI.CHEN 816881fd89 修改定时拍照不延时 6 months ago
XI.CHEN ce4f7358b4 Update version to 1.1.37
Based Core Version to 1.2.25
6 months ago
XI.CHEN c410e1e6a9 定时拍照不会延时关闭摄像机电源 6 months ago
XI.CHEN f0ed4adea3 Update version to 1.1.36
Based Core Version to 1.2.25
6 months ago
XI.CHEN e0d926efb1 未开启电源时,控制云台不会打开电源 6 months ago
XI.CHEN 92781524d7 Update version to 1.1.35
Based Core Version to 1.2.25
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 9facbf3c55 Update version to 1.1.34
Based Core Version to 1.2.24
6 months ago
XI.CHEN c501b689de 增加立即关闭摄像机电源函数,实现手动关闭 6 months ago
XI.CHEN 162d7624af 调整时间类型长度 6 months ago
XI.CHEN 99efe9c91f 加长拍照时间表更新的时间类型长度 6 months ago
XI.CHEN a3291e2dd2 Update version to 1.1.33
Based Core Version to 1.2.23
6 months ago
XI.CHEN ddff8bdaca 串口拍照调用预置位BUG修复 6 months ago
XI.CHEN 1195bb01a1 Update version to 1.1.32
Based Core Version to 1.2.22
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 6940c89caf Update version to 1.1.31 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 d671565f0b Update version to 1.1.30 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 fd8b9c093e Update version to 1.1.29
Based Core Version to 1.2.20
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 b73c395357 Update version to 1.1.27
Based Core Version to 1.2.20
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 bf3cb6416f Update version to 1.1.26
Based Core Version to 1.2.20
6 months ago
XI.CHEN d6392eb1d3 修正云台控制传入文件地址错误 6 months ago
XI.CHEN b2d2100dfc 修复云台控制阻塞问题 6 months ago
XI.CHEN ab9ba337dc 云台命令映射关系调整 6 months ago
Matthew 0b69dc75bc Update version to 1.1.25
Based Core Version to 1.2.19
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
XI.CHEN 56c1394bce Update version to 1.1.24
Based Core Version to 1.2.19
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 93864e30b9 Update version to 1.1.23
Based Core Version to 1.2.18
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 2445315c5d Update version to 1.1.22
Based Core Version to 1.2.17
6 months ago
XI.CHEN da14135af3 串口拍照增加水印 6 months ago
XI.CHEN 06b8185a0a Update version to 1.1.21
Based Core Version to 1.2.16
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
Matthew f4a93cae9a 调整TARGET_SDK 6 months ago
XI.CHEN 96a1221a53 Update version to 1.1.20
Based Core Version to 1.2.15
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 a5603100f8 Update version to 1.1.19
Based Core Version to 1.2.14
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
Matthew dfcb3623a9 Update version to 1.1.17
Based Core Version to 1.2.12
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 2e3cd76f01 Update version to 1.1.16
Based Core Version to 1.2.11
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 7a784a89e0 Update version to 1.1.15
Based Core Version to 1.2.10
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 187d715cd5 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
jxjajs e7a0a3b290 修改波特率设置 6 months ago
Matthew 11bab5a631 修复错误的合并 6 months ago
Matthew 87eac6bd08 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
jxjajs dbbfd96de2 摄像机串口独立 6 months ago
Matthew 4f77f847b1 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 6 months ago
XI.CHEN 3e26f35c65 串口重试时间延长 6 months ago
XI.CHEN 98c99e016c 串口拍照启用线程 6 months ago
XI.CHEN ceb89a0c70 延长预置位调用等待时间 6 months ago
XI.CHEN bd706d1cf4 删除反复读取传感器波特率 6 months ago
jxjajs 385ae48185 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 6 months ago
jxjajs f1cfe67f72 恢复串口拍照从1开始取包 6 months ago
XI.CHEN 2fead34087 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 7 months ago
XI.CHEN 7e48c76d33 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 7 months ago
jxjajs 8c9ff7f2ba 修改错包 7 months ago
XI.CHEN ef3cc6d726 覆冰打印信息变更 7 months ago
jxjajs da6074e2ec Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 7 months ago
Matthew 01a056da4b Update version to 1.1.14
Based Core Version to 1.2.10
7 months ago
jxjajs f10c33a5f9 修改读取图片序号 7 months ago
XI.CHEN 879801088d 增加覆冰传感器打印地址 7 months ago
Matthew f5590a708a 调整设置静态ip的时序 7 months ago
Matthew 2694aec84a 修复手机app拍照总是通道1的bug
修复停止服务时crash bug
7 months ago
Matthew 3fa3a53507 Update version to 1.1.13
Based Core Version to 1.2.9
7 months ago
Matthew 57c028c877 移除注释的代码 7 months ago
Matthew f8b02ee28c 确保目录存在 7 months ago
Matthew 11f1dcd2f6 Update version to 1.1.12
Based Core Version to 1.2.9
7 months ago
Matthew 4bddca2cd2 优化代码 7 months ago
Matthew 251e120676 调整OTG的电源控制 7 months ago
Matthew 096c253dbf 修复错误的合并 7 months ago
Matthew 90e11f8763 Update version to 1.1.11
Based Core Version to 1.2.9
7 months ago
Matthew c271753dec 938直接使用系统默认IP 7 months ago
Matthew 2a8a9e6074 修复错误的合并 7 months ago
jxjajs 6b4076785f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 7 months ago
jxjajs 25e459faea 格式变化 7 months ago
Matthew 01c8767a29 增加日志。关闭加密芯片 7 months ago
Matthew 5d844da1c4 增加日志 7 months ago
Matthew b7a7221e31 使用新实现控制电源 7 months ago
Matthew ce39427eda Update version to 1.1.10
Based Core Version to 1.2.9
7 months ago
Matthew 05208d202f 优化代码 7 months ago
Matthew fd2b54aef1 优化代码 7 months ago
Matthew 39493ec75b 处理锁的释放 7 months ago
Matthew cd220aa256 启动电源控制线程 7 months ago
Matthew 36750d6e85 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 7 months ago
Matthew 36d2188ce9 优化电源控制机制 7 months ago
Matthew eb13dea4fa 优化日志 7 months ago
陈曦 56b53eb8d4 根据配置修改分辨率和自检时间 7 months ago
陈曦 0b8fc17c22 延长缩放等待时间 7 months ago
jxjajs 1728e08f7a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 7 months ago
jxjajs 1e47fe04e6 修改数据格式 7 months ago
Matthew 8cdcbc690e Update version to 1.1.9
Based Core Version to 1.2.8
7 months ago