| 
						
					 | 
					
						
						
						
						
							
						
						
							ad18b96aa0
							
						
					 | 
					
						
						
							
							Add long press event.
						
						
						
						
						
					 | 
					
						2023-10-27 16:53:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fca55f1bf2
							
						
					 | 
					
						
						
							
							Merge code of ding to fix setting item callback function bug.
						
						
						
						
						
					 | 
					
						2023-10-27 10:19:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1f02d965c0
							
						
					 | 
					
						
						
							
							Fixed bug about settings.
						
						
						
						
						
					 | 
					
						2023-10-26 19:41:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37aff7d963
							
						
					 | 
					
						
						
							
							Fixed a bug about setting password.
						
						
						
						
						
					 | 
					
						2023-10-26 17:48:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6fec7f0960
							
						
					 | 
					
						
						
							
							Fixed a bug about setting date and time.
						
						
						
						
						
					 | 
					
						2023-10-26 16:42:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9aa98e2a3
							
						
					 | 
					
						
						
							
							Setting date and time ok.
						
						
						
						
						
					 | 
					
						2023-10-26 16:33:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f8d1b1c298
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui
						
						
						
						
						
					 | 
					
						2023-10-26 15:24:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7324e477b2
							
						
					 | 
					
						
						
							
							Setting send type ok.
						
						
						
						
						
					 | 
					
						2023-10-26 15:24:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								antony.wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3791d1bf87
							
						
					 | 
					
						
						
							
							1. 为避免cardv进程偶发不能起来,修改message名称,避免和cardv进程名称重合
						
						
						
						
						
					 | 
					
						2023-10-26 15:19:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3969e2d00
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug
						
						
						
						
						
					 | 
					
						2023-10-26 14:41:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c3672cafa
							
						
					 | 
					
						
						
							
							初步完成软件升级,模块升级,设备重置功能
						
						
						
						
						
					 | 
					
						2023-10-26 14:39:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							3468be7600
							
						
					 | 
					
						
						
							
							添加部分文字资源
						
						
						
						
						
					 | 
					
						2023-10-26 14:02:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37ab151fa1
							
						
					 | 
					
						
						
							
							Setting send type function.
						
						
						
						
						
					 | 
					
						2023-10-26 11:42:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35fe03f9f4
							
						
					 | 
					
						
						
							
							Fixed a bug of date and time icon.
						
						
						
						
						
					 | 
					
						2023-10-25 17:42:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							649e52d885
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui
						
						
						
						
						
					 | 
					
						2023-10-25 15:57:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2e1ac0fd8a
							
						
					 | 
					
						
						
							
							Improve setting screen.
						
						
						
						
						
					 | 
					
						2023-10-25 15:57:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8027138af
							
						
					 | 
					
						
						
							
							1.实现设置界面的SD卡格式化的功能
						
						
						
						
						
					 | 
					
						2023-10-25 15:29:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							12955a038b
							
						
					 | 
					
						
						
							
							Fixed bug about setting screen.
						
						
						
						
						
					 | 
					
						2023-10-25 11:39:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5610dd477c
							
						
					 | 
					
						
						
							
							Merge branch 'branch_s550_fast_gui' into branch_s550_fast
						
						
						
						
						
					 | 
					
						2023-10-24 21:08:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							57e212d083
							
						
					 | 
					
						
						
							
							Improve setting screen.
						
						
						
						
						
					 | 
					
						2023-10-24 21:06:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3956f5fb3
							
						
					 | 
					
						
						
							
							Merge branch 'branch_s550_fast_gui' into branch_s550_fast
						
						
						
						
						
					 | 
					
						2023-10-24 20:12:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b43e32fb3d
							
						
					 | 
					
						
						
							
							Merge code of ding.
						
						
						
						
						
					 | 
					
						2023-10-24 20:06:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e997d66904
							
						
					 | 
					
						
						
							
							Fixed compile bug about front.
						
						
						
						
						
					 | 
					
						2023-10-24 19:04:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							44f25bb757
							
						
					 | 
					
						
						
							
							1.同步连拍漏图问题
						
						
						
						
						
					 | 
					
						2023-10-24 18:06:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							109f4b29f8
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui
						
						
						
						
						
					 | 
					
						2023-10-24 17:39:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2851e26f42
							
						
					 | 
					
						
						
							
							Improve password screen.
						
						
						
						
						
					 | 
					
						2023-10-24 17:35:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							e82393a5d6
							
						
					 | 
					
						
						
							
							1.esim卡的iccid
						
						
						
						
						
					 | 
					
						2023-10-24 17:10:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ce822975c
							
						
					 | 
					
						
						
							
							1.软升级改到uboot下
						
						
						
						
						
					 | 
					
						2023-10-24 17:08:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2c157c5ec
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug
						
						
						
						
						
					 | 
					
						2023-10-24 10:43:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							116f1377e2
							
						
					 | 
					
						
						
							
							1.SD卡格式化相关字符串添加
						
						
						
						
						
					 | 
					
						2023-10-24 10:40:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							feb9db88c6
							
						
					 | 
					
						
						
							
							Fixed bug about comfirm screen.
						
						
						
						
						
					 | 
					
						2023-10-23 20:46:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3275513a5
							
						
					 | 
					
						
						
							
							Add password screen.
						
						
						
						
						
					 | 
					
						2023-10-23 17:06:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							510b11920d
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui
						
						
						
						
						
					 | 
					
						2023-10-23 14:36:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2f2ee6c278
							
						
					 | 
					
						
						
							
							Fixed bug when open play screen.
						
						
						
						
						
					 | 
					
						2023-10-23 14:35:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							e274d2035b
							
						
					 | 
					
						
						
							
							1.完成设置菜单中的密码功能
						
						
						
						
						
					 | 
					
						2023-10-23 14:31:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a4ce6f506
							
						
					 | 
					
						
						
							
							1.删除文件功能完成
						
						
						
						
						
						
						
						2.完成设置界面部分功能 
						
					 | 
					
						2023-10-23 11:30:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							74062bd831
							
						
					 | 
					
						
						
							
							完成General页面的Operating Time功能
						
						
						
						
						
					 | 
					
						2023-10-21 15:05:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bad061dfb
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_Fast' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug
						
						
						
						
						
					 | 
					
						2023-10-21 13:44:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b19ea7fcf
							
						
					 | 
					
						
						
							
							完成General页面的Delay功能,修改二级菜单按钮逻辑
						
						
						
						
						
					 | 
					
						2023-10-21 13:42:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9d2903ad3
							
						
					 | 
					
						
						
							
							1.蓝牙业务调整
						
						
						
						
						
						
						
						2.log记录修改,调整log 
						
					 | 
					
						2023-10-20 20:30:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							a632b57a78
							
						
					 | 
					
						
						
							
							修复UI中对消息的错误处理
						
						
						
						
						
					 | 
					
						2023-10-20 17:06:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f935f16ea
							
						
					 | 
					
						
						
							
							Merge setting screen code.
						
						
						
						
						
					 | 
					
						2023-10-20 12:49:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5058da280
							
						
					 | 
					
						
						
							
							finish QR General
						
						
						
						
						
					 | 
					
						2023-10-20 11:52:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42874c5574
							
						
					 | 
					
						
						
							
							Improve comfirm screen.
						
						
						
						
						
					 | 
					
						2023-10-20 11:41:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							94afaa5317
							
						
					 | 
					
						
						
							
							Merge gui code.
						
						
						
						
						
					 | 
					
						2023-10-19 17:30:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fbb055c289
							
						
					 | 
					
						
						
							
							Auto Off time show.
						
						
						
						
						
					 | 
					
						2023-10-19 17:19:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9373577880
							
						
					 | 
					
						
						
							
							GUI show auto off time.
						
						
						
						
						
					 | 
					
						2023-10-19 13:51:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							f307b3bc13
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug
						
						
						
						
						
					 | 
					
						2023-10-19 11:19:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							9313451aa3
							
						
					 | 
					
						
						
							
							1.General Page parameter save
						
						
						
						
						
						
						
						2.Complete CamInfo Option 
						
					 | 
					
						2023-10-19 11:18:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4dffcd1c1
							
						
					 | 
					
						
						
							
							Improve play screen.
						
						
						
						
						
					 | 
					
						2023-10-18 17:19:21 +08:00 | 
					
					
						
						
							
							
							
						
					 |