| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							4015d47723
							
						
					 | 
					
						
						
							
							1.蓝牙业务
						
						
						
						
						
					 | 
					
						2023-10-18 11:09:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2e697ed1e
							
						
					 | 
					
						
						
							
							1.增加蓝牙ssid;
						
						
						
						
						
						
						
						2调整分区 
						
					 | 
					
						2023-10-18 11:07:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba9623cb6f
							
						
					 | 
					
						
						
							
							1.修复文件系统扩展问题
						
						
						
						
						
					 | 
					
						2023-10-18 11:06:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								antony.wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fbf6d07bc
							
						
					 | 
					
						
						
							
							1. 修改24M, 32M,40M分辨率
						
						
						
						
						
					 | 
					
						2023-10-18 10:14:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							07e0c59ab9
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug
						
						
						
						
						
					 | 
					
						2023-10-17 21:16:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyj
							
						 
					 | 
					
						
						
						
						
							
						
						
							f67eb52c26
							
						
					 | 
					
						
						
							
							add debug log
						
						
						
						
						
					 | 
					
						2023-10-17 21:15:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be0fcb06c1
							
						
					 | 
					
						
						
							
							Add qrcode show function.
						
						
						
						
						
					 | 
					
						2023-10-17 21:10:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d64183720
							
						
					 | 
					
						
						
							
							Improve preview screen.
						
						
						
						
						
					 | 
					
						2023-10-17 11:41:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								antony.wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6918ec81d
							
						
					 | 
					
						
						
							
							1.修改设置指令重复导致执行错位问题.
						
						
						
						
						
						
						
						2.修改版本号.
3.修改机审编译脚本. 
						
					 | 
					
						2023-10-17 10:05:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b1176dc336
							
						
					 | 
					
						
						
							
							Backup switch setting code.
						
						
						
						
						
					 | 
					
						2023-10-17 09:08:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							c332c5873f
							
						
					 | 
					
						
						
							
							Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast
						
						
						
						
						
					 | 
					
						2023-10-16 21:14:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							d969598271
							
						
					 | 
					
						
						
							
							1.蓝牙用户
						
						
						
						
						
					 | 
					
						2023-10-16 20:49:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							57c4457306
							
						
					 | 
					
						
						
							
							1.增加两个cmd
						
						
						
						
						
					 | 
					
						2023-10-16 20:48:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								payton
							
						 
					 | 
					
						
						
						
						
							
						
						
							3363f6b6d1
							
						
					 | 
					
						
						
							
							1.修改sd卡循环
						
						
						
						
						
					 | 
					
						2023-10-16 17:26:50 +08:00 | 
					
					
						
						
							
							
							
						
					 |