Commit Graph

457 Commits (main)

Author SHA1 Message Date
Matthew 74fbde81d4 运维上报时增加历史照片上传数量 11 months ago
Matthew c4dd885bc0 上报sim卡信息时增加ip信息 11 months ago
Matthew 4b8830e7af 增加ABI的支持 11 months ago
Matthew 15ff504a9b Update MpMaster version to 1.0.65 11 months ago
Matthew 5eec71f498 优化和增加统计数据的日志 11 months ago
Matthew 82200e7f45 上传日志增加时间的控制 11 months ago
Matthew 6f7c81c731 Update MpMaster version to 1.0.64 11 months ago
Matthew a2a8ce9227 Update MpMaster version to 1.0.63 11 months ago
Matthew 375762a400 重启frp应用 11 months ago
Matthew 1cf6bdc947 修改Foreground channel id 11 months ago
Matthew 33bbc558ba 公用类移到common module中 11 months ago
Matthew 61c139262d Update MpMaster version to 1.0.62 11 months ago
Matthew 4e3e556857 frp传递代理名称 11 months ago
Matthew b202c00ef1 Update MpMaster version to 1.0.61 11 months ago
Matthew 8e7f32e36b 传递frp的remotePort参数 11 months ago
Matthew 917978bce5 修改提示语 11 months ago
Matthew 13a567abb6 Update MpMaster version to 1.0.60 11 months ago
Matthew 56d01ac2ff 优化异常判断逻辑 11 months ago
Matthew 239c8f5960 增加统计数据文件读取的重试 11 months ago
Matthew e3d25273d8 Update MpMaster version to 1.0.59 11 months ago
Matthew a42b25e3b9 Update MpMaster version to 1.0.58 11 months ago
Matthew 3884b1aa5c 避免PendingIntent被错误的复用 11 months ago
Matthew e3f020ee20 Update MpMaster version to 1.0.57 11 months ago
Matthew 124d70212f 统计数据增加3项数据
最后心跳时间
最后心跳回复时间
最后收到主站报文时间
11 months ago
Matthew 411b65340a 去除重复代码 11 months ago
Matthew 028972fd09 Update MpMaster version to 1.0.56 11 months ago
Matthew 44c8e5c057 发送短信时requestCode做变化,避免重复 11 months ago
Matthew a16711f25d Update MpMaster version to 1.0.55 11 months ago
Matthew dbb1d4f862 Update MpMaster version to 1.0.54 11 months ago
Matthew a3342c29b2 修复单位不统一导致的bug 11 months ago
Matthew ace901adc3 人为加5秒,使得心跳靠后,等mpapp的心跳先触发 11 months ago
Matthew 7483aa2087 修复单位换算错误 11 months ago
Matthew a4b509a819 实现同时重启MpAPP 和运维APP 11 months ago
Matthew 8a77bb6ab6 Update MpMaster version to 1.0.53 11 months ago
Matthew 33b62913a8 优化日志 11 months ago
Matthew eabaee467f 移除不必要的切换 11 months ago
Matthew f36c084708 修复时间判断的单位不一致错误 11 months ago
Matthew 4e7d40f52b Refactor 11 months ago
Matthew f47c4054c6 重启系统先等待1s 11 months ago
Matthew b191f10df5 优化短信处理的代码 11 months ago
Matthew 77ebc39367 Update MpMaster version to 1.0.52 11 months ago
Matthew ed07a6f67f 实现短信查询sim卡信息 11 months ago
Matthew 62e182b49d 短信查询网络状态 11 months ago
Matthew e04e20fc96 Update MpMaster version to 1.0.51 11 months ago
Matthew 84f83c0d28 增加重启mpapp和mpmaster app的功能 11 months ago
Matthew 08471cc916 优化重启实现 11 months ago
Matthew 7a2a9a1f6d 优化上传文件的文件名 11 months ago
Matthew fad7f20ed1 对路径做保护 11 months ago
Matthew 44adc9f41c Update MpMaster version to 1.0.50 11 months ago
Matthew aa3347b2d2 优化simcard切换的日志 11 months ago
Matthew b971200d88 优化心跳机制
当设置app为绝对时间心跳时,也增加一个周期性的心跳检查mpapp的状态。这个周期性的心跳不执行实际的心跳行为,仅做检查状态,确保mpapp保活
11 months ago
Matthew 2e736d81c0 重启设备命令尝试3次 11 months ago
Matthew 42623859df 实现停止frp并增加日志 11 months ago
Matthew 6c17d1190a Update version to 1.0.49 12 months ago
Matthew 4aff53cdba 修改FRP package name 12 months ago
Matthew 33fa704333 Update MpMaster version to 1.0.48 12 months ago
Matthew 13644babc2 上传日志后删除临时文件 12 months ago
Matthew 8a5fd79d20 显示启动时间 12 months ago
Matthew 036d74c620 优化压缩相关的实现 12 months ago
Matthew 0544b29f2a 运维APP显示当前运维相关配置信息 12 months ago
Matthew 33be977e56 运维功能进行分组显示 12 months ago
Matthew 32adff37c5 优化OTA升级 12 months ago
Matthew 669a05d6a7 改为横屏 12 months ago
Matthew 4ae4687ec2 Update MpMaster version to 1.0.47 12 months ago
Matthew d6cd52dc7d 优化重启方法 12 months ago
Matthew f033c88644 Update MpMaster version to 1.0.46 12 months ago
Matthew 6ca4d14afd 短信的处理移到线程中 12 months ago
Matthew 26eb4f46b7 优化代码 12 months ago
Matthew db66e58d02 启动frp的实现和延时重启 12 months ago
Matthew 1c87e22bf9 优化MpAPP重启机制 12 months ago
Matthew c06442b8a8 调整cmdid字体大小 12 months ago
Matthew f7fab054bf Update MpMaster version to 1.0.45 12 months ago
Matthew b75e072e66 合并MpAPP和运维日志的上传 12 months ago
Matthew 32218364d3 运维日志保留时间的配置 12 months ago
Matthew 0aafc7ed44 Update MpMaster version to 1.0.44 12 months ago
Matthew 73a3ad7ba1 日志清理一天执行一次 12 months ago
Matthew a8df6e3094 清除日志 12 months ago
Matthew 2cf1ed9c6d 修复bug 12 months ago
Matthew 7d925b78b6 优化日志分割 12 months ago
Matthew 1532a14c0f 增加空指针保护 1 year ago
Matthew 80bc9af982 运维提交数据中,增加当前的sim卡槽编号
数据形如: slot:1
1 year ago
Matthew d38cbbd102 运维状态,心跳不跟随MpAPP 1 year ago
Matthew 02db142835 Update MpMaster version to 1.0.43 1 year ago
Matthew 6b2b9df376 实现快心跳周期的设置 1 year ago
Matthew b1bc061f8b Update MpMaster version to 1.0.42 1 year ago
Matthew c1438cc3d8 优化代码 1 year ago
Matthew 59022ea296 增加装置端下载文件的功能 1 year ago
Matthew 668e700c78 Update version to 1.0.41 1 year ago
Matthew 6d036c9fd9 优化simcard切换 1 year ago
Matthew 501e736028 Update MpMaster version to 1.0.40 1 year ago
Matthew 3907253afe Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
Matthew f13f7f52d6 收到MpAPP心跳时,如果当前注册的运维心跳时间超过当前时间加10分钟,则心跳不重新注册 1 year ago
liuguijing f62567f019 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
liuguijing c02a40d7d3 修改出现无法解析的短信时,不回复error 1 year ago
Matthew d31020d59e 优化日志 1 year ago
Matthew 129f6df639 优化网络切换逻辑 1 year ago
Matthew 56e3012737 Update MpMaster version to 1.0.39 1 year ago
Matthew 198c6dc43d 修复存储信息 1 year ago
Matthew 745b6b18fe 上报数据增加网络信号强度 1 year ago
Matthew 65b1c9bb94 修复心跳设置的逻辑错误 1 year ago
Matthew dc9251bba4 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
Matthew 1f7c43ceff 更新配置后重新加载心跳闹钟 1 year ago
liuguijing 2fe2095a8a Merge remote-tracking branch 'origin/main' 1 year ago
liuguijing ae8be7fd93 增加序列号 1 year ago
Matthew ff75f8c407 优化代码 1 year ago
Matthew 8ffd2f1089 移除无用代码 1 year ago
Matthew b74d96991a 增加固件版本信息 1 year ago
Matthew 0a53abf336 Update MpMaster version to 1.0.38 1 year ago
Matthew dedb77bb70 优化运维心跳的处理 1 year ago
Matthew af1ca401c2 删除无用的代码 1 year ago
Matthew 5faeadce9d 修复和优化运维心跳功能 1 year ago
Matthew ac2667a7b7 修改日志文件名形式 1 year ago
Matthew 5d25266f9f Update MpMaster version to 1.0.37 1 year ago
Matthew 065d667fea 增加日志 1 year ago
Matthew 2e935b7007 Update MpMaster version to 1.0.36 1 year ago
Matthew cda5aab072 移除485控制 1 year ago
Matthew 57b6c2046e Update MpMaster version to 1.0.35 1 year ago
Matthew 63542b7d1a 如果MpAPP没有配置cmdid,则取序列号 1 year ago
liuguijing 6d69d77ba1 拍照通道数目修改 1 year ago
liuguijing 6b6d56187e Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
liuguijing 6d831d3274 拍照时间表功能新增
修复udp tcp  加解密短信字段错误
优化水印功能
新增全通到修改水印分辨率功能
1 year ago
Matthew 898528d534 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
liuguijing 7fdde50837 时间表代码优化 1 year ago
liuguijing 15a47c5f2c 新增运维拍照功能 1 year ago
liuguijing 0a2c25be18 重启运维应用和app应用功能新增 1 year ago
Matthew 2cd16f63d3 Fix typo 1 year ago
liuguijing 1f96127261 时间表设置 1 year ago
liuguijing 749a88bd2d 设置装置cmdid短信返回错误的bug 1 year ago
liuguijing 4445591a12 设置运维时间表数据判断修改 1 year ago
liuguijing 65c858ba1b 修改获取运维ip和端口的返回bug 1 year ago
liuguijing 8b190fdb1a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
liuguijing f1945e07b4 短信启动测试OK
修改Android11短信发送sim卡错位的bug
修改接收短信的bug
1 year ago
Matthew 8662d89d42 Update MpMaster version to 1.0.34 1 year ago
Matthew 29c244bccd 调整保活检测机制 1 year ago
liuguijing 2030319491 下载和更新app配置 1 year ago
liuguijing a2076da352 去除下载时notify的UI 1 year ago
liuguijing 69c9ad7f8a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
liuguijing 0f8951df6f 时间表运维和下载更新 1 year ago
Matthew f39a3cfad6 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 year ago
Matthew ea1ba78352 日志上传包括数据传输日志 1 year ago
Matthew 16cef5a4bf 增加打开加密芯片电源的功能 1 year ago
liuguijing aef5c13b93 时间表分钟转换成秒修改 1 year ago
liuguijing d9d6b10aa5 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp
# Conflicts:
#	mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
1 year ago
liuguijing 8360785f2f 运维时间表功能修改 1 year ago
Matthew df55e97ed2 修复编译错误 1 year ago
Matthew f21bcab4a5 短视频的新实现,支持OSD 1 year ago
liuguijing fe4a2ae765 Merge remote-tracking branch 'origin/main' 1 year ago
liuguijing c1437e56a7 短信监听运维和GPS定位获取 1 year ago
Matthew 79558b70f2 修复iccid赋值错误的bug 1 year ago
Matthew 12ecd9cbd1 实现OTA升级 1 year ago
Matthew fae787835c Update MpMaster version to 1.0.33 1 year ago
Matthew d8136da9a1 移除重复的运维请求,并针对不同的运维触发添加不同的标记 1 year ago
Matthew f081edac52 改IMEI为ICCID 1 year ago
Matthew 95c0a9e814 APP更新之后,重启前先判断APP是否已经存活 1 year ago
Matthew 49b8343e20 增加日志 1 year ago
Matthew 59791d6ded 压缩so 1 year ago
Matthew f17d633adf 优化代码 1 year ago
Matthew 1577e98ed0 Update MpMaster version to 1.0.32 1 year ago
Matthew f72a61e603 上传运维日志 1 year ago
Matthew 013711102b Update MpMaster version to 1.0.31 1 year ago
Matthew fc6e835773 优先使用MpAPP的心跳触发 1 year ago
Matthew 0d16d12b29 更新devapi,支持SPI电源控制 1 year ago
Matthew 2ed0215b92 Update MpMaster version to 1.0.30 1 year ago
Matthew 4cc60cdaaf 优化日志 1 year ago
Matthew a1ecb0bd65 修复心跳时间的转换错误 1 year ago
Matthew eaf76e9f7d 运维APP增加日志 1 year ago
Matthew 430f5b38cf 优化代码 1 year ago
Matthew 225fe2cd7f 增加保活检测时间可配置 1 year ago
Matthew c6bcbcdd98 Update MpMaster version to 1.0.29 1 year ago
Matthew 5dec910926 修复切换simcard的bug 1 year ago
Matthew 8e7dad3fd2 修改字段名字 1 year ago
Matthew f7695bce78 增加过去一周的重启次数统计 1 year ago
Matthew ebddf86b8a Update MpMaster version to 1.0.28 1 year ago
Matthew 5ce977e846 运维获取统计数据方式优化,避免数据库冲突 1 year ago
Matthew 2bb058c4d7 运维显示当前cmdid 1 year ago
Matthew cf56d3a353 Update MpMaster version to 1.0.27 1 year ago
Matthew 4f961e7434 实现公钥的导入 1 year ago
Matthew ae120b0bd2 Update MpMaster version to 1.0.26 1 year ago
Matthew 87aac90d58 未捕获异常自动重启app 1 year ago
Matthew e57843cdb0 优化运维功能 1 year ago
Matthew c37e43d6a7 更正调用的方法 1 year ago
Matthew c70eccdbfa 更新依赖包
支持ota升级和增量升级
1 year ago
Matthew 8481910960 禁用回退键 1 year ago
Matthew 98626fa66e Update version to 1.0.25 1 year ago
Matthew 2965dc60c7 实现自动切换网络 1 year ago
Matthew 448c2cf6ba 运维启动时切换simcard 1 year ago
Matthew fd6e18ff26 优化代码 1 year ago
Matthew fac1660436 优化代码 1 year ago
Matthew cc2e412a29 优化运维程序功能 1 year ago
Matthew 7dfb74b3f0 Update MpMaster version to 1.0.24 1 year ago
Matthew 357f4bc8ce 优化保活代码 1 year ago
BlueMatthew 428c156365 增加文件是否存在的判断 1 year ago
BlueMatthew fe7f1f123c Update MpMaster version to 1.0.23 1 year ago
BlueMatthew 3c69b49f5c 修复编译错误 1 year ago
BlueMatthew 6d61dbc511 MpApp保活
检查App.db最后更新时间,如果超过30分钟没有变化,则重启MpApp
1 year ago
BlueMatthew 7097b4a739 短信监控移到运维程序中 1 year ago
BlueMatthew 666ccfdc93 优化编译脚本 1 year ago
BlueMatthew dfa7081e4f Update MpMaster version to 1.0.22 1 year ago
BlueMatthew 7669e6d049 Update MpMaster version to 1.0.21 1 year ago
BlueMatthew 9a76fca9a4 增加Package变化的通知 1 year ago
BlueMatthew 609603aa00 Update MpMaster version 1.0.20 1 year ago
BlueMatthew ba36303b07 Fix bug 1 year ago
BlueMatthew 3d384f5bd4 Update MpMaster version to 1.0.19 1 year ago
BlueMatthew f3cb398deb Add oid 1 year ago
BlueMatthew 27dfdb7153 Update MpMaster version to 1.0.18 1 year ago
BlueMatthew 27c6716fd7 应用升级时更新版本号 1 year ago
BlueMatthew 6c64ae1380 优化代码 1 year ago
BlueMatthew ee2fef7c3a 之定义输出文件名 1 year ago
BlueMatthew 28b9e13727 Update MpMaster version to 1.0.17 1 year ago
BlueMatthew d599f4ed1d 增加权限和调整优先级 1 year ago
BlueMatthew 5788aad1df 移动热点相关处理 1 year ago
BlueMatthew 1419a28e1c Update MpMaster version to 1.0.16 1 year ago
BlueMatthew fa8775add0 Update MpMaster version to 1.0.15 1 year ago
BlueMatthew a842da9b33 修复bug 1 year ago
BlueMatthew a817d4f762 Update MpMaster version to 1.0.14 1 year ago
BlueMatthew 9beeef5d18 修复bug 1 year ago
BlueMatthew 100fbeb7cb Update MpMaster version to 1.0.13 1 year ago
BlueMatthew ba349a2f84 上报数据增加一个标记 1 year ago
BlueMatthew 04a05063bc Update MpMaster version to 1.0.12 1 year ago
BlueMatthew 85dd793fea 增加运维的功能 1 year ago
BlueMatthew a7a36547fa 默认选中485读模式 1 year ago
BlueMatthew 92560486a9 Update MpMaster version to 1.0.11 1 year ago
BlueMatthew 3d97aada0c 增加RS读写模式的控制 1 year ago
BlueMatthew a72798dc82 Update MpMaster version to 1.0.10 1 year ago
BlueMatthew 2aef7bcc33 修复UI相关的bug 1 year ago
BlueMatthew 63064aa857 修复重启后自动启动功能 1 year ago
BlueMatthew 8c6b87842c Update version to 1.0.8 1 year ago
BlueMatthew 4c51027189 支持修改配置后重启APP 1 year ago
BlueMatthew 2cb01f7515 Update version to 1.0.7 1 year ago
BlueMatthew c6188faf15 修复运维修改配置文件的bug 1 year ago
BlueMatthew 7129373681 增加485控制按钮 1 year ago
BlueMatthew 88e9aa2ad5 启动即执行运维 1 year ago
BlueMatthew 1c0bd5e572 增加485的控制 1 year ago
BlueMatthew e1ce0d81dc 修复资源泄漏、修复拍照时间表的bug 1 year ago
BlueMatthew 8b11ff38b6 Update version to 1.0.6 1 year ago
BlueMatthew 497723747f 移除调试代码 1 year ago
BlueMatthew 7a426d0b60 优化配置文件的修改 1 year ago
BlueMatthew 4e223d8105 运维APP增加一些实现 1 year ago
BlueMatthew 6e3105b0f8 实现GPIO的访问 1 year ago
BlueMatthew c92713cc64 优化界面和修复bug 1 year ago
BlueMatthew 022c755b93 优化代码 1 year ago
BlueMatthew 68939f67ec Update MpMaster version 1.0.4 1 year ago
BlueMatthew 540c273145 增加GPIO OTG的控制 1 year ago
BlueMatthew 7b0a6c6e2c 增加CAM3V3和OTG的控制 1 year ago
BlueMatthew e8e7632a6e 增加GPIO控制和自动曝光的调整 1 year ago
BlueMatthew 1a4001e182 更新SysApi.aar 1 year ago
BlueMatthew 410eff11a9 增加绑定网络的接口、实现usb摄像头拍照 1 year ago
BlueMatthew 54f80698d1 运维请求增加版本信息 2 years ago
BlueMatthew cdf0e9d268 Update version to 1.0.3 2 years ago
BlueMatthew d67bc75310 优化代码 2 years ago