| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 zyj | db25078bfa | 1.在builder添加所需资源 2.在确认框打开处调整样式
3.解决消息框弹出后,btn字体错误的问题 | 2023-11-16 11:04:11 +08:00 |  | 
			
				
					| 
							
							
								 payton | d7e25d17d1 | 1.增加log等级设置 | 2023-11-16 09:55:25 +08:00 |  | 
			
				
					| 
							
							
								 payton | 57d0359554 | 1.mem编译选项 | 2023-11-16 09:55:14 +08:00 |  | 
			
				
					| 
							
							
								 payton | 05803937c0 | 1.显示预览时增加log查看时间 | 2023-11-16 09:55:07 +08:00 |  | 
			
				
					| 
							
							
								 payton | 75bff8a174 | 1.电池盒切换类型 | 2023-11-16 09:55:01 +08:00 |  | 
			
				
					| 
							
							
								 payton | 95e8020192 | 1.mem发图测试代码 | 2023-11-16 09:54:50 +08:00 |  | 
			
				
					| 
							
							
								 payton | 5df191f658 | 1.mem取图 | 2023-11-16 09:54:05 +08:00 |  | 
			
				
					| 
							
							
								 payton | 096a5d3f97 | 1.调整log | 2023-11-16 09:53:11 +08:00 |  | 
			
				
					| 
							
							
								 payton | 878b5bc8a2 | 1.增加mem存图代码 | 2023-11-16 09:53:04 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 821028dede | Fixed bug number 9751. | 2023-11-15 17:41:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 03673dad1a | Improve password screen. | 2023-11-15 17:09:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 4640033758 | Merge code of ding. | 2023-11-15 11:16:56 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 8d7033a548 | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-15 09:27:22 +08:00 |  | 
			
				
					| 
							
							
								 payton | 33dec69bff | 1.修改log | 2023-11-14 19:23:24 +08:00 |  | 
			
				
					| 
							
							
								 payton | a60cfa1acf | 1.更改gps 相关内容 | 2023-11-14 19:22:35 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4a7e905855 | 1.4G标识优化 | 2023-11-14 19:21:44 +08:00 |  | 
			
				
					| 
							
							
								 payton | d7e783bdc6 | 1.更改SendMaxNum限制 | 2023-11-14 19:21:18 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 7c23947404 | Fixed msg screen bug. | 2023-11-14 19:21:09 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | c59a619b51 | Improve password screen function. | 2023-11-14 17:20:11 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | ea09cd8860 | Improve send type setting. | 2023-11-14 11:46:47 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 00a0d25ff9 | Improve send type setting. | 2023-11-13 19:31:57 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 00c432d029 | Fixed bug about send type. | 2023-11-13 18:56:40 +08:00 |  | 
			
				
					| 
							
							
								 zyj | fa22fbab45 | 完善Sensitivity功能 | 2023-11-13 17:14:52 +08:00 |  | 
			
				
					| 
							
							
								 zyj | b5d4e8f727 | 在builder中添加所需资源 | 2023-11-13 17:14:04 +08:00 |  | 
			
				
					| 
							
							
								 payton | cfb6bdd395 | 1.cardv启动首次不加载usb ko,在sfapp加载 | 2023-11-13 16:53:26 +08:00 |  | 
			
				
					| 
							
							
								 payton | ec944cd1db | 1.开启log记录功能 | 2023-11-13 16:51:54 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 49a5c30da4 | 完善sensitivity功能及UI | 2023-11-13 15:56:03 +08:00 |  | 
			
				
					| 
							
							
								 payton | d1ce4e56c5 | 1.修改可能出现漏发送问题 | 2023-11-13 15:42:19 +08:00 |  | 
			
				
					| 
							
							
								 payton | 65ccdbc3fb | 1.setup下再加载蓝牙模块 | 2023-11-13 15:41:26 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 62d6ab47ff | Fixed bug number 9751. | 2023-11-13 15:21:22 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 52bd40f539 | Fixed bug number 9913. | 2023-11-13 13:38:38 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | de5a8e8e3c | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-10 19:07:42 +08:00 |  | 
			
				
					| 
							
							
								 payton | cfed656433 | 1.修改dp在P+V中只拍图发送 | 2023-11-10 19:00:59 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4d8a071757 | 1.修复dp发送带图 | 2023-11-10 19:00:22 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 634b2e06f6 | Sync branch_s550_to_s530 | 2023-11-10 19:00:00 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 095d4afe0d | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-10 18:55:30 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 13665cca5e | Sync Branch_S550. | 2023-11-10 18:49:11 +08:00 |  | 
			
				
					| 
							
							
								 payton | ec264793ea | 1.屏蔽新P+V蓝牙和WiFi的设置 | 2023-11-10 18:33:21 +08:00 |  | 
			
				
					| 
							
							
								 zyj | c3ba572d50 | 1.修改设置菜单的部分问题 2.完成生成CAM_INFO.txt和QR.BMP的功能 | 2023-11-10 18:22:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 5481dd9b5f | Fixed bug about play screen. | 2023-11-10 17:05:45 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 37f7cd1481 | Add sending picture message in ui. | 2023-11-10 16:37:10 +08:00 |  | 
			
				
					| 
							
							
								 payton | 4ac8c0fb7d | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast | 2023-11-10 15:58:58 +08:00 |  | 
			
				
					| 
							
							
								 payton | c6a6f96575 | 1.wifi预览缩略图更改 | 2023-11-10 15:58:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | befc2d0c0d | Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast | 2023-11-09 19:16:18 +08:00 |  | 
			
				
					| 
							
							
								 payton | c5f3229efe | 1.优化utc、ntp | 2023-11-09 19:08:59 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | fe374bb97b | Merge branch 'branch_s550_gui' into branch_s550_fast | 2023-11-09 19:08:25 +08:00 |  | 
			
				
					| 
							
							
								 payton | 87d09196c7 | 1.默认更改为1月 | 2023-11-09 19:07:11 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 72406b5e5a | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-09 17:07:45 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 56fa8c1548 | Fixed bug about image size show. | 2023-11-09 17:07:35 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 487d66c1f4 | 在Builder中添加所需资源 | 2023-11-09 16:24:01 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 989cde7238 | 完善Date&Time的UI | 2023-11-09 16:07:06 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | e8f932ecb1 | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-09 14:46:11 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 3e1ec06d9c | Fixed bug about auto shutdown. | 2023-11-09 14:45:56 +08:00 |  | 
			
				
					| 
							
							
								 payton | 750df328ea | 1.更改版本7M开头 | 2023-11-09 14:35:30 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 5c14360b7a | 完善Delay功能及UI | 2023-11-09 14:10:23 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 3ca10087ad | 完善Operating Time功能及UI | 2023-11-09 12:39:06 +08:00 |  | 
			
				
					| 
							
							
								 zyj | d963512fe1 | 完善Sensitivity的UI显示 | 2023-11-09 10:15:09 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 105521f234 | Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui | 2023-11-08 20:25:20 +08:00 |  | 
			
				
					| 
							
							
								 xiaojiazhu | 03ba4e7249 | Fixed bug number 9727. | 2023-11-08 20:25:05 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 0193784396 | 完善Password功能 | 2023-11-08 20:23:40 +08:00 |  | 
			
				
					| 
							
							
								 zyj | 6053e38e26 | Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug | 2023-11-08 17:48:11 +08:00 |  | 
			
				
					| 
							
							
								 zyj | f0e25f7fbf | 完善CamName功能 | 2023-11-08 17:46:58 +08:00 |  | 
			
				
					| 
							
							
								 payton | e7c9b61e69 | 1.修改sms短信指令 | 2023-11-08 16:41:37 +08:00 |  |