| 
							
							
								 xiehongyan | ffb0d6be0d | 修改回放菜单√的位置 | 2024-01-03 13:39:14 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 94b1d4b7e6 | Fixed:Key event of comfirm screen do not send to current screen. | 2024-01-03 13:33:17 +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 |  | 
			
				
					| 
							
							
								 sober.song | d79f978f1b | Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize | 2024-01-03 10:30:32 +08:00 |  | 
			
				
					| 
							
							
								 payton | 29db87bf99 | Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc | 2024-01-02 21:50:21 +08:00 |  | 
			
				
					| 
							
							
								 payton | 3e2e829485 | 1.参数加载提前到ui显示前;2.增加dump打印时序log功能 | 2024-01-02 21:50:06 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 14b2672856 | Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc | 2024-01-02 21:07:24 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 433499503f | 删除emmc自动挂载失败后手动挂载逻辑 | 2024-01-02 21:06:03 +08:00 |  | 
			
				
					| 
							
							
								 payton | 91b03b29f8 | 1.去掉tty等待超时的打印 | 2024-01-02 21:03:38 +08:00 |  | 
			
				
					| 
							
							
								 payton | 86d43cbb8c | 1.还原快捷关机,使用写mcu关机 | 2024-01-02 20:59:53 +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 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 07762c255c | Fixed:Message screen tips strings can not refresh. | 2024-01-02 16:45:05 +08:00 |  | 
			
				
					| 
							
							
								 payton | 20b4440a10 | 1.插入usb后菜单的icon不需要显示;2.拔掉SD卡后无需检查A盘信息 | 2024-01-02 16:45:04 +08:00 |  | 
			
				
					| 
							
							
								 payton | fd04e228d5 | 1.插入usb无需检测 | 2024-01-02 16:43:43 +08:00 |  | 
			
				
					| 
							
							
								 payton | c54e521de2 | 1.修改battery测试log | 2024-01-02 15:42:26 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 95e36546cd | Fixed:Emmc status ok in photo screen. | 2024-01-02 15:34:07 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7afffdb5cf | 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-02 14:23:00 +08:00 |  | 
			
				
					| 
							
							
								 payton | 34c50b2cc0 | 1.合并Linux下回复修改 | 2024-01-02 13:54:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6dee93317a | 7MR5RCwDC07 | 2024-01-02 13:45:56 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 47577a6f3e | 修改编译失败问题 | 2024-01-02 10:25:21 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 87ece34cef | Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc | 2024-01-02 10:00:37 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 4879e7cc94 | strgMng存储路径动态获取 | 2023-12-30 20:54:10 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | b41cb5454b | 添加回放界面PlayExe_OnOpen输出 | 2023-12-30 19:31:19 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 72c115a00b | 修复RTOS存储文件死机问题 | 2023-12-30 18:53:53 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | e1d467900d | 修改二维码创建条件 | 2023-12-30 18:33:06 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 50ad347fc8 | 修改获取可用存储设备接口 | 2023-12-30 16:59:16 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | be0cddbabf | 添加回放界面设置菜单 | 2023-12-30 15:00:17 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0ca0cbaa30 | Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc | 2023-12-29 22:16:26 +08:00 |  | 
			
				
					| 
							
							
								 payton | 9f3b279232 | 1.增加SF_4G_MODE_TEST宏开关 | 2023-12-29 22:16:10 +08:00 |  | 
			
				
					| 
							
							
								 payton | 1182e8f476 | 1.sms增加gprs开关控制 | 2023-12-29 22:15:49 +08:00 |  | 
			
				
					| 
							
							
								 payton | 86c0cc9ddd | 1.陈反馈sdclk无需设置24M | 2023-12-29 22:14:40 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | 400bebebd6 | Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc | 2023-12-29 19:37:38 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | 9c462df6bb | 调整回放界面按键 | 2023-12-29 19:36:15 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | f47a6c0b0b | Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc | 2023-12-29 18:19:56 +08:00 |  | 
			
				
					| 
							
							
								 sober.song | 2c13dc999b | 修复UI获取可用存储设备异常逻辑 | 2023-12-29 18:18:48 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | 3ebcf2320f | BUG:10614 自动关机倒计时5秒后不能打断问题 | 2023-12-29 17:25:32 +08:00 |  | 
			
				
					| 
							
							
								 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 |  |