Commit Graph

1093 Commits (3d3a02158ed320747ac9a7b5702d5faa7a79db8b)

Author SHA1 Message Date
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