wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							998a1adb0d
							
						
					 | 
					
						
						
							
							fix:优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-07-02 11:10:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f9db78e1b
							
						
					 | 
					
						
						
							
							feat:合并master
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:26:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bfa67b9e3
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/Judge.ets
#	entry/src/main/ets/pages/RealTime.ets
#	entry/src/main/ets/pages/compontents/judge/video-play.ets
#	entry/src/main/ets/pages/judgeSDK/judge.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judge-config.ts 
						
						
					 | 
					
						2024-07-02 10:12:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							5524d0e7c9
							
						
					 | 
					
						
						
							
							feat:语音文件更新
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:02:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f42f45cb9
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-06-27 20:53:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e51a565d
							
						
					 | 
					
						
						
							
							注释添加冲突回复
						
						
						
						
						
						
					 | 
					
						2024-06-04 14:18:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45d394d89d
							
						
					 | 
					
						
						
							
							提交代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:09:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2abfeb4d94
							
						
					 | 
					
						
						
							
							合并代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:08:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							637b123fcc
							
						
					 | 
					
						
						
							
							合并代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:07:21 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cfcff1bef
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2024-05-17 08:55:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							059ff04fad
							
						
					 | 
					
						
						
							
							拉取SVN
						
						
						
						
						
						
					 | 
					
						2024-05-16 11:05:19 +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”
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6420a333d
							
						
					 | 
					
						
						
							
							1111
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:43:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efc98c114b
							
						
					 | 
					
						
						
							
							fix: 优化开始考试代码
						
						
						
						
						
						
					 | 
					
						2024-02-22 17:33:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c68804bfa4
							
						
					 | 
					
						
						
							
							feat: 文件修复
						
						
						
						
						
						
					 | 
					
						2024-02-21 15:06:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef2b4e363d
							
						
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2024-02-21 13:34:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed236df1d6
							
						
					 | 
					
						
						
							
							feat: 修复一些问题
						
						
						
						
						
						
					 | 
					
						2024-02-20 10:22:33 +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 | 
					
					
						
						
							
							
							
						
					 |