Commit Graph

927 Commits

Author SHA1 Message Date
xiehongyan
92aa1909ba BUG:10614 自动关机倒计时5秒后不能打断问题 2023-12-29 17:13:19 +08:00
sober.song
e6dde55948 加宏控制RTOS和Linux下mmc_dev_check逻辑,默认check逻辑关闭 2023-12-29 16:00:01 +08:00
xiaojiazhu
e04817b6ab Merge:Emmc function in photo screen. 2023-12-29 14:21:15 +08:00
xiaojiazhu
9c6521aa27 Meger:Add emmc gui code. 2023-12-29 10:51:49 +08:00
sober.song
f6e9ed6ab3 修改合并快起死机问题 2023-12-29 00:29:00 +08:00
sober.song
924dc666e9 增加USE_MMC_DEV_CHECK宏开关 2023-12-28 20:57:41 +08:00
payton
de9ac7869f 1.程序名称改R6.0 2023-12-28 16:20:32 +08:00
payton
fd81e9b252 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-28 16:17:10 +08:00
payton
b06f2298b8 1.内存优化 2023-12-28 16:14:05 +08:00
xiehongyan
7d3e70dd47 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-28 15:44:12 +08:00
xiehongyan
64dfd15bbe BUG:10539,10683 进度条播放弹跳/确认框默认为no 2023-12-28 15:42:27 +08:00
payton
fe10d516b0 1.Fast preview修改录像完毕后报错问题 2023-12-28 15:08:29 +08:00
xiaojiazhu
d311978d3a Add:Emmc function in playback screen. 2023-12-28 13:56:10 +08:00
sober.song
c091cc7b03 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-28 13:41:56 +08:00
sober.song
57420f5c15 增加UIStorageCheckEMMC检测和UI格式化EMMC 2023-12-28 13:39:43 +08:00
xiaojiazhu
e336717f56 Improve:Emmc switch in playback screen. 2023-12-28 11:38:05 +08:00
payton
5737d78b10 1.修改gps;2.去掉多余的头文件 2023-12-28 10:41:06 +08:00
payton
23f4de153d 1.对bat检测进行补偿 2023-12-28 10:38:05 +08:00
xiehongyan
e7eb26c266 BUG10607,10610 录像模式下去掉红线和Searching 2023-12-27 18:56:47 +08:00
payton
4ba93de949 1.根据PRD更改24M图片尺寸 2023-12-27 18:09:25 +08:00
payton
0d0a407aba 1.重置参数时无需将WiFi相关的设置使用系统api设置 2023-12-27 18:03:07 +08:00
xiaojiazhu
be75a48f61 backup. 2023-12-27 17:35:39 +08:00
payton
141907efa5 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-27 17:07:51 +08:00
payton
f6375d1e30 1.无升级包不重启--预处理,暂时不修改 2023-12-27 17:07:23 +08:00
payton
5156752c1a 1.wifi切网时做互斥操作,以免频繁点击 2023-12-27 17:06:16 +08:00
sober.song
b9e1fda503 修改merge Branch_S550_Fast_Emmc文件冲突问题 2023-12-27 15:33:04 +08:00
xiehongyan
b08b85b0c6 BUG:10694 电量小于40%升级提示弹窗 2023-12-27 15:12:18 +08:00
sober.song
224c1c291c Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-27 13:52:29 +08:00
sober.song
49b78482b1 修改RTOS下无法保存缩略图到EMMC问题和优化存储设备切换逻辑 2023-12-27 13:41:11 +08:00
payton
26e56590ad 1.先连接ftp服务器再搜gps 2023-12-27 11:58:25 +08:00
payton
5ff97d0610 1.修复ftp下载升级包缺失部分 2023-12-27 11:57:50 +08:00
payton
b1452dad68 1.更换重启命令 2023-12-27 11:57:21 +08:00
payton
5d2ca48ce3 1.1.Linux增加区分自动和手动模式升级 2023-12-27 11:56:51 +08:00
xiehongyan
8935e03b70 BUG:106 对调弹窗按钮yes和no的位置 2023-12-27 11:21:07 +08:00
sober.song
8bbe9651b2 合入原厂Linux和Rtos下EMMC最新改动和存储设备切换逻辑 2023-12-26 21:16:40 +08:00
xiehongyan
36e55a3291 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-26 18:19:21 +08:00
xiehongyan
b3c93d9abd BUG:10646 切换运营商后显示并等待三秒重启 2023-12-26 18:19:04 +08:00
sober.song
b18d94f150 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-26 17:12:48 +08:00
xiaojiazhu
0b99ec9878 Add:option function in playback screen. 2023-12-26 15:50:16 +08:00
payton
91e8812d3f 1.程序名改R5.0 2023-12-26 15:25:34 +08:00
payton
d63c3ad5cd Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-26 15:16:10 +08:00
payton
315c03e04d 1.Fast preview修改 2023-12-26 15:12:25 +08:00
payton
ce5a796aeb 1.关闭电池检测有机率宕机,暂时屏蔽 2023-12-26 15:00:38 +08:00
payton
bf0f59af83 1.usb插入时模式切换 2023-12-26 14:59:40 +08:00
payton
7c03334ca6 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-26 14:58:18 +08:00
payton
11152df385 1.合并emmc修改 2023-12-26 14:57:42 +08:00
xiaojiazhu
88938668ed Add:Emmc code in photo screen, which is needed to be test. 2023-12-26 14:55:02 +08:00
xiaojiazhu
2fb1a5900a Add:Emmc status wedget on photo screen. 2023-12-26 11:00:56 +08:00
xiehongyan
00f035982c Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-25 20:18:05 +08:00
xiehongyan
30dcf75c83 BUG:10639 二维码生成流程修改 2023-12-25 20:17:48 +08:00
xiaojiazhu
de5b58d770 Fixed:setting time and date failed bug. 2023-12-25 17:40:41 +08:00
sober.song
1a18ae504a 合并原厂EMMC和SD卡兼容修改 2023-12-25 15:41:01 +08:00
xiaojiazhu
f6034b6add Modified emmc loop function in setting screen. 2023-12-25 14:19:00 +08:00
sober.song
bc9f039106 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-25 11:45:19 +08:00
xiaojiazhu
14c0659dfb Fixed bug:Option screen ui error about next page. 2023-12-25 11:39:33 +08:00
sober.song
69dc8b618c 修改部分EMMC和SD卡切换逻辑 2023-12-25 11:30:44 +08:00
xiaojiazhu
e8be05aac6 Meger EMMC function in setting screen. 2023-12-25 11:14:20 +08:00
xiaojiazhu
a3638ef02a EMMC memand in setting screen. 2023-12-25 11:07:16 +08:00
payton
b5b8983687 1.POWERON_FAST_PREVIEW宏定义 2023-12-25 10:22:07 +08:00
payton
088da1af36 1.FAST PREVIEW功能 2023-12-25 10:21:56 +08:00
sober.song
2a20d7fd2a rtos和linux下存储文件路径加入存储设备切换逻辑 2023-12-23 19:15:22 +08:00
sober.song
85230bb460 EMMC和SD卡切换逻辑代码实现 2023-12-23 16:51:21 +08:00
xiehongyan
c924d94dc7 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-22 19:24:32 +08:00
xiehongyan
6d386153ab bug:9796 电池界面锂电池跳转其他选项变灰 2023-12-22 19:24:13 +08:00
xiehongyan
6b5acd8890 密码界面失效问题 2023-12-22 11:34:52 +08:00
xiaojiazhu
b3eacd7bff Add format emmc code. 2023-12-21 17:49:34 +08:00
payton
4949561ac1 1.ver:7MR5RCwDC05 2023-12-20 19:35:08 +08:00
xiaojiazhu
126c130133 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_emmc 2023-12-20 17:20:42 +08:00
payton
7e4f40ccc0 1.修复启动模式获取错误问题 2023-12-20 16:48:51 +08:00
xiaojiazhu
cc78dae655 Improve:Can not show delete comfirm screen when no file. 2023-12-20 16:29:46 +08:00
payton
e8f2ea7d8f 1.增加动态回收mem 2023-12-20 16:25:17 +08:00
xiehongyan
b1d2650475 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-20 15:43:33 +08:00
xiehongyan
f5f825d7d2 bug:10571 修复开机后密码界面会自动关闭 2023-12-20 15:43:15 +08:00
payton
5d130e5df4 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-20 10:21:29 +08:00
xiaojiazhu
9741bf7716 Fixed bug:show review screen when power off. 2023-12-20 10:17:03 +08:00
payton
80805e6786 1.修改拍摄过后cpu占用高的问题 2023-12-20 10:13:02 +08:00
xiehongyan
d1686a0290 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-20 10:10:43 +08:00
xiehongyan
1a351ee7cd bug:10532 qr界面gui功能 2023-12-20 10:10:26 +08:00
payton
14e8e020ca 1.log记录调整 2023-12-20 09:55:01 +08:00
payton
be37d33bc1 1.关闭gps时首次启动也发一次gps 2023-12-20 09:54:45 +08:00
payton
c1ef11a1cd 1.mcu升级调整:升级开lcd;mcu读写超时时间调整;2.lib里的usb标识调整 2023-12-20 09:54:14 +08:00
xiehongyan
412ae11b28 bug:10532 qr界面gui功能 2023-12-20 09:17:47 +08:00
payton
3ec82a2b9a 1.增加log中间文件删除功能 2023-12-19 16:53:57 +08:00
payton
ce3132dc91 1.增加些log确认信号;2.优化gps消息 2023-12-19 16:52:18 +08:00
payton
c4a322004b 1.修复cam id开启时在dp文件中 2023-12-19 16:49:18 +08:00
payton
eb3e4e257f 1.修改dp电池类型 2023-12-19 15:33:47 +08:00
xiaojiazhu
488c4c1e34 Fixed bug number 10204. 2023-12-19 14:52:25 +08:00
payton
9f7c58515f Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-19 10:47:36 +08:00
payton
63ec1857ad 1.程序给R6.0 2023-12-19 10:47:11 +08:00
payton
6e47f2c698 1.dp记录的错误码修改 2023-12-19 10:46:46 +08:00
payton
e5416993b6 1.去掉蓝牙的普通log 2023-12-19 10:46:10 +08:00
payton
8a68dab79b 1.wifi点击切换模式再工作过程中不切换模式 2023-12-19 10:45:38 +08:00
xiaojiazhu
60a77deb0d Fixed bug number 10539. 2023-12-19 10:38:42 +08:00
xiehongyan
e69d593ca0 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-19 10:06:35 +08:00
xiehongyan
453ca794d5 bug:10415 修复进入network会黑屏一段时间 2023-12-19 10:06:17 +08:00
xiaojiazhu
787ee85bbd Gui Megre emmc branch. 2023-12-18 19:48:39 +08:00
xiehongyan
1724927f57 修复send type界面二级菜单没有> 2023-12-18 18:24:20 +08:00
xiehongyan
ec7e70b9e0 Merge branch 'Branch_S550_GUI' into Branch_S550_Emmc 2023-12-18 17:00:26 +08:00
xiehongyan
c916f942ba backup. 2023-12-18 16:58:37 +08:00
payton
212f874943 Merge branch 'Branch_S550_Fast' into Branch_S550_Fast_Emmc 2023-12-18 16:40:06 +08:00