| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 payton | 73c15c532c | 1.修改ota | 2023-12-18 16:30:16 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7bc6174a29 | 1.emmc合并修改 | 2023-12-18 16:18:40 +08:00 |  | 
			
				
					| 
							
							
								 payton | 52f09283fc | 1.预约发送检查文件是否存在 | 2023-12-18 13:55:36 +08:00 |  | 
			
				
					| 
							
							
								 payton | 041d8d89a3 | 1.信号改使用全局变量 | 2023-12-18 13:55:23 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | 975233c403 | bug:10376串口打印按键提示问题 | 2023-12-18 09:58:51 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3ae9ca53e6 | 7MR5RCwDC04 | 2023-12-15 19:04:47 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 73abb4e48d | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-12-15 18:41:17 +08:00 |  | 
			
				
					| 
							
							
								 xiehongyan | ec1c2bf6ad | bug:9709二级菜单没有> | 2023-12-15 18:41:11 +08:00 |  | 
			
				
					| 
							
							
								 payton | b11ea12d85 | 1.背光cmd | 2023-12-15 16:30:14 +08:00 |  | 
			
				
					| 
							
							
								 payton | 13f633bf6c | 1.增加cardv关机超时错误时sfapp关机 | 2023-12-15 16:29:58 +08:00 |  | 
			
				
					| 
							
							
								 payton | 80a26e8088 | 1.增加背光cmd;2.如要切换模式拍摄结束再切换 | 2023-12-15 16:29:49 +08:00 |  | 
			
				
					| 
							
							
								 payton | 86f848136f | 1.iq test默认参数更改 | 2023-12-15 16:28:57 +08:00 |  | 
			
				
					| 
							
							
								 payton | c4fb81c191 | 1.升级优化 | 2023-12-15 16:28:21 +08:00 |  | 
			
				
					| 
							
							
								 payton | 22f5080339 | 1.修复蓝牙连接可能不跳转预览的问题 | 2023-12-15 16:25:59 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | b2d21371d3 | Fixed bug number 10227. | 2023-12-15 14:15:48 +08:00 |  | 
			
				
					| 
							
							
								 payton | 413001226c | 1.原厂修改msdc代码 | 2023-12-15 13:46:39 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 2865641ffa | Fixed bug number 10499. | 2023-12-14 17:16:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 1c2c526272 | Fixed bug number 10057. | 2023-12-14 16:32:39 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 50233ba499 | Fixed bug number 10238. | 2023-12-14 10:31:53 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | ef46d79229 | Improve Enter work mode tips. | 2023-12-13 18:58:54 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8f549afebd | Fixed bug number 10186. | 2023-12-13 15:03:02 +08:00 |  | 
			
				
					| 
							
							
								 payton | 260288c3cb | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast | 2023-12-12 19:25:59 +08:00 |  | 
			
				
					| 
							
							
								 payton | 736cfbb5d3 | 1.蓝牙WiFimakefile修改 | 2023-12-12 19:25:47 +08:00 |  | 
			
				
					| 
							
							
								 payton | 3000364201 | 1.WiFi适配 | 2023-12-12 19:25:14 +08:00 |  | 
			
				
					| 
							
							
								 payton | e8a1816bfc | 1.蓝牙适配 | 2023-12-12 19:24:49 +08:00 |  | 
			
				
					| 
							
							
								 payton | 5522667d3b | 1.蓝牙固件 | 2023-12-12 19:21:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9f91125971 | 7MR5RCwDC03 | 2023-12-12 19:13:44 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 788eace2ba | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-12-12 18:46:22 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 390e256d52 | Fixed bug number 10495. | 2023-12-12 17:34:24 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | d5282fedc0 | Fixed bug number 10238. | 2023-12-12 17:05:49 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 615962355e | Fixed bug number 10154. | 2023-12-12 15:33:18 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 825c419830 | Fixed bug number 10129. | 2023-12-12 14:46:25 +08:00 |  | 
			
				
					| 
							
							
								 payton | d71d1c07e2 | 1.优化自动模式注网流程 | 2023-12-12 13:55:52 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 791d3ca7fb | Fixed bug number 10049. | 2023-12-12 11:40:47 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | de771d252a | Improve line in review screen. | 2023-12-12 10:59:00 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 4ddb2fc68c | Fixed bug number 10266. | 2023-12-11 19:28:44 +08:00 |  | 
			
				
					| 
							
							
								 payton | 44b2c1d8a2 | 1.SendType宏定义更改 | 2023-12-11 19:18:28 +08:00 |  | 
			
				
					| 
							
							
								 payton | fd7f905912 | 1.修复短信设置SendType | 2023-12-11 19:18:09 +08:00 |  |