Commit Graph

1536 Commits (2d600c18e4af03e645e2396726542868a11dca73)

Author SHA1 Message Date
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 b4e7cf8fab 实现网络摄像机拍摄短视频 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 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
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 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
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 485301e714 Update version to 1.3.74
Based Core Version to 1.4.41
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
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 5734762c07 修改串口拍照指令宏定义 3 months ago
Matthew 4ba4be427e 航煜网络相关调整 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
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
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
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 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 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 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 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
4 months ago
Matthew 293431c608 对于非3V3的电控,每次打开都实际执行打开动作 4 months ago
Matthew 65e56000cb Update version to 1.3.46
Based Core Version to 1.4.29
4 months ago
Matthew 5001581438 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 4 months ago
Matthew 0f2b29a61e 修复编译错误 4 months ago
Matthew f9ca260bcc 增加日志 4 months ago
XI.CHEN 3633fda081 增加拍照日志 4 months ago
Matthew 4de735fb19 增加照片对象的有效性判断 4 months ago
Matthew e5c25f084e Update version to 1.3.45
Based Core Version to 1.4.29
4 months ago
Matthew 8fc0354f0c 增加日志 4 months ago
Matthew 12035d2990 供应商接口封装 4 months ago
Matthew ee68539dde 流媒体实现 4 months ago
Matthew a38f473ce8 Update version to 1.3.44
Based Core Version to 1.4.29
4 months ago
Matthew 04b8ce7796 减小系统重启后第一次启动的延迟,避免运维重启mpapp 4 months ago
Matthew 853e556d8a Update version to 1.3.43
Based Core Version to 1.4.29
4 months ago
Matthew 515864c93d 心跳广播处理 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 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 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 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