Commit Graph

1153 Commits (856c1a8b102beb6efe5625f199ea4e97718f6087)

Author SHA1 Message Date
Matthew dc692d05b1 优化日志 4 months ago
Matthew 6be75f4a8e 云台电源和网络电源分开控制 4 months ago
Matthew 9b59489969 Update version to 1.3.17
Based Core Version to 1.4.13
4 months ago
Matthew 31954a3f17 增加以太网变化时检测网络是否断连 4 months ago
Matthew b7f6631672 启动服务之后再监控以太网 4 months ago
Matthew c4d8bd7f92 修复bug 4 months ago
Matthew 672159ddc5 Update version to 1.3.16
Based Core Version to 1.4.12
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 4f1b8c3b49 Update version to 1.3.15
Based Core Version to 1.4.10
4 months ago
Matthew db208237d6 Update version to 1.3.14
Based Core Version to 1.4.9
4 months ago
Matthew 7adebb3019 增加重启延时控制 4 months ago
Matthew b7bfefe3e6 Refactor 4 months ago
Matthew af9ace5183 Update version to 1.3.13
Based Core Version to 1.4.8
4 months ago
XI.CHEN 87e8853737 Update version to 1.3.12
Based Core Version to 1.4.7
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 b597e1f4eb Update version to 1.3.11
Based Core Version to 1.4.7
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 c08b8a03b1 Update version to 1.3.9
Based Core Version to 1.4.6
4 months ago
Matthew 5bfd1f58ea 优化日志 4 months ago
Matthew 772690d57e Update version to 1.3.8
Based Core Version to 1.4.5
4 months ago
Matthew 5000fdecef Update version to 1.3.7
Based Core Version to 1.4.4
4 months ago
Matthew 2b0f921157 Update version to 1.3.6
Based Core Version to 1.4.3
4 months ago
XI.CHEN 345f9cc09d Update version to 1.3.5
Based Core Version to 1.4.2
4 months ago
XI.CHEN 055cd6cc7f 放宽温度传感器取值范围限制 4 months ago
Matthew c307b7e56e cmdid未设置的异常保护 5 months ago
XI.CHEN 51a744cc51 Update version to 1.3.4
Based Core Version to 1.4.2
5 months ago
jxjajs 72c2ebebc6 修改海康球机网络抓拍 5 months ago
jxjajs 378bc2d0fb 读取图片返回错误,包号不增加 5 months ago
Matthew bbb4d8b4a3 Update version to 1.3.3
Based Core Version to 1.4.1
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 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