Commit Graph

1249 Commits

Author SHA1 Message Date
payton
48f233769a 1.预约高清图名字更改 2024-01-20 01:55:15 +08:00
payton
1c28d37751 1.调整标识无信号无需B启动 2024-01-20 01:26:02 +08:00
payton
055cb48646 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-20 00:58:40 +08:00
payton
faa2014ac8 1.修复预约问题 2024-01-20 00:58:24 +08:00
xiehongyan
90b2fd0014 确认框文字位置修改 2024-01-20 00:14:31 +08:00
xiehongyan
1577f6c9bd 数字箭头修改位置 2024-01-19 23:06:26 +08:00
xiehongyan
44af9a8dd6 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base 2024-01-19 22:39:08 +08:00
xiehongyan
623849d347 修改密码图案位置 2024-01-19 22:38:21 +08:00
payton
7277e45c54 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-19 21:25:08 +08:00
payton
a285d70d3d 1.夜视帧率调试,代码已屏蔽 2024-01-19 21:24:54 +08:00
payton
e1a4a03362 1.更新电压分位;2默认开启mcu dbg 2024-01-19 21:23:38 +08:00
xiehongyan
974ee1de62 弹窗字体修改 2024-01-19 20:11:00 +08:00
xiehongyan
e55441fb50 弹窗圆角修改, check sim字体修改 2024-01-19 19:30:53 +08:00
xiehongyan
dfa4720f22 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base 2024-01-19 18:55:10 +08:00
xiehongyan
ca28b0882b 进度条修改 2024-01-19 18:54:51 +08:00
payton
6bfe77d556 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-19 18:42:24 +08:00
payton
570f5691db 1.修复电池图标会开始显示满格问题 2024-01-19 18:40:03 +08:00
payton
1bdd522247 1.linux下log记录 2024-01-19 18:37:05 +08:00
payton
4b02d7d050 1. killall qlog 2024-01-19 18:36:36 +08:00
payton
69411a2ec0 1.修改无emmc有sd卡时WiFi卡死问题 2024-01-19 18:36:16 +08:00
xiehongyan
65dd411119 修改ui弹窗颜色, 搜索字体大小 2024-01-19 17:52:50 +08:00
xiehongyan
f85b8ebec1 回放界面重叠问题, loop异常, 拍照0还能拍照问题 2024-01-19 16:17:33 +08:00
payton
e0212e4146 1.sd卡和qlog调整 2024-01-19 16:07:25 +08:00
xiehongyan
718af0e9ea 去掉network需要等待注网完成 2024-01-18 21:06:57 +08:00
xiehongyan
9c982ef7c1 7MR5RCwE107 2024-01-18 20:43:04 +08:00
payton
1c818be9ed 1.sd卡警告功能调整 2024-01-18 20:00:29 +08:00
payton
f0d685f14d Merge branches 'Branch_S550_Fast_Emmc' and 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-18 19:52:29 +08:00
payton
ce4bb24031 1.集中发送时不进行提示 2024-01-18 19:40:39 +08:00
xiehongyan
b66c732356 模块升级三级菜单判断路径逻辑修改 2024-01-18 19:14:24 +08:00
payton
e2f35d9f6d 1.ftp记录的错误码调整 2024-01-18 17:56:49 +08:00
payton
1128c2771a Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-18 16:33:40 +08:00
payton
6e01c4f871 1.启动标志调整,以免启动方式错乱 2024-01-18 16:33:24 +08:00
payton
e444e4c4b9 1.修改为集中发送时标识卡满标志 2024-01-18 16:32:36 +08:00
xiehongyan
d1276459b8 修改预览界面searching字体 2024-01-18 11:59:36 +08:00
payton
bc71398653 1.Linux下内存发送功能 2024-01-17 21:22:59 +08:00
xiehongyan
faa09bbb37 emmc容量小于300mb显示正常数量 2024-01-17 19:39:03 +08:00
xiehongyan
a9da778b45 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base 2024-01-17 19:37:35 +08:00
xiehongyan
1a19a95e5d 无卡无emmc执行内存发送, 模块升级菜单逻辑修改 2024-01-17 19:37:19 +08:00
payton
7cd39c8033 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-17 15:46:29 +08:00
payton
f0cac2c2f9 1.去除编译警告5 2024-01-17 15:46:14 +08:00
payton
30a3ea1cb5 1.去除编译警告4 2024-01-17 15:46:06 +08:00
payton
70e2761173 1.去除编译警告3 2024-01-17 15:45:52 +08:00
payton
9dc28871f1 1.去除编译警告2 2024-01-17 15:44:49 +08:00
payton
6bab9a4f72 1.去除编译警告1 2024-01-17 15:44:32 +08:00
xiehongyan
118cb7226f 1.ver:7MR5RCwE106 2024-01-17 15:21:38 +08:00
payton
609e4ae3a5 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-17 14:35:18 +08:00
payton
2b5dbc7aaa 1.修改编译不通过问题 2024-01-17 14:34:57 +08:00
xiehongyan
79a983571c Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base 2024-01-17 13:45:37 +08:00
xiehongyan
7b66e2beac 菜单模块升级变灰逻辑 2024-01-17 13:45:19 +08:00
payton
0e40a6633f 1.合并原厂提供的偏色问题 2024-01-17 13:45:15 +08:00
payton
cb00e6c4fa 1.emmc检测 2024-01-17 13:40:27 +08:00
payton
13c9931f12 1.内存发送修改 2024-01-17 11:29:27 +08:00
payton
68c0b40b32 1.卡循环调整 2024-01-17 11:27:56 +08:00
xiehongyan
901f6fb3b0 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base 2024-01-17 08:53:18 +08:00
xiehongyan
b95b5f9bbd 模块升级菜单变灰逻辑 2024-01-17 08:45:15 +08:00
payton
cf01d35f69 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-16 21:02:34 +08:00
payton
e8397d37b6 1.增加Linux下无卡发送功能 2024-01-16 21:02:16 +08:00
xiehongyan
bee7d65a2a sd卡升级菜单显示 2024-01-16 17:57:38 +08:00
payton
ec11a26dd1 1.集中发送工作模式时,内存发送功能不生效 2024-01-16 17:37:51 +08:00
payton
8fb9574e78 1.固定有卡使内存发送生效 2024-01-16 17:23:46 +08:00
payton
0cfcf307ce 1.视频水印增加camid 2024-01-16 17:22:50 +08:00
payton
99fdc6b2e0 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-16 15:18:23 +08:00
payton
6815fb4b9f 1.修改编译不通过 2024-01-16 14:43:03 +08:00
payton
46494fadb0 1.发送统计调整 2024-01-16 14:20:37 +08:00
xiehongyan
3533569ac8 sd卡满提示错误 2024-01-16 10:22:19 +08:00
payton
932809e17b 1.内存发送函数名更改 2024-01-16 09:53:29 +08:00
payton
53c5b4c5ff 1.合并原厂提供的偏色修改 2024-01-15 19:44:43 +08:00
payton
7ecf86a86e 1.修改WiFi初次连接重复发图问题 2024-01-15 18:12:12 +08:00
payton
b556a492c5 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-15 17:29:22 +08:00
xiehongyan
21edda0c35 回放界面文字修改 2024-01-15 17:21:23 +08:00
payton
a9ffe1bf91 1.修复SD卡循环删除缩略图 2024-01-15 16:16:57 +08:00
payton
6345a8233d 1.优化IP获取代码 2024-01-15 15:07:49 +08:00
payton
4ac4de21ba 1.dp发送文件路径调整 2024-01-15 14:36:45 +08:00
payton
1539965212 1.修改lpa 2024-01-15 14:36:21 +08:00
payton
eccecf2618 1.合并佳敏lpa修改 2024-01-15 09:53:28 +08:00
xiehongyan
62030ee7de 1.ver:7MR5RCwE105 2024-01-14 16:54:11 +08:00
xiehongyan
715302a340 预览界面显示照片位数 2024-01-14 16:34:52 +08:00
xiehongyan
73820ddd29 添加预览界面数字显示最大99999 2024-01-14 14:07:33 +08:00
xiehongyan
2fa53d76af 回退图片运营商识别库 2024-01-14 12:51:04 +08:00
xiehongyan
55f7d2a300 1.ver:7MR5RCwE104 2024-01-12 19:30:12 +08:00
xiehongyan
fd4c82f623 emmc错误提示语, 确认框弹出取消多次add style 2024-01-12 19:28:45 +08:00
payton
f00e46bffd Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-12 17:49:45 +08:00
payton
dba007b607 1.低电检测文件宏 2024-01-12 17:49:30 +08:00
payton
a3038ff342 1.emmc循环功能修改 2024-01-12 17:49:03 +08:00
payton
0a4b1c0797 1.去除编译警告 2024-01-12 17:48:39 +08:00
payton
b3fc12b6bc 1.修改低电警告发送 2024-01-12 17:48:06 +08:00
payton
a02f22e2a5 1.存储器检测修改 2024-01-12 17:46:53 +08:00
payton
93b190782a 1.优化代码 2024-01-12 17:46:32 +08:00
payton
114fe4c80c 1.统计参数优先保存到emmc 2024-01-12 17:46:14 +08:00
payton
e95b49dc73 1.卡循环修改 2024-01-12 17:45:43 +08:00
greg
f45db6db7e Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-12 14:00:52 +08:00
greg
99d7d53553 解决参数没有变更时,不写Flash 2024-01-12 13:59:55 +08:00
greg
4fa51839ce 回放页面每一次按键进行一次回收内存 2024-01-12 13:56:10 +08:00
xiehongyan
ba4deb167a Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-12 10:33:09 +08:00
xiehongyan
087e93106e 修复回放播放视频时删除文件 2024-01-12 10:32:55 +08:00
payton
d5b8cbf5cd 1.更新蓝牙WiFi协议内容 2024-01-12 10:27:57 +08:00
greg
98aa1bf646 回放时优化并回收内存 2024-01-12 10:23:51 +08:00
xiehongyan
3fd9f0f032 1.ver:7MR5RCwE103 2024-01-11 21:13:16 +08:00
xiehongyan
339b0ef94f Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-11 20:59:25 +08:00
xiehongyan
86805e14a4 sd卡error和emmcerror判定, mcu升级界面判定 2024-01-11 20:59:06 +08:00
payton
9ef9c132a4 1.写mcu时增加缓存输出 2024-01-11 20:57:17 +08:00
payton
a8a727b56b 1.根据新的WiFi协议调整流程 2024-01-11 20:55:41 +08:00
payton
6e489d41e0 1.优化代码,减少打印;2.修改拔掉sd卡有报错问题 2024-01-11 20:54:49 +08:00
payton
35501a6673 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-11 19:31:26 +08:00
payton
d2c8f71549 1.蓝牙头文件 2024-01-11 19:31:11 +08:00
payton
77eee70b14 1.修改集中发送问题 2024-01-11 19:29:56 +08:00
xiehongyan
1521f59107 去掉预览界面长按下键生成二维码功能, 添加emmc满显示 2024-01-11 16:23:24 +08:00
payton
36e74f636e 1.根据新协议修改蓝牙业务 2024-01-11 16:02:55 +08:00
payton
39310f9d80 1.根据新的短信协议调整代码 2024-01-11 13:56:55 +08:00
payton
dcbb89539a Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-11 13:53:40 +08:00
payton
e33aefe84e 1.优化代码,模块重启 2024-01-11 13:53:23 +08:00
xiehongyan
ad2f09213a 预览界面切换优化, 10689emmc和sd卡状态优化 2024-01-11 13:42:38 +08:00
payton
862fa23840 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-10 20:16:40 +08:00
payton
c0b2a29cb7 1.格式化命令调整 2024-01-10 20:15:26 +08:00
payton
48987d5e4f 1.文件名调整 2024-01-10 20:15:00 +08:00
xiehongyan
1a9b871afa 10195 倒计时时间不准, 10689 sd卡和emmc状态, 添加2g和4g图片 2024-01-10 18:10:09 +08:00
sober.song
cac4816d5c 优化mmc设备space状态和loop状态更新 2024-01-10 15:34:21 +08:00
sober.song
dfad4c0234 修改EMMC loop状态不能及时更新的问题 2024-01-09 20:43:40 +08:00
sober.song
ac2348feba 修改camera升级固件路径 2024-01-09 20:42:44 +08:00
payton
1efad71d96 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-09 19:28:46 +08:00
payton
f4be410904 1.修复预约功能 2024-01-09 19:28:30 +08:00
xiehongyan
8e85e4d273 10928 蓝牙后菜单错乱, 10792 文本框上移 2024-01-09 19:13:53 +08:00
payton
b076336ce7 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-09 16:34:00 +08:00
payton
b77aeffc96 1.预约发送修改;2.卡相关的宏修改 2024-01-09 16:33:45 +08:00
payton
78eb878d79 1.usb报错后先重启模式;2.卡相关的宏修改 2024-01-09 16:32:58 +08:00
payton
3764e0e2d9 1.升级后太快写mcu出错,确保mcu初始化完成再写 2024-01-09 16:32:09 +08:00
payton
3e7800dd74 1..卡相关的宏修改 2024-01-09 16:29:52 +08:00
xiehongyan
e509223c33 1.ver:7MR5RCwE102 2024-01-09 15:21:55 +08:00
xiehongyan
204f9ea7b0 增加倒计时到0后闪灯 2024-01-09 13:46:06 +08:00
xiehongyan
916b6d5985 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-09 10:37:36 +08:00
xiehongyan
fd98f2785e 倒计时时序完善 2024-01-09 10:37:21 +08:00
payton
75e392a48d 1.ver:7MR5RCwE101 2024-01-09 09:12:02 +08:00
payton
a85126e6b3 1.修改WiFi连接后卡机问题 2024-01-09 09:11:47 +08:00
payton
473b908243 1.fat32格式化库 2024-01-09 09:11:17 +08:00
sober.song
dc4ddd2a3a 修改sf_wifi_svr合并代码冲突 2024-01-08 18:53:08 +08:00
sober.song
00623e27c2 修复wifi_svr获取文件命名字段死机和上电不插入SD卡UI显示异常问题 2024-01-08 18:49:45 +08:00
payton
b1a479f8e1 1.修改mcu升级问题 2024-01-08 17:30:03 +08:00
payton
0ea35e2118 1.修改WiFi连接宕机问题 2024-01-08 16:14:42 +08:00
payton
6051de741f 1调整WiFi和蓝牙时序 2024-01-08 15:50:59 +08:00
payton
53d921dd29 1.cardv关机时开启poweroff结束回收 2024-01-08 13:56:25 +08:00
payton
e22ee707d8 1.优化蓝牙驱动加载 2024-01-08 13:55:41 +08:00
payton
25c0d5f992 1.优化mcu读写 2024-01-08 13:50:32 +08:00
payton
1e9e60946f 1.调整WiFi加载时序 2024-01-08 13:49:22 +08:00
payton
5a1902186d 1.增加超时主控关机 2024-01-08 13:48:08 +08:00
payton
575462f6a6 1.关闭老化测试软件宏 2024-01-08 09:08:00 +08:00
payton
16ba499c7f Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-08 09:06:48 +08:00
sober.song
9b6fa552e6 修复linux系统启动首次命名盘符错乱问题 2024-01-06 18:36:22 +08:00
sober.song
642167b25e 修改文件名不生效问题 2024-01-06 17:06:21 +08:00
payton
57efc9d753 1.修改格式化问题 2024-01-05 22:05:36 +08:00
payton
7845407826 1.Linux下老化软件宏 2024-01-05 21:10:01 +08:00