| 
						
					 | 
					
						
						
						
						
							
						
						
							43a673fa4f
							
						
					 | 
					
						
						
							
							设备注册修改
						
						
						
						
						
						
					 | 
					
						2024-07-17 10:19:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9be42f086
							
						
					 | 
					
						
						
							
							host配置修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:23:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90133c0729
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-09 11:11:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22acd782b9
							
						
					 | 
					
						
						
							
							表修改
						
						
						
						
						
						
					 | 
					
						2024-07-03 16:21:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							009bd53f46
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/Index.ets
#	entry/src/main/ets/pages/UserInfo.ets 
						
						
					 | 
					
						2024-07-02 13:43:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efcb6f79ad
							
						
					 | 
					
						
						
							
							fix:将部分假数据移入mock
						
						
						
						
						
						
					 | 
					
						2024-07-02 11:39:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f9db78e1b
							
						
					 | 
					
						
						
							
							feat:合并master
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:26:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b8aa90e86e
							
						
					 | 
					
						
						
							
							socket丟失修改
						
						
						
						
						
						
					 | 
					
						2024-07-02 08:59:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71ed3fb4d4
							
						
					 | 
					
						
						
							
							表更新
						
						
						
						
						
						
					 | 
					
						2024-07-01 12:36:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f42f45cb9
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-06-27 20:53:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c89302ef9
							
						
					 | 
					
						
						
							
							依赖删除
						
						
						
						
						
						
					 | 
					
						2024-06-04 16:19:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54c7428b36
							
						
					 | 
					
						
						
							
							注释添加
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:56:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d30b6d67ab
							
						
					 | 
					
						
						
							
							fix:提交视频文件mock数据
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:08:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e51a565d
							
						
					 | 
					
						
						
							
							注释添加冲突回复
						
						
						
						
						
						
					 | 
					
						2024-06-04 14:18:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b269b1d913
							
						
					 | 
					
						
						
							
							废弃代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 13:14:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							905ac5b9b1
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:06:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							168a2f5eac
							
						
					 | 
					
						
						
							
							暂存代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:30:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							da6a85f02a
							
						
					 | 
					
						
						
							
							Merge branch 'main' into wangzhongjie
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/TerminalInfos.ets
#	entry/src/main/ets/pages/VideoConfig.ets
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets 
						
						
					 | 
					
						2024-06-04 11:23:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9a69d2d84
							
						
					 | 
					
						
						
							
							优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:19:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							424dc1ab23
							
						
					 | 
					
						
						
							
							串口更新
						
						
						
						
						
						
					 | 
					
						2024-05-27 17:25:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fe8bc2a39
							
						
					 | 
					
						
						
							
							拉取SVN
						
						
						
						
						
						
					 | 
					
						2024-05-16 09:53:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							70a5e3a0a0
							
						
					 | 
					
						
						
							
							优化部分
						
						
						
						
						
						
					 | 
					
						2024-05-09 13:42:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f87d3c8a3
							
						
					 | 
					
						
						
							
							杭州现场处理问题
						
						
						
						
						
						
					 | 
					
						2024-03-12 15:32:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							848282fe04
							
						
					 | 
					
						
						
							
							新代码
						
						
						
						
						
						
					 | 
					
						2024-03-05 15:44:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fe5385625
							
						
					 | 
					
						
						
							
							最新代码
						
						
						
						
						
						
					 | 
					
						2024-02-26 15:01:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fcdefeb4e
							
						
					 | 
					
						
						
							
							222
						
						
						
						
						
						
					 | 
					
						2024-02-23 16:08:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							e53f84b3d3
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-02-23 15:23:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efc98c114b
							
						
					 | 
					
						
						
							
							fix: 优化开始考试代码
						
						
						
						
						
						
					 | 
					
						2024-02-22 17:33:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c2515c1fb
							
						
					 | 
					
						
						
							
							22
						
						
						
						
						
						
					 | 
					
						2024-02-22 10:40:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef2b4e363d
							
						
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2024-02-21 13:34:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							93f87208f0
							
						
					 | 
					
						
						
							
							Fix file paths and update versions
						
						
						
						
						
						
					 | 
					
						2024-01-31 14:42:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							74bcb8f05c
							
						
					 | 
					
						
						
							
							Refactor code for improved performance
						
						
						
						
						
						
					 | 
					
						2024-01-31 14:35:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							157a292a74
							
						
					 | 
					
						
						
							
							init🎉: 初始化
						
						
						
						
						
						
					 | 
					
						2024-01-05 11:11:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |