| 
							
							
								 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 | 47674661ea | 1.ota cmd优化 | 2023-12-18 16:29:54 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7bc6174a29 | 1.emmc合并修改 | 2023-12-18 16:18:40 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4712e1078b | 1.更改sensor镜像 | 2023-12-18 16:09:22 +08:00 |  | 
			
				
					| 
							
							
								 payton | a32f7c314a | 1.1进入setup使用reboot重启系统 | 2023-12-18 13:56:32 +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 |  | 
			
				
					| 
							
							
								 payton | d2fddee5db | 1.sensor翻转 | 2023-12-12 19:21:28 +08:00 |  | 
			
				
					| 
							
							
								 payton | f34dadb180 | 1.wifi驱动 | 2023-12-12 19:20:38 +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 |  | 
			
				
					| 
							
							
								 payton | 9006d37230 | 1.修复蓝牙和WiFi设置sendtype | 2023-12-11 19:17:39 +08:00 |  | 
			
				
					| 
							
							
								 payton | 3bf5f784e0 | 1.优化注网代码 | 2023-12-11 19:17:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f7a938c374 | Fixed bug number 10369. | 2023-12-11 16:59:16 +08:00 |  | 
			
				
					| 
							
							
								 payton | 2b7af14a19 | 1.Linux下电池检测调整 | 2023-12-11 15:56:34 +08:00 |  | 
			
				
					| 
							
							
								 payton | 279907d8f8 | 1.dp生成修改 | 2023-12-11 15:56:09 +08:00 |  | 
			
				
					| 
							
							
								 payton | d71f1a88e4 | 1.修改ui参数打印 | 2023-12-11 15:55:29 +08:00 |  | 
			
				
					| 
							
							
								 payton | d5657b81c5 | 1.修复DebugMode开启后看门狗问题 | 2023-12-11 15:55:10 +08:00 |  | 
			
				
					| 
							
							
								 payton | fdfbc22659 | 1.异常处理优化 | 2023-12-11 15:54:22 +08:00 |  | 
			
				
					| 
							
							
								 payton | 36698eb868 | 1.短信指令支持ftp开关修改 | 2023-12-11 15:53:46 +08:00 |  | 
			
				
					| 
							
							
								 payton | bb49625dbf | 1.优化模块睡眠流程 | 2023-12-11 15:53:18 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | ac74e6d5db | Fixed bug number 9763. | 2023-12-08 17:56:01 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | ccec0201e2 | Fixed bug number 10454. | 2023-12-08 17:09:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 1514cc5823 | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-12-08 15:47:28 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 43cd5a0844 | Cancel code of ding about item screen. | 2023-12-08 15:45:46 +08:00 |  | 
			
				
					| 
							
							
								 payton | e8c8e11222 | 1.修改视频水印时间格式 | 2023-12-08 15:42:00 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | c3891c3ac5 | Fixed bug about gps switch. | 2023-12-08 15:23:33 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 65e8c9f67b | Merge code of ding about playback screen. | 2023-12-08 15:18:58 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f170293da0 | Megre code of ding to fixed disable item. | 2023-12-08 14:42:57 +08:00 |  | 
			
				
					| 
							
							
								 payton | b26ce942c4 | 1.1.ui关闭后设置错误的date编译报错 | 2023-12-08 14:39:24 +08:00 |  | 
			
				
					| 
							
							
								 payton | ca4f2bded6 | 1.ui关闭后设置错误的date | 2023-12-08 09:51:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 61ccc09bee | Fixed bug number 10297. | 2023-12-08 09:23:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8d1e130df8 | Fixed bug number 10492. | 2023-12-07 17:30:38 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 93ce51c6c3 | Fixed bug about sending show. | 2023-12-07 17:08:10 +08:00 |  | 
			
				
					| 
							
							
								 payton | 2ecffd7895 | 1.增加log关闭 | 2023-12-07 16:18:00 +08:00 |  | 
			
				
					| 
							
							
								 payton | df8cb7848d | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast | 2023-12-07 16:17:37 +08:00 |  | 
			
				
					| 
							
							
								 payton | e7f30cec59 | 1.log时间改rtc | 2023-12-07 16:17:11 +08:00 |  | 
			
				
					| 
							
							
								 payton | f7a2b7c45a | 1.修复cpu高占用问题 | 2023-12-07 16:15:29 +08:00 |  | 
			
				
					| 
							
							
								 payton | 93990c03a1 | 1.修复tty读取不完整的问题 | 2023-12-07 15:56:49 +08:00 |  | 
			
				
					| 
							
							
								 payton | 409b49d5dd | 1.优化关机读取sd卡信息;2.优化短信读取流程 | 2023-12-07 15:55:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 708b1f0427 | Fixed bug number 10155. | 2023-12-07 14:07:19 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3a5d6379b3 | Fixed bug number 10414. | 2023-12-07 13:39:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8d32ca76f1 | Fixed bug number 10033. | 2023-12-07 10:57:11 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8b723b54b4 | Fixed bug about max num/day. | 2023-12-07 09:39:56 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7874a6336e | 1.修复模块初始化可能出现at超时问题 | 2023-12-07 09:10:04 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f5ee68317b | Fixed bug number 10292. | 2023-12-06 17:49:35 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | d63f994fff | 7MR5RCwDC01 | 2023-12-06 17:02:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 7658426211 | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-12-06 16:32:25 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 40928b1734 | Fixed bug number 10169. | 2023-12-06 16:28:29 +08:00 |  | 
			
				
					| 
							
							
								 payton | ec08ee6bc4 | 1.修改sd卡读取判断 | 2023-12-06 15:32:15 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f7c3bc0dff | Fixed bug number 10174. | 2023-12-06 14:31:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 29b3ede6a7 | Fixed bug number 10297. | 2023-12-06 14:14:55 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8f58fd4c10 | Fixed bug about connected to app. | 2023-12-06 13:50:59 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 40ad7ab06d | Modify string id. | 2023-12-06 11:37:22 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | ffbec498fd | Fixed bug about play back screen. | 2023-12-06 09:38:26 +08:00 |  | 
			
				
					| 
							
							
								 payton | 5c73903ff2 | 1.修复短信指令和dp文件的短信指令 | 2023-12-05 18:08:17 +08:00 |  | 
			
				
					| 
							
							
								 payton | 20d7862827 | 1.更改超时时间 | 2023-12-05 17:04:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9e9c365487 | Fixed bug number 9537. | 2023-12-05 16:42:29 +08:00 |  | 
			
				
					| 
							
							
								 payton | dc9361e272 | 1.修复exfat卡文件系统问题 | 2023-12-05 11:30:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | a3015a5e1a | Fixed bug number 10204. | 2023-12-05 11:21:22 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3f8febd903 | Fixed bug number 10214. | 2023-12-05 10:02:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6defbcaf60 | Fixed bug when delete video in the end. | 2023-12-04 17:41:35 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | b303800a68 | Improve netword select fuction when open usb device failed. | 2023-12-04 16:49:23 +08:00 |  | 
			
				
					| 
							
							
								 payton | 17f1537ef9 | 1.屏蔽掉一些log | 2023-12-04 16:17:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | bc7c1c583f | Improve network select fuciton. | 2023-12-04 16:14:25 +08:00 |  | 
			
				
					| 
							
							
								 payton | 714ae53626 | 1.WiFi gop改成8 | 2023-12-04 14:36:45 +08:00 |  | 
			
				
					| 
							
							
								 payton | 1842060c8e | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast | 2023-12-04 14:33:22 +08:00 |  | 
			
				
					| 
							
							
								 payton | c794f5903a | 1.同步DS05 水印bug;2.去掉IQ test升级调试;3.同步DS05 IQ参数修改 | 2023-12-04 14:32:58 +08:00 |  | 
			
				
					| 
							
							
								 payton | 6809f6646a | 1.Linux修改:视频水印改为与图片水印一样; | 2023-12-04 14:30:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 59dcff9209 | Improve sim card check bug. | 2023-12-04 11:32:23 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f99a2c2123 | version:7MR5RCwDB08 | 2023-12-01 15:54:43 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9d59abbafd | Merge Branch_S550_Fast. | 2023-12-01 15:37:19 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 54a7d4f99a | Fixed bug number 10209. | 2023-12-01 14:41:59 +08:00 |  | 
			
				
					| 
							
							
								 payton | 84b7b973dc | 1.wifi状态和菜单切换更改 | 2023-12-01 14:27:52 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 0722c013ba | Fixed bug number 10154. | 2023-12-01 14:23:16 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 76501880ea | Fixed bug number 10191. | 2023-12-01 14:07:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 1b59e48eec | Fixed bug number 10178. | 2023-12-01 13:54:50 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 52949309db | Backup. | 2023-12-01 11:45:10 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | aec1448c3e | Improve 4g module message on photo screen. | 2023-12-01 09:37:54 +08:00 |  | 
			
				
					| 
							
							
								 payton | 38743429cd | 1.修复WiFi和蓝牙设置集中发送 | 2023-11-30 19:17:29 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9c13bba056 | Improve connected tips. | 2023-11-30 17:44:01 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 692ac34754 | Fixed bug number 9848. | 2023-11-30 15:21:50 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | e70f5a9f7a | Fixed bug number 9839. | 2023-11-30 11:30:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3d9aca4688 | Fixed bug number 9783. | 2023-11-30 11:23:00 +08:00 |  | 
			
				
					| 
							
							
								 payton | 9cdfda03f5 | 1.sd卡循环增加异常目录处理,错误5次退出 | 2023-11-29 18:03:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8633eba5e7 | Fixed bug number 10227. | 2023-11-29 17:47:59 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9e79a73907 | Fixed bug number 10226. | 2023-11-29 17:01:45 +08:00 |  | 
			
				
					| 
							
							
								 payton | 087c51cca8 | 1.连接蓝牙时也需要退出到预览 | 2023-11-29 16:50:51 +08:00 |  | 
			
				
					| 
							
							
								 payton | 2271f29b65 | 1.优化发送流程:自动模式下B启动和Instant时无需执行模块init,直接进行注网流程 2.8和a启动无线进行usb net初始化
3.优化ip检测代码加快检测频率 | 2023-11-29 14:59:27 +08:00 |  | 
			
				
					| 
							
							
								 payton | abb834c296 | 1.优化注网代码;2.去掉一些log | 2023-11-29 14:50:43 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3695ed95c1 | Disable setup date time screen. | 2023-11-29 14:18:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6c3a10fe9d | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-29 11:39:51 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 5bb1d3983c | Fixed bug number 10195. | 2023-11-29 11:38:07 +08:00 |  | 
			
				
					| 
							
							
								 payton | 24c8b031ec | 1.LI_PACK | 2023-11-29 10:14:16 +08:00 |  | 
			
				
					| 
							
							
								 payton | e73791c1c1 | 1.优化锂电池盒插入 | 2023-11-29 09:51:10 +08:00 |  | 
			
				
					| 
							
							
								 payton | 054b0e9aac | 1.修复date time | 2023-11-29 09:50:38 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | e2a30ba440 | Fixed bug number 9820. | 2023-11-28 17:29:14 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f785b8031b | Fixed bug number 10190. | 2023-11-28 17:04:51 +08:00 |  | 
			
				
					| 
							
							
								 payton | d434287eeb | 1.长按关机和密码界面按错10次关机 | 2023-11-28 15:21:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8ceea2da17 | Fixed bug number 10174. | 2023-11-28 14:28:08 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6a8f98821b | Fixed bug number 10169. | 2023-11-28 10:47:56 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4f11c19e55 | 1.修复dp带图无法发送关机问题 | 2023-11-28 10:08:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f9e4f75921 | Fixed bug number 9518. | 2023-11-28 09:39:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 58edb09d0b | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-27 18:42:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | fa0d2c61a3 | Fixed bug about memory. | 2023-11-27 18:41:06 +08:00 |  | 
			
				
					| 
							
							
								 payton | af9263c995 | 1.WiFi链接后不进入回放 | 2023-11-27 16:51:28 +08:00 |  | 
			
				
					| 
							
							
								 payton | 43ed123735 | 1.wifi链接后退出到预览界面 | 2023-11-27 16:51:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 44fbdd9531 | Fixed bug about no sd card text. | 2023-11-27 15:22:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | b7989f72b0 | Fixed bug number 9730. | 2023-11-27 13:41:49 +08:00 |  | 
			
				
					| 
							
							
								 payton | ee09338f59 | 1.修复WiFi点击拍照发图问题 | 2023-11-27 11:49:59 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0ef0217d0f | 1.date time默认值更改 | 2023-11-27 11:14:36 +08:00 |  | 
			
				
					| 
							
							
								 payton | 96110bbc3f | 1.发送限制调整 | 2023-11-27 11:14:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 71174fa690 | Improve movie screen. | 2023-11-27 10:49:58 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 78c389bc4f | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-24 17:40:54 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | c03e1abcc0 | Fixed check sim show bug. | 2023-11-24 17:38:03 +08:00 |  | 
			
				
					| 
							
							
								 payton | 38840befb6 | 1.同步DS05 IQ更改 | 2023-11-24 16:56:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | b99d29fb10 | Improve photo screen. | 2023-11-24 16:16:57 +08:00 |  | 
			
				
					| 
							
							
								 payton | 40a52dc31c | 1.mcu升级功能 | 2023-11-24 14:56:27 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 758c4f3cf2 | Fixed password screen bug. | 2023-11-24 14:28:49 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 602408f817 | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-24 14:15:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | e2d55b0a38 | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-24 13:41:35 +08:00 |  | 
			
				
					| 
							
							
								 payton | d377144dc9 | 1.中间文件更改 | 2023-11-24 10:12:47 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0c835f714d | 1.修复插入usb识别问题 | 2023-11-24 10:11:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | e4b6218cb3 | Fixed usb pc acm bug. | 2023-11-24 09:46:23 +08:00 |  | 
			
				
					| 
							
							
								 zyj | cb484d4361 | 完成预览界面下键显示信息的功能 | 2023-11-23 20:17:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 0151154d73 | Fixed string id bug. | 2023-11-23 19:47:38 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 54871795a2 | Fixed bug about confirm screen. | 2023-11-23 19:37:26 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | bc7012c979 | Fixed delete pic bug. | 2023-11-23 17:44:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 628b062d25 | Fixed bug about send type setting. | 2023-11-23 17:22:33 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6ff5c2c0e4 | Fixed bug about message screen. | 2023-11-23 17:06:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 6510f272da | Fixed bug about message screen. | 2023-11-23 16:28:57 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0d75e82d10 | 1.exfat工具支持 | 2023-11-23 15:48:05 +08:00 |  | 
			
				
					| 
							
							
								 payton | a685df607b | 1.exfat支持 | 2023-11-23 15:45:32 +08:00 |  | 
			
				
					| 
							
							
								 payton | ee41d9c0bd | 1.qlog优化 | 2023-11-23 15:41:13 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | f6816d00ea | Fixed bug about string and button matrix. | 2023-11-23 15:39:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 38c4cd3366 | Fixed bug of message screen. | 2023-11-23 14:56:57 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 866df35bd6 | Fixed bug number 10057. | 2023-11-23 14:26:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 9b5295f7be | Fixed bugs. | 2023-11-23 11:48:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | a5205f8f17 | Fixed bug number 9952. | 2023-11-23 10:31:35 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | be3a706681 | Fixed color of disable item bug. | 2023-11-23 09:53:25 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 7771d8e7a6 | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-23 09:13:31 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 4a25f8d061 | 1.完善网络切换功能 | 2023-11-22 21:07:34 +08:00 |  | 
			
				
					| 
							
							
								 payton | 1ee469df69 | 1.ver:7MR5RCwDB06 | 2023-11-22 19:27:52 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7dab6026f6 | 1.QLogSwitch和DebugMode互联 | 2023-11-22 19:14:54 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | cbd2ecee70 | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-22 18:09:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 90fe083170 | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast | 2023-11-22 18:09:33 +08:00 |  | 
			
				
					| 
							
							
								 payton | d9a008e5f2 | 1.gps文件路径更改 | 2023-11-22 18:07:46 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | fe345dd675 | Upgrade item disable ok. | 2023-11-22 18:07:39 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4847a8db9a | 1.注网时间改90s;2.优化模块初始化代码 | 2023-11-22 18:07:19 +08:00 |  | 
			
				
					| 
							
							
								 payton | 6a303efec9 | 1.rtsp标识更改 | 2023-11-22 18:05:45 +08:00 |  | 
			
				
					| 
							
							
								 payton | 13de078eaa | 1.发送限制;2.rtsp配置调整 | 2023-11-22 18:02:54 +08:00 |  | 
			
				
					| 
							
							
								 payton | 2e274f4f7f | 1.去掉一些log | 2023-11-22 17:59:16 +08:00 |  | 
			
				
					| 
							
							
								 payton | 3560751dcf | 1.gps发送更改;2.修改发送标识 | 2023-11-22 17:58:15 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8941bb0a52 | Fixed play screen bug and setting disable item ok. | 2023-11-22 16:51:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 37e8b2a006 | Backup. | 2023-11-22 14:57:33 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 71c4f3351a | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast | 2023-11-21 16:31:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 08de3740d2 | Fixed setting screen bug about left key long pressing. | 2023-11-21 16:29:35 +08:00 |  | 
			
				
					| 
							
							
								 payton | 381c3a282a | 1.IQ test 默认参数更改 | 2023-11-21 16:08:50 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0eb9afd500 | 1.修复Dailyreport发送问题 | 2023-11-21 15:50:38 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0de21b91f9 | 1.IQ test修改 | 2023-11-21 15:50:18 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7e1a981282 | 1.ver:7MR5RCwDB05 | 2023-11-21 10:21:09 +08:00 |  | 
			
				
					| 
							
							
								 payton | 911d0f3666 | 1.增加mcu dbg | 2023-11-21 10:20:53 +08:00 |  | 
			
				
					| 
							
							
								 payton | f90c8c3d97 | 1.增加SD卡报警功能 | 2023-11-21 10:16:50 +08:00 |  | 
			
				
					| 
							
							
								 payton | 7b4e3fed49 | 1.优化log | 2023-11-21 10:10:40 +08:00 |  | 
			
				
					| 
							
							
								 payton | 42693f9133 | 1.优化cardv和sf app获取mcu信息 | 2023-11-20 11:35:50 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 182c6ea68a | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-17 19:02:51 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | a4267d55f2 | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast | 2023-11-17 19:02:42 +08:00 |  | 
			
				
					| 
							
							
								 payton | 31642e05d2 | 1.修复温度水印开机时无的问题 | 2023-11-17 18:46:28 +08:00 |  | 
			
				
					| 
							
							
								 payton | cb10217e93 | 1.更改时间格式默认值 | 2023-11-17 18:45:54 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8c65e77e79 | Fixed bug number 9948. | 2023-11-17 17:44:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 090f1c8c56 | Fixed bug about wifi icon. | 2023-11-17 16:52:25 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | d1e5415cba | Fixed bluetooth icon bug. | 2023-11-17 16:34:11 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 2ebbd47d4b | Fixed bug about images message. | 2023-11-17 15:41:47 +08:00 |  | 
			
				
					| 
							
							
								 payton | 07dd4e5260 | 1.关机画面 | 2023-11-17 15:39:34 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 16a0071368 | Fixed bug about date and time. | 2023-11-17 15:19:28 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | d8c26975bd | Fixed bug of password screen. | 2023-11-17 14:47:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 7f2b5dfcc0 | Closing screen ok. | 2023-11-17 14:21:00 +08:00 |  | 
			
				
					| 
							
							
								 payton | 81aa242fba | 1.ver:7MR5RCwDB04 2.开启SF_NO_SD_SEND | 2023-11-17 11:15:26 +08:00 |  | 
			
				
					| 
							
							
								 payton | d3745ff4aa | 1.SD卡删除空文件夹 | 2023-11-17 11:14:36 +08:00 |  | 
			
				
					| 
							
							
								 payton | 0424017f99 | 1.p+v更改 | 2023-11-16 20:14:14 +08:00 |  | 
			
				
					| 
							
							
								 payton | 500637db5b | 1.p+vWiFi蓝牙更改 | 2023-11-16 20:14:08 +08:00 |  | 
			
				
					| 
							
							
								 payton | d0e99d5bef | 1.p+V菜单更改 | 2023-11-16 20:12:14 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 295ac6478e | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast | 2023-11-16 18:54:39 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | bee5c1540f | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-16 18:51:39 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 754d4214e0 | 添加确认框信息 | 2023-11-16 18:49:59 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8590c978c9 | Improve password screen. | 2023-11-16 18:49:41 +08:00 |  | 
			
				
					| 
							
							
								 payton | 1d7c12fddb | 1.修复开机预览出图编译 | 2023-11-16 17:41:03 +08:00 |  | 
			
				
					| 
							
							
								 payton | d973040350 | 1.修复WiFi和蓝牙设置cam id 2.修复WiFi下图问题 | 2023-11-16 17:40:52 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 573564a02b | Close screen backup. | 2023-11-16 16:02:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | dafa9cddb4 | Add close screen. | 2023-11-16 15:00:06 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 79f0680b33 | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-16 11:07:48 +08:00 |  |