Commit Graph

914 Commits (76e6b91e7e74dfc1fe0a54e37944e6ec1ef66b6b)

Author SHA1 Message Date
Matthew 116af6163d 增加日志 9 months ago
Matthew 23c3a482ee 优化RAW格式拍照 9 months ago
Matthew b52b2985fe 优化实现 9 months ago
Matthew 54f89afc4f 实现RAW格式拍照 9 months ago
Matthew bba323a08a RAW格式拍照的相关实现 9 months ago
Matthew 4a154984f4 优化格式 9 months ago
Matthew eee22756a3 如果已经拍照成功,则不上报错误,避免引起冲突 9 months ago
Matthew c80c9e90f2 加注释 9 months ago
Matthew 65d7ec6ff7 优化实现 9 months ago
Matthew f8039312c5 对齐的心跳不传心跳周期 9 months ago
Matthew 9871b4d8fb 临时移除重拍机制 9 months ago
Matthew 5b9b14555a 优化重启相关的逻辑 9 months ago
Matthew a1c4739f6d 全部设置为重复拍摄 9 months ago
Matthew fd16115e3e 改为RTC时钟 9 months ago
Matthew dd56729179 优化系统相机拍照 9 months ago
Matthew 10b7be96b8 主分支版本号升级为1.1 9 months ago
Matthew 4491ddf5cb 调整自检项分隔符 9 months ago
Matthew d390986953 修复编译错误 9 months ago
Matthew 721ed1e0e5 系统相机拍照后不重启,而是通知app直接发送 9 months ago
陈曦 ccd5a6a04f 修复编译错误 9 months ago
陈曦 bb30deca26 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 9 months ago
陈曦 151e7b1ac1 Merge branch 'master' 9 months ago
Matthew 06b8be4d3d 更新虚函数定义 9 months ago
Matthew 1ac95cada3 优化电源控制 9 months ago
Matthew 1a0b940e65 增加日志 10 months ago
Matthew 6d8b8af5d4 优化电源管理 10 months ago
Matthew 5becb8b644 优化电源管理 10 months ago
Matthew 825cb2e909 修复导入密钥相关的bug 10 months ago
Matthew a5e1dcdfea 调整加密相关代码的编译控制 10 months ago
Matthew 44fb563207 增加南瑞加密的更细的编译控制 10 months ago
Matthew 4aecf3e868 打开南瑞加密开关 10 months ago
陈曦 9e4690e5f4 修改获取覆冰数据(通用) 10 months ago
Matthew eae96822a2 增加调试信息输出控制 10 months ago
Matthew 378d9442ac 修复错误 10 months ago
Matthew c23ef85594 增加拍照错误处理 10 months ago
Matthew 3749f594c3 Update version to 1.0.204
Based Core Version to 1.1.60
10 months ago
Matthew 7082e88e73 移除调试信息 10 months ago
Matthew a8cffb688b 增加直接输出JPEG照片的实现 10 months ago
Matthew da99ad2789 Refactor code 10 months ago
Matthew 5cdad4b719 调整依赖处理
后续需要优化
10 months ago
Matthew 56538fec1a 加入推流相关的依赖 10 months ago
Matthew 34c6f8c341 优化代码 10 months ago
Matthew ad97372615 优化代码 10 months ago
Matthew 59bd3144c8 优化代码 10 months ago
Matthew abecc6277a 优化代码 10 months ago
Matthew 92f61a3a4f 实现N938相关的传感器打开函数
需调整
10 months ago
Matthew 74358c21c1 通过ContentProvider实现查询和动作 10 months ago
Matthew 573de22bb1 优化代码 10 months ago
Matthew 1ea77eeb48 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 10 months ago
陈曦 e4ac2a2fc2 Update CMakeLists.txt 10 months ago
陈曦 24219a5704 增加传感器开关控制 10 months ago
matthew 096abdd2b6 更新 'app/src/main/cpp/SerialComm.h' 10 months ago
matthew dd3d5bc98d 更新 'app/src/main/cpp/SerialComm.cpp' 10 months ago
Matthew 7f643d9dc4 修改文件名格式 10 months ago
Matthew 6aebb7e2ec Update version to 1.0.203
Based Core Version to 1.1.59
10 months ago
Matthew 2d624e7c98 调整fps范围和显示关闭曝光锁定 10 months ago
Matthew 875b113ad3 Update version to 1.0.202
Based Core Version to 1.1.59
10 months ago
Matthew 67033034af 修正文件名替换错误 10 months ago
Matthew 6dfe2f519f Update version to 1.0.201
Based Core Version to 1.1.59
10 months ago
Matthew 81a413b025 上传废弃的照片(设置为不同的预置位) 10 months ago
Matthew 913e9db795 使用最优降噪算法和关闭闪光灯 10 months ago
Matthew f85ecfb813 增加N938 GPIO定义 10 months ago
Matthew 439f44b0b2 移除代码 10 months ago
Matthew 1ff6852364 Update version to 1.0.200 10 months ago
Matthew bf31bbd11e 通过配置文件控制是否执行和系统相机照片对比 10 months ago
Matthew 22ca063e00 调整N938相关代码 10 months ago
Matthew f28eeb3122 优化代码 10 months ago
Matthew 1dde17b714 删除临时文件 10 months ago
Matthew cd397ad379 默认关闭938相关的处理 10 months ago
Matthew 19e3bce861 Update version to 1.0.199
Based Core Version to 1.1.57
10 months ago
Matthew 863f9e4018 调整过曝和过暗的阈值 10 months ago
Matthew b6b7f47acf 优化拍照参数 10 months ago
Matthew bc8b2a85f4 优化系统相机拍照 10 months ago
Matthew 0fe5fe5c23 Update version to 1.0.198
Based Core Version to 1.1.57
10 months ago
Matthew bcaa182136 优化系统相机拍照操作 10 months ago
Matthew 126949d49f 通过系统相机应用对通道1和2各拍一张照片 10 months ago
Matthew 4d028be985 Update version to 1.0.197
Based Core Version to 1.1.57

增加camera的控制,做拍照的对比
10 months ago
Matthew e48aedd172 增加系统camera的调用 10 months ago
Matthew c3bd8cae22 Update version to 1.0.196
Based Core Version to 1.1.57
11 months ago
Matthew f7391b53a8 移除无用代码 11 months ago
Matthew a6cdf2b4e1 Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 11 months ago
Matthew 38baaa0ce1 通过vpn连接加密主站后,移除client端的加密代码 11 months ago
Aries 8e32257ec9 增加解析证书宏 11 months ago
Matthew 2d493b0edc 优化背景宽度 11 months ago
Matthew 6f45c4e8be 调整背景宽度 11 months ago
Matthew 94387ff96e 增加对空格的处理 11 months ago
Matthew 1cec8c6ec8 优化代码 11 months ago
Matthew 0c1f8a9365 IDevice由调用方删除 11 months ago
Matthew 6192004738 移除拍摄过程中的测光动作 11 months ago
Matthew c24acb738c Update version to 1.0.194 11 months ago
Matthew 556bd8540b 配合pc工具的优化 11 months ago
Matthew c4dd885bc0 上报sim卡信息时增加ip信息 11 months ago
Matthew 9ac679dfcb Update version to 1.0.193
Based Core Version to 1.1.55
11 months ago
Matthew b9f1fb24be 实现加密芯片版本号获取 11 months ago
Matthew 0358b234cf 修改默认的密钥索引号为0 11 months ago
Matthew 7665f8a33d 增加导入私钥处理和导入公私钥后结果记录 11 months ago
Matthew e0a2672721 增加ABI的控制 11 months ago
Matthew f830ac4d30 调整背景色透明度 11 months ago
Matthew 9bccf3e8b3 Update version to 1.0.192
Based Core Version to 1.1.55
11 months ago
Matthew ff1584d4d3 尝试锁定对焦一次 11 months ago
Matthew 5f2df98de5 Update version to 1.0.191
Based Core Version to 1.1.55
11 months ago
Matthew 94f225f57b 更改名字 11 months ago
Matthew 97e44fa146 移除无用的boost设置 11 months ago
Matthew 7da86d04b8 调整方向 11 months ago
Matthew 8df849709e 修正文件名大小写 11 months ago
huyizhong a13230476f Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp 11 months ago
huyizhong 9f35df9106 把宏定义统一改成大写字母加前缀SER 11 months ago
Matthew 1cf6bdc947 修改Foreground channel id 11 months ago
huyizhong 3b500e9d93 删除老的weathercomm,不再使用 11 months ago
Matthew ba5e11687b Merge branch 'serial' 11 months ago
Matthew 2ee27a4a43 Update version to 1.0.190
Based Core Version to 1.1.54
11 months ago
Matthew 6b35df2358 异常保护 11 months ago
Matthew 8477b97b92 Update version to 1.0.189
Based Core Version to 1.1.54
11 months ago
Matthew 039d34c86e 背景调回白色 11 months ago
Matthew 1c5adf960f Update version to 1.0.188
Based Core Version to 1.1.54
11 months ago
Matthew 707de491bb 调整赋值位置,避免遗漏字段 11 months ago
Matthew c912bf123c 优化日志信息 11 months ago
Matthew 1b2444726f 更改背景色 11 months ago
Matthew 28946da440 调整透明度 11 months ago
Matthew 917978bce5 修改提示语 11 months ago
Matthew 56f5787f48 Update version to 1.0.187
Based Core Version to 1.1.54
11 months ago
Matthew cc4cc5cf9c 3A锁定根据控制来设置 11 months ago
Matthew 9fad6e1749 Update version to 1.0.186
Based Core Version to 1.1.53
11 months ago
huyizhong d8ffe21324 关闭测试938板子485控制电源的操作,修改串口调用的说明文档 11 months ago
Matthew ac7f16e58f 调整配置 11 months ago
Matthew b2d74846bf 背景改为半透明 11 months ago
Matthew 8eb983d272 Update version to 1.0.185
Based Core Version to 1.1.52
11 months ago
Matthew db2ed7e436 锁定对焦 11 months ago
Matthew fbc9b1a53d 增加3A总控开关的设置 11 months ago
Matthew 71bc235fb1 调整位置 11 months ago
Matthew 2c235ac462 修复编译错误 11 months ago
Matthew 6d1908f7b4 调试信息增加白色背景 11 months ago
Matthew e6280af46b 等待锁定分开控制 11 months ago
Matthew 1a4c6ace04 Update version to 1.0.184
Based Core Version to 1.1.51
11 months ago
Matthew 9a49e7615b 先取消测光,然后再触发 11 months ago
Matthew 8cd15dab19 完善逻辑 11 months ago
Matthew 8510a53bb7 优化拍照
测光如果50次还不能锁定,则取消重新开始测光
11 months ago
Matthew b9e6d6c73b Wakelock等待200毫秒再释放 11 months ago
Matthew d0fcceb96f Update version to 1.0.183
Based Core Version to 1.1.50
11 months ago
Matthew f8be8329e2 优化曝光和白平衡的处理 11 months ago
Matthew 53c1e9c376 增加白平衡的控制 11 months ago
Matthew 26432cee0c 修改日志 11 months ago
Matthew 93d3a4d554 调整曝光时间设置的单位 11 months ago
Matthew 6308331462 修复编译错误 11 months ago
huyizhong c7d3455d3c 完善做EMC实验方便查看的log日志文件,图片暂存路径改为由外部传入 11 months ago
Matthew c0ca4f736c 优化日志格式 11 months ago
Matthew 2634cafeae 修改日志格式 11 months ago
huyizhong 17321d0545 完善log日志存档,解决串口间通讯互相影响的bug,把串口调用入口中参数设置单独列出来 11 months ago
Matthew 7d21151a6c Update version to 1.0.182
Based Core Version to 1.1.49
11 months ago
Matthew 7e8727c493 Update version to 1.0.181
Based Core Version to 1.1.48
11 months ago
Matthew 886aa70393 增加控制是否等待3A状态达到锁定 11 months ago
Matthew 50f582c483 Update version to 1.0.180
Based Core Version to 1.1.47
11 months ago
Matthew 2c73dede46 Update version to 1.0.179
Based Core Version to 1.1.46
11 months ago
Matthew 18fb359d60 Update version to 1.0.178
Based Core Version to 1.1.45
11 months ago
Matthew 2acbfcaed2 修复异常requestTemplate时未保护的bug 11 months ago
huyizhong 3cc25a5a51 完善数据调用接口,修改调试中发现的Bug,增加log日志文件保存 11 months ago
Matthew c91c046003 Update version to 1.0.177
Based Core Version to 1.1.45
11 months ago
Matthew 12731b466f 重启设备延迟1秒 11 months ago
Matthew 884df4a72c Update version to 1.0.175
Based Core Version to 1.1.44
11 months ago
Matthew cfca6f93cc 优化重启机制 11 months ago
Matthew 43a33d9e78 Update version to 1.0.175
Based Core Version to 1.1.44
11 months ago
Matthew 94fe2292ff Update version to 1.0.174
Based Core Version to 1.1.43
11 months ago
Matthew 81d46306ee 启动时通道2主动拍一张照片并抛弃 11 months ago
Matthew bed0f7ac7b 使用宏定义常量 11 months ago
Matthew d66fefccc0 Update version to 1.0.173
Based Core Version: 1.1.42
11 months ago
Matthew 5fe95f7333 调整布局 11 months ago
Matthew ec88289fb8 修复名字错误 11 months ago
Matthew 7c7cc3c4bd 增加拍照模板的配置 11 months ago
Matthew e0f08a30dc 修复编译错误 11 months ago
Matthew 571a8aa6df 增加拍照模板控制 11 months ago
Matthew 361f959525 错误保护 11 months ago
Matthew e930365080 Update version to 1.0.172 11 months ago
Matthew fd7b468864 当使用sn作为cmdid时,也能自动启动 11 months ago
Matthew 6a4a367dd8 MpAPP启动时如果当前未选中数据网络,则选择simcard1 11 months ago
Matthew 6e13420db3 Update version to 1.0.171
Based Core Version: 1.1.42
12 months ago
Matthew 58c64b8c0d 修正文件判断的bug 12 months ago
Matthew d3214ed92d Update version to 1.0.170
Based Core Version: 1.1.42
12 months ago
Matthew 036d74c620 优化压缩相关的实现 12 months ago
Matthew 33be977e56 运维功能进行分组显示 12 months ago
Matthew 8c84ec8b94 优化日志 12 months ago
Matthew e4ab246b02 AI处理增加异常的保护 12 months ago
Matthew 07303629c4 拍照结束后关闭电源 12 months ago
Matthew 9572a4d107 Update version to 1.0.169
Based Core Version: 1.1.42
12 months ago
Matthew 1b8bc084c4 备用代码 12 months ago
Matthew ba2b840cc8 回退错误的修改 12 months ago
huyizhong a936a62440 增加完善采样和图片抓拍结束后,上层获取数据函数接口,增加传感器通讯不上故障判断 12 months ago
Matthew 4feeb05a2b 限制图像格式为YUV 12 months ago
Matthew 486fc6e971 Update version to 1.0.168
Based Core Version: 1.1.42
12 months ago
Matthew fa7b710ff4 修复编译错误 12 months ago
Matthew ea98c41353 修复错误 12 months ago
Matthew 50dbd18645 通过配置文件的方式把拍照参数传入到JNI 12 months ago
Matthew 2bed6b270d Update version to 1.0.167
Based Core Version: 1.1.41
12 months ago
Matthew 03aabf66d5 基于安装工具调整接口和实现 12 months ago
huyizhong 9f47f7fa5c 添加部分数据返回结果函数进行测试,根据测试硬件需要修改测试代码协助938硬件测试 12 months ago
Matthew 97f031a55f Update version to 1.0.166
Based Core Version: 1.1.41
12 months ago
Matthew 3838e0b926 修复OSD显示错误 12 months ago
Matthew 352c5a07fc Update version to 1.0.165
Based Core Version: 1.1.41
12 months ago
Matthew 0f01442b32 增加默认的OSD信息 12 months ago
Matthew b601de49d9 基于安装工具调整接口和实现 12 months ago
Matthew 30a3c9a703 基于安装工具调整接口 12 months ago
Matthew d6cd52dc7d 优化重启方法 12 months ago
Matthew 95c87c7467 优化加密处理的相关代码 12 months ago
Matthew 6a63213ee8 弥补照片的拍照时间控制在计划时间一定范围内
如果在30s内,则不作改变。否则调整为计划时间加(通道数的数值*2)
12 months ago
huyizhong 11e6072896 完善并调试摄像机拍照,完善并调试云台控制指令,解决在拍照过程中插入云台控制指令造成命令逻辑顺序紊乱的问题 12 months ago
Matthew fbfb4da728 Update version to 1.0.164 12 months ago
Matthew 1c87e22bf9 优化MpAPP重启机制 12 months ago
Matthew e0098e8327 Update version to 1.0.163
Based Core Version: 1.1.39
12 months ago
huyizhong 8856013295 完善并调试摄像机拍照,以及完善云台操作指令发送逻辑等 12 months ago
huyizhong 64bf7a5194 修改数据采集接入接口函数,完善摄像机使用接入代码等等 12 months ago
huyizhong b5e41a652c 增加单独接入启动摄像机流程 1 year ago
huyizhong 61999c7836 完善多串口多装置代码,可以下发命令,查找轮询空循环问题,测试IO查询,确定电源状态不能查询 1 year ago
Matthew bc1b158bf0 Update version to 1.0.162
Based Core Version: 1.1.38
1 year ago
huyizhong 5c0e8b3abf 完善多串口多装置轮询采样逻辑 1 year ago
huyizhong 1e8704e60e 先修改多串口多装置部分 1 year ago
huyizhong 9f61f98cab “把原来单一串口单一传感器改成多串口多传感器模式” 1 year ago
Matthew 64ea60f2b1 Update version to 1.0.161
Based Core Version: 1.1.37
1 year ago
Matthew 5107e26edf 增加微秒的设置 1 year ago
Matthew 5eef0e23f7 Update version to 1.0.160
Based Core Version: 1.1.36
1 year ago
Matthew 62832f07dc 拍照模板改为静态抓拍模式 1 year ago
Matthew 1d4f550d68 Update version to 1.0.159
Based Core Version: 1.1.36
1 year ago
Matthew aab393eb57 Update version to 1.0.158
Based Core Version: 1.1.35
1 year ago
Matthew 61a43a7f05 移除自动拍照的调试功能 1 year ago
Matthew b9ae5922af Update version to 1.0.157
Based Core Version: 1.1.34
1 year ago
Matthew 42ddd38bab 优化代码 1 year ago
Matthew 41d2206956 移除无用代码 1 year ago
Matthew d5af711c74 Update Version to 1.0.156
Based Core Version: 1.1.33
1 year ago
Matthew 39351322bc 修复编译错误 1 year ago
Matthew cc91a658a0 心跳时增加网络检测日志 1 year ago
Matthew accee64793 Update version to 1.0.155
Based Core Version: 1.1.33
1 year ago
Matthew f7a8c120b0 自检增加网络接口的信息打印 1 year ago
Matthew b625273bfc Update version to 1.0.154
Based Core Version: 1.1.32
1 year ago
Matthew 71bca1aca4 优化重启APP的等待时间 1 year ago
Matthew 2b38a768c7 等待拍照线程结束的保护,避免死等线程 1 year ago
Matthew ddd0ad4dc0 Update version to 1.0.153
Based Core Version: 1.1.31
1 year ago
Matthew fa8b961e77 增加rtmp lib 1 year ago
Matthew dfeb462d0e Update version to 1.0.152
Based Core Version: 1.1.30
1 year ago
Matthew fd3d7abefa 增加编译时间的宏 1 year ago
Matthew 3115e207ca 短视频拍摄时如果锁屏时自动开屏 1 year ago
Matthew dbffb7a0b1 Update version to 1.0.151 1 year ago
Matthew fe377d5ff4 离屏时短视频的录制优化 1 year ago
huyizhong 0d85bc6f2f 将串口通讯拆分为,串口参数配置和协议数据处理“”
git commit -m 将串口通讯拆分为,串口参数配置和协议数据处理”
1 year ago
Matthew 555e220672 增加485访问类 1 year ago
Matthew 34f4c62c1d 优化证书相关的实现 1 year ago
huyizhong 811d9ea593 将控制串口收发的流程的时间秒,改用毫秒 1 year ago
Aries a6598095bb 优化加密接口 1 year ago
huyizhong 549cda6b7b 将weathercomm文件移到主目录下,修改检测读取传感器时间控制入口 1 year ago
Matthew 4eefd56b2a 优化接口定义和代码 1 year ago
huyizhong 6f5b24fb3f weathercomm 1 year ago
Aries 6794f9943c 添加加密芯片接口 1 year ago
Matthew 8ffd2f1089 移除无用代码 1 year ago