Commit Graph

590 Commits

Author SHA1 Message Date
xiehongyan
a3c60a1d15 Revert "蓝牙连接卡死问题"
This reverts commit c4aad2da7b.
2024-01-22 13:53:00 +08:00
xiehongyan
59a981e2b5 二维码界面弹窗文字左对齐 2024-01-22 10:36:12 +08:00
xiehongyan
c4aad2da7b 蓝牙连接卡死问题 2024-01-20 15:09:59 +08:00
xiehongyan
5930ded612 send type, operating time 菜单箭头位置修改 2024-01-20 10:39:09 +08:00
payton
1c28d37751 1.调整标识无信号无需B启动 2024-01-20 01:26:02 +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
xiehongyan
974ee1de62 弹窗字体修改 2024-01-19 20:11:00 +08:00
xiehongyan
e55441fb50 弹窗圆角修改, check sim字体修改 2024-01-19 19:30:53 +08:00
xiehongyan
ca28b0882b 进度条修改 2024-01-19 18:54:51 +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
xiehongyan
718af0e9ea 去掉network需要等待注网完成 2024-01-18 21:06:57 +08:00
payton
1c818be9ed 1.sd卡警告功能调整 2024-01-18 20:00:29 +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
xiehongyan
d1276459b8 修改预览界面searching字体 2024-01-18 11:59:36 +08:00
xiehongyan
1a19a95e5d 无卡无emmc执行内存发送, 模块升级菜单逻辑修改 2024-01-17 19:37:19 +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
cb00e6c4fa 1.emmc检测 2024-01-17 13:40:27 +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
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
xiehongyan
3533569ac8 sd卡满提示错误 2024-01-16 10:22:19 +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
1539965212 1.修改lpa 2024-01-15 14:36:21 +08:00
xiehongyan
715302a340 预览界面显示照片位数 2024-01-14 16:34:52 +08:00
xiehongyan
73820ddd29 添加预览界面数字显示最大99999 2024-01-14 14:07:33 +08:00
xiehongyan
fd4c82f623 emmc错误提示语, 确认框弹出取消多次add style 2024-01-12 19:28:45 +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
greg
98aa1bf646 回放时优化并回收内存 2024-01-12 10:23:51 +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
6e489d41e0 1.优化代码,减少打印;2.修改拔掉sd卡有报错问题 2024-01-11 20:54:49 +08:00
xiehongyan
1521f59107 去掉预览界面长按下键生成二维码功能, 添加emmc满显示 2024-01-11 16:23:24 +08:00
xiehongyan
ad2f09213a 预览界面切换优化, 10689emmc和sd卡状态优化 2024-01-11 13:42:38 +08:00
xiehongyan
1a9b871afa 10195 倒计时时间不准, 10689 sd卡和emmc状态, 添加2g和4g图片 2024-01-10 18:10:09 +08:00
sober.song
ac2348feba 修改camera升级固件路径 2024-01-09 20:42:44 +08:00
xiehongyan
8e85e4d273 10928 蓝牙后菜单错乱, 10792 文本框上移 2024-01-09 19:13:53 +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
sober.song
00623e27c2 修复wifi_svr获取文件命名字段死机和上电不插入SD卡UI显示异常问题 2024-01-08 18:49:45 +08:00
xiehongyan
4e1dc41e06 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-05 19:44:35 +08:00
xiehongyan
cc63b8563f 添加回放菜单图片和文字 2024-01-05 19:44:17 +08:00
xiaojiazhu
b273595fde Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc 2024-01-05 17:38:26 +08:00
xiehongyan
1effe83902 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-05 16:30:51 +08:00
xiehongyan
a15a7216aa 更新回放图片解码失败跳过, 二维码显示逻辑更改 2024-01-05 16:30:38 +08:00
xiaojiazhu
f205d43323 Fixed:Save config when menu setting not happened. 2024-01-05 16:09:26 +08:00
payton
27fedf18e8 1.ui参数保存进行调整 2024-01-05 15:40:59 +08:00
xiaojiazhu
16a81773d0 Improve:Photo emmc incon update. 2024-01-05 11:00:10 +08:00
xiehongyan
f95391c378 修改确认框弹出后按键错乱 2024-01-05 08:33:14 +08:00
xiehongyan
ba876371b3 格式化菜单优化 2024-01-04 20:22:47 +08:00
xiehongyan
e0d2aea246 去掉图片错误弹窗, 添加network右键选择 2024-01-04 19:35:01 +08:00
xiehongyan
6be1c711d5 删除sd卡文件,插拔sd卡回放切回emmc 2024-01-04 18:19:26 +08:00
xiaojiazhu
53f8bc7a1b Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc 2024-01-04 16:17:51 +08:00
xiaojiazhu
1ace30bcc2 Modify:No sd card icons. 2024-01-04 16:17:27 +08:00
xiehongyan
49d8eefe2e Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-04 16:07:13 +08:00
xiehongyan
01c8c82f49 添加格式化菜单界面变灰 2024-01-04 16:06:59 +08:00
xiaojiazhu
2f9abe77b2 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc 2024-01-04 15:43:15 +08:00
xiaojiazhu
e11068b335 Add:Mcu upgrade function. 2024-01-04 15:42:44 +08:00
xiehongyan
abd28ee3fe 修改回放界面无文件弹窗 2024-01-04 15:16:04 +08:00
xiaojiazhu
20dbb54190 Add:Mcu upgrade widget. 2024-01-04 13:51:36 +08:00
xiehongyan
94aea9c445 修改格式化菜单图片 2024-01-04 11:23:41 +08:00
xiehongyan
88728fa9f2 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-04 10:18:45 +08:00
xiehongyan
6d7a1150be 退出回放界面切换回拍照存储的回放位置 2024-01-04 10:18:30 +08:00
payton
e883e059ef 1.增加电池锂电切换和恢复原值 2024-01-04 10:09:14 +08:00
xiehongyan
bd6fb63fd0 添加回放菜单默认选项 2024-01-03 20:31:50 +08:00
payton
abd5d2e350 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-03 19:10:20 +08:00
payton
f70d7b9d15 1.reset重置sf参数 2024-01-03 19:10:03 +08:00
xiehongyan
501eea8aee Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-03 18:50:32 +08:00
xiehongyan
ace86859f8 修改回放界面切换emmc和sd卡 2024-01-03 18:50:17 +08:00
payton
9a687b6685 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-03 16:52:07 +08:00
xiaojiazhu
9ee4af14eb Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc 2024-01-03 16:48:27 +08:00
xiaojiazhu
5b0ad73b40 Fixed:Message screen key event can not send to father screen. 2024-01-03 16:48:01 +08:00
payton
637119f1ac 1.拍摄后进行内存释放 2024-01-03 16:42:11 +08:00
xiehongyan
c23b991ecc 修复电池切换后不保存问题 2024-01-03 15:34:31 +08:00
xiehongyan
ffb0d6be0d 修改回放菜单√的位置 2024-01-03 13:39:14 +08:00
xiehongyan
f3606cd190 去掉回放菜单左键回退功能 2024-01-03 11:56:53 +08:00
xiehongyan
aa2370ca9c Merge code 2024-01-03 10:48:34 +08:00
xiehongyan
02af726fb7 9842,10801 二维码显示逻辑问题, 回放界面设置菜单未插卡变灰 2024-01-03 10:43:18 +08:00
payton
11bd6614f4 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 20:34:46 +08:00
payton
c527999869 1.修复运营商信息没有重置问题 2024-01-02 20:30:15 +08:00
sober.song
f3f13e5879 增加获取指定mmc设备dcf_handle接口 2024-01-02 18:37:54 +08:00
xiaojiazhu
c8e3665f3b Meger code. 2024-01-02 17:00:16 +08:00
xiehongyan
decc3ae138 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-02 16:56:32 +08:00
xiehongyan
a4e4952d00 修复倒计时界面插入usb不停止 2024-01-02 16:55:59 +08:00