main #3

Open
matthew wants to merge 835 commits from main into rtmpsuck

835 Commits (main)

Author SHA1 Message Date
Matthew dcd1d20a75 先移除fps的设置 1 day ago
Matthew f9b79e67fd Update version to 1.3.196
Based Core Version to 1.4.106
5 days ago
Matthew 024d7f73b8 Update MpMaster version to 1.1.36 5 days ago
Matthew 476fa0ab7c 优化代码 5 days ago
Matthew 9ea9043a0e 优化代码 5 days ago
Matthew 8acd884797 改成常量 5 days ago
Matthew bbcd2691ed 增加flag 5 days ago
Matthew c65ffab9dd 加注释 5 days ago
Matthew 99d08c30ef 增加异常捕获 5 days ago
Matthew a38e3801ae 对于旧版本,直接注册重启设备的延迟广播来保活 5 days ago
Matthew a9ac0743f7 优化服务的返回值 5 days ago
Matthew a7c4356d93 移除不需要的代码和功能 5 days ago
Matthew 2baf96fe67 移除不需要的代码和功能 5 days ago
Matthew 913747e6c3 Update version to 1.3.195
Based Core Version to 1.4.105
6 days ago
Matthew 0b1aa8a13a Update version to 1.3.194
Based Core Version to 1.4.104
7 days ago
Matthew b5aec7ae17 增加清除缓存的拍照计划功能 7 days ago
Matthew 6f3cae9d02 根据新的接口调整实现 1 week ago
Matthew 7a67a142cb Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 1 week ago
XI.CHEN 0a6850d92b 调整名字 1 week ago
Matthew 42dab55bc4 Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 1 week ago
Matthew 662d3307b0 Update version to 1.3.193
Based Core Version to 1.4.103
1 week ago
XI.CHEN 2b9c1feae5 增加查询当日流量 1 week ago
Matthew aa04fca845 Update version to 1.3.192
Based Core Version to 1.4.101
1 week ago
Matthew a72118a5a6 优化回车换行的处理 1 week ago
Matthew d50b21d0d6 Update version to 1.3.191
Based Core Version to 1.4.101
1 week ago
Matthew 6255fa932c 增加最小fps控制 1 week ago
Matthew 8aec5f30ef 处理资源未释放的问题 2 weeks ago
Matthew c23f30ce71 增加山西智洋主站的规约实现 2 weeks ago
Matthew 118ffdc638 Update version to 1.3.190
Based Core Version to 1.4.100
2 weeks ago
Matthew 058e4b2f46 增加几个报文的手动触发 2 weeks ago
Matthew 48d61baf6f 调整配置目录结构 2 weeks ago
Matthew 9ff07b8c12 Update version to 1.3.189
Based Core Version to 1.4.99
2 weeks ago
Matthew 69958ba1d2 对于需要曝光补偿的场景,设置更明亮模式 2 weeks ago
Matthew 3979e03882 预览request上设置算法 2 weeks ago
Matthew b96fe6bbfd Update version to 1.3.188
Based Core Version to 1.4.98
3 weeks ago
Matthew 94edf1324f Update version to 1.3.187
Based Core Version to 1.4.97
3 weeks ago
Matthew 18efb1e439 错误处理 3 weeks ago
Matthew b2a1a5cde3 Update MpRes version to 1.0.14 3 weeks ago
Matthew cdf664b448 更新配置 3 weeks ago
Matthew e549126563 Update MpRes version to 1.0.13 3 weeks ago
Matthew 1322ddd8b2 更改默认配置 3 weeks ago
Matthew 139a6a5fde Update MpMaster version to 1.1.35 3 weeks ago
Matthew 9721eced21 网络信号信息优化 3 weeks ago
Matthew b425713f63 Update version to 1.3.186
Based Core Version to 1.4.96
3 weeks ago
Matthew 7e3ff1b741 Update version to 1.3.185
Based Core Version to 1.4.95
3 weeks ago
Matthew 284f61a86e Update version to 1.3.184
Based Core Version to 1.4.95
3 weeks ago
Matthew aa4ca70d07 优化脚本和日志 3 weeks ago
Matthew 6e1655813d Update version to 1.3.183
Based Core Version to 1.4.94
3 weeks ago
Matthew 8468978f19 以太网启用之后,多等一段时间,避免未生效 3 weeks ago
Matthew ce2b36422c Update version to 1.3.182
Based Core Version to 1.4.94
3 weeks ago
Matthew 38bfd44bcd 优化脚本,避免938下面ip丢失问题
更好的方法是固件优化
3 weeks ago
Matthew 5ac7838839 优化脚本,网卡启用之后,先等待1s 3 weeks ago
Matthew 86b7e63849 Update version to 1.3.181
Based Core Version to 1.4.94
3 weeks ago
Matthew adb24119ef 优化以太网网络设置 3 weeks ago
Matthew 436058fefa Update version to 1.3.180
Based Core Version to 1.4.94
3 weeks ago
Matthew 7a6497ee40 调整函数的使用 3 weeks ago
Matthew 03110ac486 优化以太网处理 3 weeks ago
Matthew 8612c66ed3 优化脚本 3 weeks ago
Matthew 60989b5c40 优化信号获取的实现 4 weeks ago
Matthew 4df8d72c42 调整移动信号的获取 4 weeks ago
Matthew f3e5cda1da Update version to 1.3.179
Based Core Version to 1.4.93
4 weeks ago
Matthew 6d68a33224 优化脚本 4 weeks ago
Matthew 9d0f93b6ff Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 4 weeks ago
Matthew 789547b503 调整以太网络的设置 4 weeks ago
Matthew 514fc054a7 增加函数 4 weeks ago
XI.CHEN afc69b9dff Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 4 weeks ago
XI.CHEN d29fb0280c 修复微拍网络拍照显示网络不存在问题 4 weeks ago
Matthew eca28cd6f7 Update version to 1.3.178
Based Core Version to 1.4.93
4 weeks ago
Matthew 9efab780cf Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 4 weeks ago
Matthew c60587661b 修复bug 4 weeks ago
liuguijing 1b40738b71 修复微拍副机拍照缺少路由的bug 4 weeks ago
Matthew 8bff5f0741 获取信号强度并存储 4 weeks ago
Matthew 3c58e63c6a Update MpRes version to 1.0.12 4 weeks ago
Matthew 450556375e 根据全景平台调整packet size 4 weeks ago
Matthew 4cb359d0fd 增加河南统一 4 weeks ago
Matthew a39614c581 调整规约
65290名称改成河南全景 65285增加为河南统一
4 weeks ago
XI.CHEN 8c702f86c6 Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 4 weeks ago
XI.CHEN 81d4cd700c vendorctrl保护 4 weeks ago
Matthew 15873ca510 Update version to 1.3.177
Based Core Version to 1.4.92
4 weeks ago
Matthew f06a7dfcff Update MpMaster version to 1.1.34 4 weeks ago
XI.CHEN 1fbb9ffe51 Revert "网络拍照在子类构造函数中调用updatetime"
This reverts commit 1772027e9e.
4 weeks ago
XI.CHEN 1772027e9e 网络拍照在子类构造函数中调用updatetime 4 weeks ago
XI.CHEN 8ff8a4bb1e 移除updatetime,云台视频流使用云台线程控制 4 weeks ago
XI.CHEN c071d8ec71 云台短视频录制 4 weeks ago
XI.CHEN e47acced9b 修复编译错误 4 weeks ago
XI.CHEN 4bc9005ebb 云台拍摄短视频、推流网络处理 4 weeks ago
XI.CHEN 5eb8e630c6 云台问题修复 4 weeks ago
Matthew 02e66332ea 优先用大写的名字 4 weeks ago
XI.CHEN bd3451f47c Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp 4 weeks ago
XI.CHEN 812688ae68 云台ip地址设置问题 4 weeks ago
Matthew 5de3b6e73e Update version to 1.3.176
Based Core Version to 1.4.92
4 weeks ago
Matthew c34a649fa5 允许和运维同时启动mpres。并增加异常处理 4 weeks ago
Matthew cf557a599a Update MpMaster version to 1.1.33 4 weeks ago
Matthew fd15553e70 通过MpRes来初始化配置 4 weeks ago
Matthew deb8b06820 Update MpRes version to 1.0.11 4 weeks ago
Matthew 740dc120f6 增加异常处理 4 weeks ago
Matthew f66955ba99 延迟操作 4 weeks ago
Matthew fed87bc421 主动退出 4 weeks ago
Matthew 3bec3c924b 加日志 4 weeks ago
Matthew 0d97a04da0 MpApp和MpMaster各自初始化 4 weeks ago
Matthew 0a88e9b918 初始化MpAPP和MpMaster 4 weeks ago
Matthew e5fd96efce 修复路径错误 4 weeks ago
Matthew 621bbb9c78 Update MpMaster version to 1.1.32 4 weeks ago
Matthew c7351b8000 改为2分钟之后再发送广播 4 weeks ago
Matthew d27321974f 显式指定参数值 4 weeks ago
Matthew 75864122c5 增加日志 1 month ago
Matthew 4eb14e755c 增加一种保活机制
心跳时设置一个系统服务延迟启动运维app的闹钟,并在下一次心跳时重置闹钟时间。
1 month ago
Matthew a22f41d537 增加日志 1 month ago
Matthew a58544eab1 Update version to 1.3.175
Based Core Version to 1.4.92
1 month ago
Matthew ebf8312f6f 移除调试日志 1 month ago
Matthew 46ec0a4f39 修复电压获取的错误处理 1 month ago
Matthew 189ebe3f41 Update version to 1.3.174
Based Core Version to 1.4.91
1 month ago
Matthew ba42b72744 优化938网络的处理 1 month ago
Matthew 92ce03d2e8 优化代码 1 month ago
Matthew 553bae38d9 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
Matthew d3b493efbc 编译条件写反 1 month ago
Matthew 90df33d1f7 调试时全部打印 1 month ago
liuguijing 38edbefcda 修复短信带su的时候,部分命令不执行的bug,只要短信中出现su,就切换到su模式 1 month ago
liuguijing 707aa9bd94 修复短信带su的时候,部分命令不执行的bug 1 month ago
Matthew 6239916828 Update version to 1.3.173
Based Core Version to 1.4.91
1 month ago
Matthew 3f4531ecd6 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
liuguijing 5945fc1d1c 修复短信带su的时候,部分命令不执行的bug 1 month ago
Matthew 0f54876da8 通过命令行的方式重启系统 1 month ago
Matthew f433903745 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
Matthew f216640381 统一日志函数,方便问题排查 1 month ago
Matthew afae4794d3 优化网络电控 1 month ago
Matthew d96f337162 优化权限 1 month ago
liuguijing ba500120b4 修改运维删除文件时 文件夹不删除的问题 1 month ago
Matthew 6b8e477ed1 Update version to 1.3.172
Based Core Version to 1.4.90
1 month ago
Matthew f7ae9d42d2 Update MpRes version to 1.0.10 1 month ago
Matthew 31d65ea586 使用SN作为CMDID 1 month ago
Matthew 911a39a22f 把序列号传给MpRes 1 month ago
Matthew 1f07b07004 Update version to 1.3.171
Based Core Version to 1.4.90
1 month ago
Matthew 6bc8849d3c N938需要设置ip和路由 1 month ago
Matthew c67bebed88 优化云台相关的代码 1 month ago
Matthew f7912c8882 Update MpRes version to 1.0.9 1 month ago
Matthew 35b31577b2 更新拍照时间表 1 month ago
Matthew f8e627abc5 Update version to 1.3.170
Based Core Version to 1.4.90
1 month ago
Matthew 92412cf7d7 修复编译错误 1 month ago
Matthew 4222c6ff8a Update MpRes version to 1.0.8 1 month ago
Matthew 2bba3867e9 更新默认配置 1 month ago
Matthew 5df43d28d6 Update MpRes version to 1.0.7
HeNan 2024
1 month ago
Matthew 724db375ca Update MpMaster version to 1.1.31 1 month ago
Matthew 2b416c3f0d Update version to 1.3.169
Based Core Version to 1.4.90
1 month ago
Matthew 713f69048f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
Matthew c85a5b9371 增加新的重启方式 1 month ago
Matthew 031dc97548 增加新的重启方式 1 month ago
liuguijing 456268c682 默认切换到sh,收到su的时候切换到su 1 month ago
Matthew cc55b5aa4d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
liuguijing 7558b79c5e 删除之前测试的日志
删除MpMaster中的读取电压的代码
1 month ago
liuguijing 0d2090153f 修复短信adb命令执行的bug 1 month ago
liuguijing 024cca3104 测试getInt锁住的问题 1 month ago
Matthew be9f65d3a3 Update version to 1.3.168
Based Core Version to 1.4.89
1 month ago
Matthew 792a694f66 移除这个调用,直接关电,避免系统卡死 1 month ago
Matthew b916e63a00 修复命令错误以及优化判断规则 1 month ago
Matthew eb5af62ad3 换一种命令 1 month ago
Matthew 67479e0acc Update version to 1.3.167
Based Core Version to 1.4.89
1 month ago
Matthew 05b9a7a5e5 网络可用时直接设置路由 1 month ago
Matthew c1a06203e3 Update version to 1.3.166
Based Core Version to 1.4.89
1 month ago
Matthew 02fc11fc22 修正错误的判断条件
Based Core Version to 1.4.89
1 month ago
Matthew 026bd1a022 Update version to 1.3.165
Based Core Version to 1.4.89
1 month ago
Matthew 200131ec67 当网络异常时,通过直接关电来关闭网络 1 month ago
Matthew 0b08c08d81 Update version to 1.3.164
Based Core Version to 1.4.89
1 month ago
Matthew 75f0fdc73c 增加日志 1 month ago
Matthew a7f4866ac8 Update version to 1.3.163
Based Core Version to 1.4.89
1 month ago
Matthew bc823212aa Update MpMaster version to 1.1.30 1 month ago
Matthew 7e23d09814 修复运维修改配置文件的bug 1 month ago
Matthew 5e869d0f92 优化下载参数 1 month ago
Matthew c6dbc278da 调整下载参数 1 month ago
Matthew a248c9e297 调整下载参数 1 month ago
Matthew 185ed0abff 换一种实现 1 month ago
Matthew 3a0ae0ab75 电压调整精度 1 month ago
Matthew 69bc6dced9 Update version to 1.3.162
Based Core Version to 1.4.88
1 month ago
Matthew 6e1625b58d 优化日志 1 month ago
Matthew 115a22dd47 Update version to 1.3.161
Based Core Version to 1.4.87
1 month ago
Matthew c104f26f7d 优化网络设置 1 month ago
Matthew d36d0d916d 优化网络实现 1 month ago
Matthew 0c57bca352 修复网络问题 1 month ago
Matthew 8abeaf9e04 Update MpRes version to 1.0.6 1 month ago
Matthew f0b82e235e Update version to 1.3.160
Based Core Version to 1.4.87
1 month ago
Matthew 3db1ae1c08 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
Matthew 43148b5962 更新充电电压和电量的的对应关系 1 month ago
Matthew a58e86b519 以太网启动之后主动设置ip和路由 1 month ago
XI.CHEN a6bfbdcea2 修复宇视url错误 1 month ago
Matthew 752b5fe318 Update version to 1.3.159
Based Core Version to 1.4.86
1 month ago
Matthew 4ca40f0424 修复URL拼接错误 1 month ago
Matthew d75ad0949e Update version to 1.3.158
Based Core Version to 1.4.86
1 month ago
Matthew e3388d77c3 Update MpMaster version to 1.1.29 1 month ago
Matthew 4067f2d6ed 优化重启的实现 1 month ago
Matthew aeb8e49b81 调整电池电压信息的获取方式 1 month ago
Matthew 3bc6775f84 调整运维获取电压的方式 1 month ago
Matthew dc17a15210 调整电池电压接口和实现 1 month ago
Matthew e4e174a083 调整gpio的处理方式 1 month ago
Matthew 44d780a0ce Update MpRes version to 1.0.5 1 month ago
Matthew 0097f11b69 移除调试代码 1 month ago
Matthew b533cd645f Update version to 1.3.157
Based Core Version to 1.4.85
1 month ago
Matthew e0063691f0 Update MpRes version to 1.0.4 1 month ago
Matthew 31039c213d 更换删除目录的方法 1 month ago
Matthew 86f22853ca 更换删除目录的方法 1 month ago
Matthew b3024a934b 增加删除目录的方法 1 month ago
Matthew b1b2b0d550 Update version to 1.3.156
Based Core Version to 1.4.85
1 month ago
Matthew 0c1143d0d0 修复编译错误 1 month ago
Matthew 362a23f58d Update MpMaster version to 1.1.28 1 month ago
Matthew ce762add59 Update MpRes version to 1.0.3 1 month ago
Matthew 8e44768f7e 更新配置 1 month ago
Matthew fc7fc294eb Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 1 month ago
Matthew ee0a2b632e 增加权限 1 month ago
Matthew d94124aa3c 增加权限 1 month ago
Matthew 22b81f8c46 优化重启运维的实现 1 month ago
Matthew 2811c694b7 增加函数
获取进程id
1 month ago
Matthew 06f38f3ff0 优化杀进程的方式 1 month ago
liuguijing f8ccfbba76 增量更新功能优化,增加安装成功之后,删除老的apk包和增量更新包。只保留最新的安装包 1 month ago
liuguijing 96b07fa223 增量更新功能优化 1 month ago
liuguijing ae6d49ed99 增量更新功能优化 1 month ago
Matthew 5d57a099cd Update version to 1.3.155
Based Core Version to 1.4.83
1 month ago
Matthew c8f34e9319 触发心跳动作 1 month ago
Matthew e01b32e166 Update MpMaster version to 1.1.27 1 month ago
Matthew db2ff686c6 Update version to 1.3.154
Based Core Version to 1.4.83
1 month ago
Matthew e022748f71 实现一个闹钟覆盖心跳、拍照、采样 1 month ago
Matthew c6405cf287 增加常量定义 1 month ago
Matthew 38fe69d93b 增加对拍照闹钟的处理(其中包含心跳) 1 month ago
Matthew e75fe1648c 优化日志 1 month ago
Matthew ab438f68b8 如果getInt正常,则删除日志文件 1 month ago
Matthew ba37692f73 重启设备前刷新日志内容进flash 1 month ago
Matthew 97c8cc3038 如果http访问是超时错误,则减少重试次数
避免耗电太高
2 months ago
Matthew 5872857f8d Update MpRes version to 1.0.2 2 months ago
Matthew 9c7be4fe96 Update MpMaster version to 1.1.26 2 months ago
Matthew 4e5b1b7b2a Update version to 1.3.153
Based Core Version to 1.4.82
2 months ago
Matthew cbf60b12f6 减小package size 2 months ago
Matthew 9a88a2dcd2 优化package size 2 months ago
Matthew 00a8de5e54 优化package size 2 months ago
Matthew 1fcc231ac1 Update MpRes version to 1.0.1 2 months ago
Matthew 667ebb60c8 Update version to 1.3.152
Based Core Version to 1.4.82
2 months ago
Matthew dcf3dffe02 Update MpMaster version to 1.1.25 2 months ago
Matthew 20c5eebd20 Update version to 1.3.151
Based Core Version to 1.4.81
2 months ago
Matthew eeabd15b87 优化日志 2 months ago
Matthew d930f65393 优化 2 months ago
Matthew 3974564746 优化代码 2 months ago
Matthew 3c5f49a563 移除不必要的依赖,降低apk size 2 months ago
Matthew b1b70395c7 消除警告 2 months ago
Matthew 21aac05206 调整名字 2 months ago
Matthew e2c4e51550 启动时如果需要初始化mpapp配置,则从assets中拷贝到特定目录 2 months ago
Matthew 75a7c17d62 增加mpres相关的定义和函数 2 months ago
Matthew d9b75e2c2f 如果缺少配置文件,调用mpres app初始化 2 months ago
Matthew f90cbd0446 移除MpAPP的配置文件 2 months ago
Matthew a90617698b 移除MpApp的配置初始化 2 months ago
Matthew 738f4f230a 加回5V5的gpio值备用 2 months ago
Matthew 55bda9770e 配置文件转到新app中 2 months ago
liuguijing e580737761 运维新增 下载增量更新功能 2 months ago
Matthew c0e0b3874f Update version to 1.3.150
Based Core Version to 1.4.81
2 months ago
Matthew 31391c2bab Refactor 2 months ago
Matthew 025c9fb07f Update version to 1.3.149
Based Core Version to 1.4.80
2 months ago
Matthew 07f7744ad8 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew 58d8c614ab 优化网络访问代码 2 months ago
Matthew 82e8212027 移除绑定网络的代码
通过路由来控制
2 months ago
Matthew 32a1fbbeb1 网络会不定时变化,增加更新网络handle函数 2 months ago
liuguijing 2dd6cb8f31 运维新增增量更新 完善增量更新时 计算差分代码 2 months ago
liuguijing 0d8bb73f17 运维新增增量更新 调试可用 待完善 2 months ago
XI.CHEN 89b263e4de Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 2 months ago
Matthew 2d600c18e4 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
XI.CHEN 424bd6ee88 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 2 months ago
XI.CHEN 987d2e8053 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 2 months ago
Matthew 387673bf99 修复编译错误 2 months ago
liuguijing 8bb1c53bc2 Merge remote-tracking branch 'origin/main' 2 months ago
Matthew 7ae8505809 Update version to 1.3.148
Based Core Version to 1.4.80
2 months ago
Matthew d2881112f2 修复编译错误 2 months ago
liuguijing 40d36e1577 新增系统心跳调试的日志 2 months ago
Matthew 47ff714ae5 Update version to 1.3.147
Based Core Version to 1.4.80
2 months ago
Matthew f8784c5b26 Update version to 1.3.146
Based Core Version to 1.4.80
2 months ago
Matthew ee492d0e60 修复编译错误 2 months ago
Matthew 8fd275a6e7 增加日志 2 months ago
Matthew a9fd536a8a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew 142fca3dd0 实现海康接口 2 months ago
Matthew ed35d74c94 修复编译错误 2 months ago
liuguijing cd520ebefe 新增测试HeartBeat的广播 2 months ago
liuguijing 9ff79bbe1b 新增测试HeartBeat的广播 2 months ago
Matthew 6598b45d3e 修复编译错误 2 months ago
Matthew 62de685e4e Update version to 1.3.145
Based Core Version to 1.4.80
2 months ago
Matthew a0c4651e97 集成bspatch 2 months ago
Matthew 883e9f94e4 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew 44a5a32741 Update version to 1.3.144
Based Core Version to 1.4.79
2 months ago
jxjajs 31e33b065b 生成准确读取云台位置指令使用独立函数实现 2 months ago
Matthew 5a8be5883b 调整gpio监控 2 months ago
Matthew b734a9cc2a 优化文件名 2 months ago
Matthew be7b992bdd Update version to 1.3.143
Based Core Version to 1.4.78
2 months ago
Matthew 2b06803252 重启两个api都调用作双重保护 2 months ago
Matthew 396d20ea3f 移除HDRPlus相关的代码 2 months ago
Matthew fde6514d16 Update version to 1.3.142
Based Core Version to 1.4.77
2 months ago
Matthew f6d3ccbfa1 移除日志 2 months ago
Matthew 754d3bebb7 移除解决粉色的临时补丁 2 months ago
Matthew a04db636c6 Update version to 1.3.141
Based Core Version to 1.4.76
2 months ago
Matthew 6e379548e6 优化航煜拍照实现
如果照片太大出错,则降低图像质量后重试
2 months ago
Matthew 38a8498dbc 优化网络打开时间 2 months ago
Matthew 5dae67b03b 网络延迟打开 2 months ago
Matthew b821156ca1 Update MpMaster version to 1.1.24 2 months ago
Matthew 870cffab5c Update version to 1.3.140
Based Core Version to 1.4.76
2 months ago
Matthew 55c3776ac8 通过附件编译时间来选择不同的判断运维程序是否运行的方法 2 months ago
Matthew 126c1f5e1b 通过附件编译时间来选择不同的判断程序是否运行的方法 2 months ago
liuguijing 28be0c4c80 Update MpMaster version to 1.1.23 2 months ago
liuguijing 8c3103eef6 运维的MCU重启命令修改 2 months ago
liuguijing e59f6fbbea 运维修改重启方式 2 months ago
Matthew b216ad7546 Update version to 1.3.139
Based Core Version to 1.4.76
2 months ago
Matthew c3e4ef0847 微拍暂时不重置电源 2 months ago
Matthew 101d2b945a 微拍移除重置电源的代码 2 months ago
Matthew 7ea3b47abb Update version to 1.3.138
Based Core Version to 1.4.76
2 months ago
Matthew cf6c5c8158 网络设备的osd也临时关掉 2 months ago
Matthew b9fe6ce048 优化网络摄像头供应商的实现
移除航煜对时的实现
2 months ago
Matthew 138040baa8 增加算法的实现 2 months ago
Matthew e21e409712 实现3DNR 2 months ago
Matthew b3f3703c74 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew f445f5f6c8 Update version to 1.3.137
Based Core Version to 1.4.74
2 months ago
XI.CHEN cafa30c728 暂时去除航煜视频除时间外水印 2 months ago
XI.CHEN 167878de1a 暂时去除航煜视频除时间外水印 2 months ago
XI.CHEN c51fb6924b Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 2 months ago
XI.CHEN ec6a27df28 航煜OSD和分辨率设置 2 months ago
Matthew 11e5b98a90 充电电压如果小于3V,就直接设置为0 2 months ago
Matthew d4c5986943 Update version to 1.3.136
Based Core Version to 1.4.74
2 months ago
Matthew 5a91bd8dcb 移除调试的功能 2 months ago
Matthew 4c42820cea 移除调试的功能 2 months ago
Matthew db78ce7728 优化http请求错误的处理 2 months ago
Matthew b5a188a5b4 Update version to 1.3.135
Based Core Version to 1.4.74
2 months ago
Matthew 90465c4ac1 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew 7ef6086f50 优化前台服务实现 2 months ago
Matthew 5151f9291a 优化前台服务实现 2 months ago
Matthew 7037eab930 调整id防止冲突 2 months ago
XI.CHEN 2d67c94bc9 航煜视频水印根据时间是否设置改变 2 months ago
Matthew 39b94cee90 Update version to 1.3.134
Based Core Version to 1.4.72
2 months ago
Matthew 801a9e98ba 静态抓拍强制改为预览的范围从150开始 2 months ago
Matthew 868fbebb6b Update version to 1.3.133
Based Core Version to 1.4.72
2 months ago
Matthew 1806c36148 增加更多拍照日志 2 months ago
Matthew f2f29482a0 输出照片日志信息 2 months ago
Matthew a52255e9d9 增加日志 2 months ago
Matthew 2cc92025fc Update MpMaster version to 1.1.22 2 months ago
Matthew 744057c407 Update version to 1.3.132
Based Core Version to 1.4.72
2 months ago
Matthew d23116aa57 增加长时间无心跳重启app的机制,并优化运维日志 2 months ago
Matthew 3fab6d4542 保活时判断service是否存在 2 months ago
Matthew 21c789155c 优化日志 2 months ago
Matthew 11dbea7170 Update MpMaster version to 1.1.21 2 months ago
Matthew 17ae352c31 更新默认配置 2 months ago
liuguijing 31c0d81e13 Update version to 1.3.131 2 months ago
liuguijing 18ecc420ed mpapp:修复mpapp摄像头拍视频时视角变小的bug 2 months ago
liuguijing b58969cc5e Update version to 1.3.130 2 months ago
liuguijing 9bb9b6848c 修改短视频预览摄像头不正的bug 2 months ago
liuguijing 7a557ac8fd 修改短视频预览摄像头不正的bug 2 months ago
Matthew e0a23a6c3b Update version to 1.3.129
Based Core Version to 1.4.72
2 months ago
liuguijing 2d0fe6609b 为修复宁夏短视频拍照翻转的bug 临时修改方法 2 months ago
Matthew 7e57c3cc08 Update version to 1.3.128
Based Core Version to 1.4.71
2 months ago
Matthew 0fc7ff436e 统一GPIO
N938:
#define CMD_SET_3V3_PWR_EN                      360  // 改为132

云台:
#define CMD_SET_485_ENABLE                      512 // 改成131
#define CMD_SET_3V3_PWR_EN                      516 // 改成 132

固件从20250419的版本开始
2 months ago
Matthew 2009c6d472 调整hdr的代码 2 months ago
Matthew 24333d1882 优化逻辑 2 months ago
Matthew 04abdbeb61 Update version to 1.3.127
Based Core Version to 1.4.71
2 months ago
Matthew 4106ce8cb3 优化拍照时间的注册处理,避免始时钟丢失校时成功之后的错误 2 months ago
Matthew 7ad52b042c 增加HDR的支持 2 months ago
Matthew 6925da78b1 Update version to 1.3.126
Based Core Version to 1.4.71
2 months ago
Matthew 9f00a81b8e Update MpMaster version to 1.1.20 2 months ago
Matthew 1c8372d5a2 优化调试信息的实现 2 months ago
Matthew 1782269938 Update version to 1.3.125
Based Core Version to 1.4.71
2 months ago
Matthew 8398ae8246 增加时间发生变化后的更新处理 2 months ago
Matthew 49aff958d0 移除无用代码 2 months ago
Matthew b6932b116e 移除文件锁的实现 2 months ago
Matthew 4976337878 利用共享uid的方式来判断mpapp是否正在运行
加入时间变化监控的一些定义
2 months ago
Matthew 897b53e44e 利用共享uid的方式来判断运维app是否正在运行
加入时间变化监控的一些定义
2 months ago
Matthew 621cf4f3ba Update version to 1.3.124
Based Core Version to 1.4.70
2 months ago
Matthew 476ebbd5e0 强制走预览模式的范围改成200-400 2 months ago
Matthew c54cecacf0 设置共享uid 2 months ago
Matthew 9fedc2532c Update MpMaster version to 1.1.19 2 months ago
Matthew 8e9597eaf4 Update version to 1.3.123
Based Core Version to 1.4.70
2 months ago
Matthew b94039cbd6 设置共享uid 2 months ago
Matthew 6d2f4c7535 设置共享uid 2 months ago
Matthew 252e2575f5 调整回预览+静态抓拍模式
针对iso为200-300之间的粉色问题,做了补丁,强制走预览模式,临时绕过这个问题
2 months ago
Matthew 6587298604 Update version to 1.3.122
Based Core Version to 1.4.70
2 months ago
Matthew eb96c9c6c7 实现预览到静态抓拍的主动切换 2 months ago
Matthew d1d34ebcfc Update version to 1.3.121
Based Core Version to 1.4.70
2 months ago
Matthew 3a0a8b71a0 重启设备前记录日志 2 months ago
Matthew 030ca9c7d7 修复拍照设置的bug 2 months ago
Matthew a9535f2df7 增加对AIS的支持 2 months ago
Matthew 1ba1b9d56a Update version to 1.3.120
Based Core Version to 1.4.70
2 months ago
Matthew 7a51b96100 调整拍照的实现,改成一个request实现测光和拍照 2 months ago
Matthew 8a7d571e0e Update version to 1.3.119
Based Core Version to 1.4.70
2 months ago
Matthew 2336758523 Update version to 1.3.118
Based Core Version to 1.4.69
2 months ago
Matthew 95213a4ecd 网络摄像头实现自检等待 2 months ago
Matthew 8f49d82dec 优化日志 2 months ago
Matthew 0170e21b1d 优化网络重试次数和日志 2 months ago
Matthew 94ca4f77a4 Update version to 1.3.117
Based Core Version to 1.4.69
2 months ago
jxjajs 2af459d57a 解决查询云台位置命令不下发BUg 2 months ago
jxjajs 1f3943b34b 增加log,调试 2 months ago
Matthew ec5799f167 Update version to 1.3.116
Based Core Version to 1.4.69
2 months ago
Matthew 9f23994521 预览和拍照的模板改成同一个 2 months ago
Matthew e3aa7d04eb 移除ISP的设置
参考系统相机
2 months ago
Matthew 5049677133 Update version to 1.3.115
Based Core Version to 1.4.68
2 months ago
Matthew eb5aa8396a 移除全局变量的设置 2 months ago
Matthew d35bf3d71c 优化代码 2 months ago
Matthew 17e2ae7fd9 使用mtk内置扩展MFNR算法 2 months ago
Matthew 8108bf4c7c 修复系统相机bug 2 months ago
Matthew 996cb9109f Update version to 1.3.114
Based Core Version to 1.4.68
2 months ago
Matthew 164b14697c 优化返回值 2 months ago
XI.CHEN 74f42bcfd3 增加网络拍照失败时的gpio日志信息 2 months ago
jxjajs 3ea1fbde25 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 2c53f2fc0a 增加云台200号预置点临时一次性自检处理
1、单独调用,直接置云台为自检状态;
2、拍照带200号预置点,等待调预置点时间使用设置的自检时间。
2 months ago
Matthew a74db09f67 Update version to 1.3.113
Based Core Version to 1.4.67
2 months ago
Matthew ae213c7a9b 增加权限 2 months ago
Matthew 13cb6722f3 使用mtk扩展的多帧降噪 2 months ago
Matthew 820158e650 breakpad的集成准备 2 months ago
Matthew 78cacaeba1 增加网络协议的处理 2 months ago
Matthew 40e9533d31 Update version to 1.3.112
Based Core Version to 1.4.66
2 months ago
jxjajs 357c58112f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 4afdbdae62 修改Bug,手动拍照过程中,收到关机指令,拍完照不关机 2 months ago
Matthew 79dc4e8ec7 Update version to 1.3.111
Based Core Version to 1.4.65
2 months ago
Matthew 6388002df2 优化网络拍照逻辑 2 months ago
Matthew ebe52ca252 Update version to 1.3.110
Based Core Version to 1.4.65
2 months ago
Matthew ce81c8dd4f 禁用HDR模式 2 months ago
jxjajs 7033ad7e0b Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
jxjajs 9397d53107 增加自动拍照等待时间,防止同一时间ptz拍多张图片时,中间会关电 2 months ago
Matthew 48856f0c0b 空指针保护 2 months ago
Matthew 2d5cc27c0e Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 2 months ago
Matthew e3c74db577 优化返回值 2 months ago
jxjajs dada0e876f 修改合并产生错误 2 months ago
XI.CHEN 9170d2bec0 增加照片长度有误时的日志 2 months ago
Matthew 06842bca13 Update version to 1.3.109
Based Core Version to 1.4.64
2 months ago
Matthew 410ded43f1 自定义HDR实现改为手动长曝光增亮 2 months ago
Matthew 1d92d624f8 优化代码 2 months ago
Matthew 5a26bd6353 Update version to 1.3.108
Based Core Version to 1.4.63

支持通过光敏自动切换日夜镜头
2 months ago
Matthew f247a6f4e0 实现获取光敏值的接口 2 months ago
Matthew 991fc0a449 Update version to 1.3.107
Based Core Version to 1.4.62
3 months ago
Matthew ac357883ac Merge branch 'PtzNew' 3 months ago
Matthew 604819a8a1 调整timer注册的默认值和内部判断逻辑 3 months ago
Matthew 95c0fb4415 移除不合理代码 3 months ago
Matthew 4e10f77ce3 Update version to 1.3.106
Based Core Version to 1.4.61
3 months ago
Matthew 3575377767 Update version to 1.3.105
Based Core Version to 1.4.60
3 months ago
Matthew f577a1be3d HTTP访问出错也计入网络出错
超过3次重启设备
3 months ago
Matthew 0b8c29eb91 直接注释代码 3 months ago
Matthew 4b09ea6428 Update version to 1.3.104
Based Core Version to 1.4.59
3 months ago
jxjajs 2b5916c9ce 云台控制逻辑优化 3 months ago
Matthew 0b5e19541e Update version to 1.3.103
Based Core Version to 1.4.58
3 months ago
Matthew bae16b9427 修复编译错误 3 months ago
Matthew 22bc6af87c Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 8951b8cdaf 每次心跳增加光敏值的采集,供后面规则设置 3 months ago
liuguijing ae9ea20948 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 963ac6bdaf Update MpMaster version to 1.1.18 3 months ago
Matthew a2aef51df6 减少getInt的调用 3 months ago
Matthew 182c592f98 清理注释的代码 3 months ago
liuguijing c09ed76819 对电池电压新增单线程执行,优化修该,节省线程开销 3 months ago
liuguijing 3b492e7ea3 对电池电压新增单线程执行,优化修改 3 months ago
liuguijing bd7d4132e2 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 9c2346befd 对电池电压新增单线程执行 3 months ago
Matthew 385c456401 MPAPP对运维保活 3 months ago
Matthew c5d9e19aff Update version to 1.3.102
Based Core Version to 1.4.57
3 months ago
Matthew 9a227b149e 移动预置位等待15秒 3 months ago
liuguijing 49b614b7b9 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 4033f978a5 Update MpMaster version to 1.1.17 3 months ago
liuguijing 3c7e35b5ee 修复938下无法执行shell命令的bug 3 months ago
jxjajs e6228f7dfa 修改电源控制 3 months ago
jxjajs 8381d6a0b9 增加云台控制时间精准控制
增加云台控制时间精准控制
3 months ago
Matthew a42bf5390c 修复编译错误 3 months ago
Matthew 44aeadbe2d 云台单线程实现 3 months ago
Matthew d7a9212d90 Update version to 1.3.101
Based Core Version to 1.4.57
3 months ago
Matthew c106ae42fd 用更安全的方式访问jstring 3 months ago
Matthew 5f4af242be Update version to 1.3.100
Based Core Version to 1.4.57
3 months ago
Matthew 7212994a5f 修复编译错误和警告 3 months ago
Matthew 09dae14725 修复编译错误或者报警 3 months ago
Matthew 7b0c32e7b9 Update version to 1.3.99
Based Core Version to 1.4.56
3 months ago
Matthew b0c9e5f412 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 180b2efe0b 938禁用AI识别
移除部分日志
3 months ago
XI.CHEN bd81fd52d0 Update version to 1.3.98
Based Core Version to 1.4.55
3 months ago
XI.CHEN eaf7bfb875 关电时开电时间清零 3 months ago
liuguijing 82ebd92ad2 Update MpMaster version to 1.1.16 3 months ago
liuguijing ae3f25b14a Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 9017c2bd7d 运维新增支持adb shell命令
修复sim卡2 在连接不上运维主站时  无法切换到sim卡1的情况
3 months ago
Matthew b1071b52c5 Update version to 1.3.97
Based Core Version to 1.4.54
3 months ago
Matthew 89443efa26 优化日志 3 months ago
Matthew d8defe3b63 移除5V的控制(固件层自动控制) 3 months ago
Matthew 496a6fbdce APP启动时重置所有电源 3 months ago
Matthew 3a9b85c868 增加马达相关的控制 3 months ago
Matthew e280e76015 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 41208a587c 增加马达相关的控制 3 months ago
Matthew b381fa562f 增加马达相关的控制定义 3 months ago
XI.CHEN 0375b13c67 电源关闭不对称 3 months ago
XI.CHEN 864a8dc0dd 增加关电时相机状态变更 3 months ago
Matthew a506598b42 Update version to 1.3.96
Based Core Version to 1.4.54
3 months ago
Matthew 441cdc40b1 以太网三次查询不到则重启设备 3 months ago
Matthew ab91aa6cef Update version to 1.3.95
Based Core Version to 1.4.54
3 months ago
Matthew b40f77076d 修复误删代码 3 months ago
Matthew 3fdf189af5 Update version to 1.3.94
Based Core Version to 1.4.54
3 months ago
Matthew 447f9999eb 修复误删代码 3 months ago
Matthew 0c33cc68c4 Update version to 1.3.93
Based Core Version to 1.4.54
3 months ago
Matthew e999149187 移除可能会导致粉色的测光操作 3 months ago
Matthew 0aabc2af52 Update version to 1.3.92
Based Core Version to 1.4.54
3 months ago
Matthew c17dc6a83e Update version to 1.3.91
Based Core Version to 1.4.53
3 months ago
Matthew 026508615d 删除无用代码 3 months ago
Matthew deaf5ec7e1 MIPI延迟关电 3 months ago
Matthew c8610406ef 重新实现关电控制
现在通过线程的方式来实现延迟关电,性能不是很好
3 months ago
Matthew 3902d69997 调整实现 3 months ago
Matthew 22e81844ac 修改云台宏 3 months ago
Matthew 4c426cf5ff 增加摄像头控制命令 3 months ago
Matthew 8f9fa84028 修复编译错误 3 months ago
Matthew 1925e923e2 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 9aa25b6d66 规约相关的源文件移到Core/Client目录 3 months ago
XI.CHEN 0cb2927b13 航煜、宇视OSD开关和设置,航煜分辨率设置 3 months ago
Matthew 5578b2e40f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew f0c6738887 实现云台视频流 3 months ago
jxjajs 9f8e92030a Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs f5c38b5127 提交南网mqtt(s938)代码 3 months ago
Matthew b18b9f54e4 修复误改的值 3 months ago
Matthew 808271c7f1 优化日志 3 months ago
Matthew 21fd57061c Update version to 1.3.90
Based Core Version to 1.4.51
3 months ago
Matthew 32698886d0 仍然绑定网络,确保当前不同版本的固件没有问题 3 months ago
Matthew 3dbb79e94c Update version to 1.3.89
Based Core Version to 1.4.51
3 months ago
Matthew ca7e8e5acf 修复编译错误 3 months ago
Matthew c8966009b8 实现视频流 3 months ago
Matthew ccc0e0e334 参数名格式一致 3 months ago
Matthew 5d312ed1f0 实现视频流 3 months ago
Matthew 120d7fdde7 优化代码 3 months ago
Matthew 238f0aeb4f 优化代码 3 months ago
Matthew 69a3997805 增加rtsp 认证的支持 3 months ago
Matthew ebcd0c4dca 扩展流媒体访问的接口 3 months ago
Matthew e74c0185a5 调整流转发的实现 3 months ago
Matthew b08adad0a4 Update version to 1.3.88
Based Core Version to 1.4.50
3 months ago
Matthew 955efa5389 RTSP录制视频 3 months ago
Matthew 2c0b32fe64 Update version to 1.3.87
Based Core Version to 1.4.50
3 months ago
Matthew 28315925ee 保存yuv原始数据 3 months ago
Matthew 1fd8c79f58 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew b4e7cf8fab 实现网络摄像机拍摄短视频 3 months ago
liuguijing 56d42d8774 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
XI.CHEN fe97b3c5bc Update version to 1.3.86
Based Core Version to 1.4.50
3 months ago
XI.CHEN 1583dc6a46 增加日志 3 months ago
XI.CHEN 44dc885717 增加工作状态报日志 3 months ago
Matthew fb42203056 Update version to 1.3.85
Based Core Version to 1.4.49
3 months ago
Matthew 5cf252b12f 改为单个请求连拍4帧 3 months ago
Matthew 6a80e97a43 增加不拍照的监控 3 months ago
Matthew 4d5020803c 增加MQTT选项,并优化UI逻辑 3 months ago
Matthew e05bcedb6e Update version to 1.3.84
Based Core Version to 1.4.49
3 months ago
Matthew 296858be26 优化日志 3 months ago
Matthew 34a1c4377b 以太网超过3次找不到,则重启设备(30分钟内不重复重启) 3 months ago
Matthew 620af9bb26 Update version to 1.3.82
Based Core Version to 1.4.49
3 months ago
Matthew 7624c2b249 常规拍照也曝光多张,挑最后一张上传 3 months ago
Matthew d939b8089e Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
XI.CHEN 99784847e3 Update version to 1.3.81
Based Core Version to 1.4.49
3 months ago
XI.CHEN eba500f734 Update version to 1.3.80
Based Core Version to 1.4.48
3 months ago
Matthew 454c5d6cc6 Update version to 1.3.80
Based Core Version to 1.4.47
3 months ago
Matthew c07508a711 修复bug 3 months ago
Matthew d51ff00473 修复bug 3 months ago
XI.CHEN b23224415e Update version to 1.3.79
Based Core Version to 1.4.47
3 months ago
XI.CHEN 4e80dced8b Update version to 1.3.78
Based Core Version to 1.4.46
3 months ago
Matthew b579a0062d Update version to 1.3.77
Based Core Version to 1.4.45
3 months ago
Matthew 2ae0368468 云台的5V和100M由固件控制 3 months ago
Matthew 9ad980f666 增加流量信息查询 3 months ago
Matthew 0cfd48ff92 电源打开和关闭成对 3 months ago
XI.CHEN 0957cc3a12 Update version to 1.3.76
Based Core Version to 1.4.43
3 months ago
liuguijing 6dee0b0ad4 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
XI.CHEN d37d4e0c13 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN c308feff90 Update version to 1.3.75
Based Core Version to 1.4.42
3 months ago
Matthew 0f50e62000 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 24321ae011 APP启动时间显示秒 3 months ago
XI.CHEN bdfe3e2bd7 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 485301e714 Update version to 1.3.74
Based Core Version to 1.4.41
3 months ago
liuguijing 64316cedf3 Update MpMaster version to 1.1.12 3 months ago
liuguijing b5eb21d063 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing feb4981377 Update MpMaster version to 1.1.11 3 months ago
liuguijing 4109741628 修改单卡模式下短信的bug 3 months ago
liuguijing fedae228b1 修改运维重启系统失败的bug 3 months ago
XI.CHEN 0d92c10c60 Update version to 1.3.73
Based Core Version to 1.4.40
3 months ago
Matthew 8b51cfdefb Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew a7d3266624 938使用gpio机制重启 3 months ago
jxjajs b8416b8e1b 添加严格区分温湿度和风速风向及多要素气象传感器 3 months ago
jxjajs 2e12a1ac84 Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs 3453e2d221 添加严格区分温湿度和风速风向及多要素气象传感器 3 months ago
liuguijing 12197fa28d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing a1601cd71c 修复配置重启不生效的bug,修改重启 3 months ago
XI.CHEN a14c76c4ed Update version to 1.3.72
Based Core Version to 1.4.39
3 months ago
Matthew 4cae89014d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 89fe772caa 注册下一个拍照时间以当前拍照时间为参考
避免系统提早触发闹钟
3 months ago
XI.CHEN 216a053086 Update version to 1.3.71
Based Core Version to 1.4.39
3 months ago
XI.CHEN 52608b8324 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 5734762c07 修改串口拍照指令宏定义 3 months ago
huangfeng 3a8ef64e2f Revert "perf: 调整registerHeartbeatTimer方法"
This reverts commit b82fe124d8.
3 months ago
Matthew 4ba4be427e 航煜网络相关调整 3 months ago
Matthew 5c7f6abb71 Update MpMaster version to 1.1.9 3 months ago
Matthew 02663dd08b 修复bug 3 months ago
Matthew fd84d84157 调整Toast位置 3 months ago
Matthew 70b795fe27 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew d206a59d9a 修复编译错误 3 months ago
陈曦 ee93791683 覆冰气象线程修改 3 months ago
陈曦 53578065f1 覆冰气象线程队列上传 3 months ago
Matthew 6f56bf0fe3 调整网络短视频实现 3 months ago
Matthew d1298663f3 调整网络短视频实现 3 months ago
huangfeng b82fe124d8 perf: 调整registerHeartbeatTimer方法 3 months ago
XI.CHEN 83d9e4e6c9 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 79e8a8ff71 增加信号日志 3 months ago
Matthew d9f6c6e8ac Update version to 1.3.70
Based Core Version to 1.4.38
3 months ago
Matthew c912c70572 调整APP标题 3 months ago
Matthew bbb78f44b9 调整APP标题 3 months ago
Matthew df1fc220d1 Revert "调整编译脚本"
This reverts commit 341045651c.
3 months ago
Matthew 4de7693aaa Revert "调整顺序"
This reverts commit d908a36d3b.
3 months ago
Matthew 79c828324d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew a34e66c7ff 优化实现,避免大文件崩溃 3 months ago
XI.CHEN f2a965caf0 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 3 months ago
XI.CHEN 1bdc190a1b 修正拍照指令 3 months ago
Matthew 127b06de77 调整APP标题 3 months ago
Matthew d908a36d3b 调整顺序 3 months ago
Matthew 9eafc3d2f3 如果线程已经执行,则跳过 3 months ago
Matthew 2167afa1d8 优化代码 3 months ago
Matthew 341045651c 调整编译脚本 3 months ago
Matthew b6e58239d3 Update version to 1.3.66
Based Core Version to 1.4.37
3 months ago
Matthew b996c663a9 Update version to 1.3.65
Based Core Version to 1.4.36
3 months ago
Matthew 55a01c47b6 修改命令值 3 months ago
Matthew 87f9559cfd 调整接口 3 months ago
XI.CHEN cdd0fcc361 Update version to 1.3.64
Based Core Version to 1.4.35
3 months ago
jxjajs 6d84ed0ab7 Merge remote-tracking branch 'origin/main' 3 months ago
jxjajs ed08d8099c 控制下发云台命令次数 3 months ago
XI.CHEN 8ddc778cc4 修复格式错误 3 months ago
XI.CHEN 63339c199d 删除无用代码 3 months ago
jxjajs b15f12bf5f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing f08871da64 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
liuguijing 691acaf67e 修复获取短信获取sim卡信息时,热点开启的情况下,ip返回热点的bug 3 months ago
Matthew 964fa2a91b Update version to 1.3.63
Based Core Version to 1.4.34
3 months ago
XI.CHEN aa434414ed 删除读取电压的条件编译 3 months ago
jxjajs e1721d52d7 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
jxjajs 7376d4cb0f 优化控制云台反a应速度,添加精准云台位置控制
优化控制云台反a应速度,添加精准云台位置控制
3 months ago
XI.CHEN 614b0d4500 底层修正云台电压的两个GPIO 3 months ago
Matthew ba223f90bd 增加MQTT相关的类和实现 3 months ago
Matthew 0d7d3a69b6 Update version to 1.3.62
Based Core Version to 1.4.34
3 months ago
Matthew 4c03d73752 Update MpMaster version to 1.1.7 3 months ago
Matthew e88c2ddfcf 通过线程执行,避免ANR 3 months ago
Matthew a6bf1e117c 新增控制口 3 months ago
Matthew 1f6276860e Update version to 1.3.61
Based Core Version to 1.4.34
3 months ago
Matthew 15fd93a73a 停止拍照后等待一段时间,确保session停止 3 months ago
Matthew ce96fcb46c 检查是否支持RAW 3 months ago
Matthew 995d9cc127 空指针保护 3 months ago
Matthew 6d1f0832c6 增加日志 3 months ago
Matthew 3033c8a68d 修复bug 3 months ago
Matthew cd0a6befd6 优化代码 3 months ago
Matthew d9c1cbac2f 优化名字 3 months ago
Matthew f8bbdc58cf Update version to 1.3.60
Based Core Version to 1.4.34
3 months ago
Matthew 05048bbf53 修复错误 3 months ago
Matthew a17f6a4278 Update version to 1.3.59
Based Core Version to 1.4.34
3 months ago
Matthew a9145e8871 优化日志 3 months ago
Matthew 295aadfc16 Update version to 1.3.58
Based Core Version to 1.4.33
3 months ago
Matthew 9a89445183 关闭sql日志 3 months ago
Matthew 8f595e415e Update MpMaster version to 1.1.7 3 months ago
Matthew 22741fe3e2 修复错误 3 months ago
Matthew 567a4b81fd Update MpMaster version to 1.1.6 3 months ago
Matthew c97342abc7 简化实现 3 months ago
Matthew 6db86856e7 Update version to 1.3.57
Based Core Version to 1.4.32
3 months ago
Matthew d841200500 优化日志信息 3 months ago
Matthew fd88feeacd 不设置静态IP 3 months ago
Matthew d0288551fc 移除无用的代码 3 months ago
Matthew b1d1e3f65c 运维展示优化
cmdid未设置时,显示序列号
3 months ago
Matthew f3bd23680d Update version to 1.3.56
Based Core Version to 1.4.32
3 months ago
Matthew 2b818f920c 打开网络摄像头也同时打开网络 3 months ago
Matthew 3d6a3b6559 Update version to 1.3.55
Based Core Version to 1.4.32
3 months ago
Matthew 878bae9961 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew a6e928c2d2 修复编译错误 3 months ago
Matthew 03a2888369 Update version to 1.3.54
Based Core Version to 1.4.32
3 months ago
Matthew fc39cd0eb1 云台打开时把交换机也打开 3 months ago
Matthew fa6d7929ff Update version to 1.3.53
Based Core Version to 1.4.32
3 months ago
Matthew 9e76c216f7 打开云台时同时打开网络 3 months ago
Matthew b8dad4ed13 Update version to 1.3.52
Based Core Version to 1.4.32
3 months ago
Matthew 06843dff13 Update version to 1.3.51
Based Core Version to 1.4.31
3 months ago
Matthew 9b0f50c8b3 修正电控 3 months ago
Matthew 3ec9d6e711 Update version to 1.3.50
Based Core Version to 1.4.31
3 months ago
Matthew 2baecd5289 Update version to 1.3.49
Based Core Version to 1.4.30
3 months ago
Matthew 05d265d559 Update version to 1.3.48
Based Core Version to 1.4.29
3 months ago
Matthew 369f4d7c87 云台网络的调整 3 months ago
Matthew f2023d130d Update version to 1.3.47
Based Core Version to 1.4.29
3 months ago
Matthew 293431c608 对于非3V3的电控,每次打开都实际执行打开动作 3 months ago
Matthew 65e56000cb Update version to 1.3.46
Based Core Version to 1.4.29
3 months ago
Matthew 5001581438 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 0f2b29a61e 修复编译错误 3 months ago
Matthew f9ca260bcc 增加日志 3 months ago
XI.CHEN 3633fda081 增加拍照日志 3 months ago
Matthew 4de735fb19 增加照片对象的有效性判断 3 months ago
Matthew e5c25f084e Update version to 1.3.45
Based Core Version to 1.4.29
3 months ago
Matthew 8fc0354f0c 增加日志 3 months ago
Matthew 20aaed0bb2 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 3 months ago
Matthew 12035d2990 供应商接口封装 3 months ago
Matthew ee68539dde 流媒体实现 3 months ago
Hydromel 8d31b18917 Update MpMaster version to 1.1.5 4 months ago
Hydromel 92e5dabee8 短信:修复短信丢失的bug,修复重启mpapp崩溃的bug 4 months ago
Matthew a38f473ce8 Update version to 1.3.44
Based Core Version to 1.4.29
4 months ago
Matthew 1b6c7ef372 Update MpMaster version to 1.1.4 4 months ago
Matthew 04b8ce7796 减小系统重启后第一次启动的延迟,避免运维重启mpapp 4 months ago
Matthew 8a14578952 系统刚启动时,加大检查文件锁次数,确保mpapp已经启动
设备重启时,mpapp可能延迟启动
4 months ago
Matthew e01c19e9f8 Update MpMaster version to 1.1.3 4 months ago
Hydromel ace0d5babb Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Hydromel 003193d95a 短信:短信接收拍照时间表功能修改,短信控制拍照修改 4 months ago
Matthew 853e556d8a Update version to 1.3.43
Based Core Version to 1.4.29
4 months ago
Matthew 2c46504b36 切回卡1时,主动发起一次心跳 4 months ago
Matthew 515864c93d 心跳广播处理 4 months ago
Matthew 148ce5cb57 统一使用总线电压 4 months ago
Matthew e66667eb11 Update version to 1.3.42
Based Core Version to 1.4.29
4 months ago
Matthew 3db0d0387b Update version to 1.3.41
Based Core Version to 1.4.28
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 226932ae02 Update version to 1.3.40
Based Core Version to 1.4.28
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 2d6db87e11 Update version to 1.3.39
Based Core Version to 1.4.27
4 months ago
Matthew 54e35bce2c 优化网络摄像头电源控制 4 months ago
Matthew 2898295236 Update version to 1.3.38
Based Core Version to 1.4.27
4 months ago
Matthew 8a3da517b4 Update version to 1.3.37
Based Core Version to 1.4.26
4 months ago
Matthew bba91ff3a6 显示app启动时间 4 months ago
Matthew 1801ceb965 Update version to 1.3.36
Based Core Version to 1.4.25
4 months ago
Matthew 4371f39872 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew a8c945be2b 文件写完后立即要求系统刷新缓存 4 months ago
XI.CHEN 4d39dda520 Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp 4 months ago
XI.CHEN d69c7d257a Update version to 1.3.35
Based Core Version to 1.4.24
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 3d4aa720d9 设备重启后的启动,延迟进行 4 months ago
Matthew 238d572f1e Update MpMaster version to 1.1.1 4 months ago
Matthew 80e8c5e7c7 临时移除重启MpApp 4 months ago
Matthew 63259f11c8 主分支运维APP版本升级为 1.1.0 4 months ago
Matthew 6fdfe988a7 Update version to 1.3.34
Based Core Version to 1.4.23
4 months ago
Matthew 97eb35e169 移除重复的锁 4 months ago
Matthew cff24f65ae Update version to 1.3.33
Based Core Version to 1.4.23
4 months ago
Matthew 856c1a8b10 打开电源的操作也仅在没有电源时执行 4 months ago
Matthew a98dc5126c 临时移除自动重启设备 4 months ago
Matthew 5a4840dcbf 增加日志 4 months ago
Matthew 3234185c8b Update version to 1.3.32
Based Core Version to 1.4.22
4 months ago
Matthew 486805b469 加大重启的延迟时间 4 months ago
Matthew 70ff5e7ea2 增加错误处理 4 months ago
Matthew e0d1cbb60a Update version to 1.3.31
Based Core Version to 1.4.22
4 months ago
Matthew a205ee22f9 优化照片写入文件的实现,增加日志 4 months ago
Matthew c64cc8ef44 Update version to 1.3.30
Based Core Version to 1.4.21
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 dabff33bbc Update version to 1.3.29
Based Core Version to 1.4.20
4 months ago
Matthew fa3bb289bf 启动时不判断服务是否运行 4 months ago
Matthew cae5b6996b 优化自启动 4 months ago
Matthew e39f42c28a Update version to 1.3.28
Based Core Version to 1.4.20
4 months ago
Matthew 6129d10749 空指针保护 4 months ago
Matthew 2be8a53a67 优化代码 4 months ago
Matthew 76e63a8808 Update version to 1.3.27
Based Core Version to 1.4.20
4 months ago
Matthew c186ab9098 优化重启的机制 4 months ago
Matthew ac43db4e4a 网络摄像机拍照的拍照时间不人为调整 4 months ago
Matthew 600c46f024 优化日志控制方式 4 months ago
Matthew 46bc13a608 绑定网络暂时去除 4 months ago
Matthew b91432cc4d Update version to 1.3.26
Based Core Version to 1.4.20
4 months ago
Matthew e27cd3e5fe 优化代码 4 months ago
Matthew d6dc5729fe 优化照片保存处理 4 months ago
Matthew 2d90f18220 增加Flags Mask 4 months ago
Matthew 5a74b57eb1 调整云台的电源控制 4 months ago
XI.CHEN cb36acfbd6 Update version to 1.3.25
Based Core Version to 1.4.18
4 months ago
XI.CHEN dc448adc34 增加日志和销毁mImageReader前释放资源 4 months ago
Matthew 79aa0134a5 Update version to 1.3.24
Based Core Version to 1.4.17
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 4686003763 Update version to 1.3.23
Based Core Version to 1.4.17
4 months ago
Matthew a81dfe5bcf Update version to 1.3.22
Based Core Version to 1.4.16
4 months ago
Matthew 50ee50f3d9 优化代码 4 months ago
Matthew e20f442512 增加日志 4 months ago
Matthew 1e71375144 Update version to 1.3.21
Based Core Version to 1.4.15
4 months ago
XI.CHEN e1c99fa228 Update version to 1.3.20
Based Core Version to 1.4.14
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 2fe94152e5 Update version to 1.3.19
Based Core Version to 1.4.14
4 months ago
Matthew 46b1c48c5c 处理以太网变化标记 4 months ago
Matthew 28d58199bf 增加日志 4 months ago
Matthew 09cd545777 Update version to 1.3.18
Based Core Version to 1.4.13
4 months ago
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 727e397efe Update MpMaster version to 1.0.96 4 months ago
Matthew 9fa531b98d Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 3c3cb9b130 增加网络信息的设置
重启MPApp使用临时方案,通过MpMaster来完成,解决自身不能重启的问题
4 months ago
Matthew bcda473b40 调整重启MpAPP的菜单 4 months ago
liuguijing 011bd762ab Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
liuguijing fe174f800d 短信通用版本修改中:新增就版本短信支持 4 months ago
Matthew 101c8f41a4 修改通知栏图标 4 months ago
Matthew 49cdb9d3ab 修改通知栏图标 4 months ago
Matthew 53df77733d DNS 设置为 0.0.0.0 4 months ago
Matthew 3d3a02158e 优化函数名称 4 months ago
Matthew e0ed5615c3 优化变量名字 4 months ago
Matthew 85a3d99f21 Update MpMaster version to 1.0.95 4 months ago
Matthew 018ccea1f8 修正目录 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
liuguijing 2ba7429b56 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
liuguijing ae75a59f51 短信通用版本修改中:清除第二次短信进来时,上一次发送的短信内容
增加jsonarray类型的判断
4 months ago
liuguijing de466ba891 短信通用版本修改中:修改配置文件参数设置数组时全是字符串类型的bug,修复发送短信空指针的bug 4 months ago
liuguijing 874f7db0cd 短信通用版本修改中:修改文件路径存储错误的bug 4 months ago
liuguijing 30e4562f1d 短信通用版本修改中:新增文件替换,文件获取,文件参数修改 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
liuguijing becda30777 短信通用版本修改中:对于文件路径的判断和文件绝对路径判断的修改 4 months ago
liuguijing 6915001d02 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
liuguijing c680c83015 短信通用版本修改 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
liuguijing c91c97e5d0 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
liuguijing 30360e9a05 短信修改成通用版本,新增具体参数修改 4 months ago
liuguijing 511852597c 短信修改成通用版本 4 months ago
Matthew 2b0f921157 Update version to 1.3.6
Based Core Version to 1.4.3
4 months ago
liuguijing 650765e87d 短信
运维时间表不返回修复
设置CMD_ID不应答修复
设置主站IP端口返回的网络方式和加密方式不一致修复
水印查询和修改修复
设置心跳及连接协议修复
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 a8c97d93e2 Update MpMaster version to 1.0.94 4 months ago
Matthew b5684256fe 运维如果没有获取到cmdid,则使用SN 4 months ago
Matthew e762e2b53c Update MpMaster version to 1.0.93 4 months ago
Matthew a716856a4f 优化日志压缩和上传 4 months ago
Matthew 0bfbe32077 Update MpMaster version to 1.0.92 4 months ago
Matthew 72c936c3dd 增加日志文件过滤的后缀名 4 months ago
Matthew 278703deed Update MpMaster version to 1.0.91 5 months ago
Matthew eba83ab37d 修正判断时间 5 months ago