| 
						
					 | 
					
						
						
						
						
							
						
						
							438e8bc278
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:14:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45c6b12067
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/common/utils/UdpClientByCenter.ts
#	entry/src/main/ets/pages/TerminalInfos.ets
#	entry/src/main/ets/pages/UserInfo.ets 
						
						
					 | 
					
						2024-08-15 09:05:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd5fd39fa3
							
						
					 | 
					
						
						
							
							feat:科目三洛阳修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							49358bb95c
							
						
					 | 
					
						
						
							
							單機模式修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 17:26:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f974da9303
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 09:18:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							829a18a314
							
						
					 | 
					
						
						
							
							洛陽修改
						
						
						
						
						
						
					 | 
					
						2024-08-13 11:50:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b3093b067
							
						
					 | 
					
						
						
							
							衝突解決
						
						
						
						
						
						
					 | 
					
						2024-08-12 14:54:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e53801f12
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-08-12 14:46:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1704325d87
							
						
					 | 
					
						
						
							
							feat:科目三修改
						
						
						
						
						
						
					 | 
					
						2024-08-12 10:19:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c2ec74f30
							
						
					 | 
					
						
						
							
							衝突修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:35:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3458289d19
							
						
					 | 
					
						
						
							
							問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:00:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0369c2c98f
							
						
					 | 
					
						
						
							
							feat:评判修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 20:12:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34017a09d1
							
						
					 | 
					
						
						
							
							日志&&問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 18:09:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afd3dbd72d
							
						
					 | 
					
						
						
							
							udp
						
						
						
						
						
						
					 | 
					
						2024-08-07 08:57:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d04828c5b4
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-06 08:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e14e3d4fb5
							
						
					 | 
					
						
						
							
							feat:科目三优化
						
						
						
						
						
						
					 | 
					
						2024-08-05 09:47:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6abd03b0b8
							
						
					 | 
					
						
						
							
							font-size修改
						
						
						
						
						
						
					 | 
					
						2024-08-02 15:40:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71ee2a79cb
							
						
					 | 
					
						
						
							
							feat:userInfo修改
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:28:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d0e8ab90d0
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:05:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddaefab76f
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:47:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a4301f424
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-16 15:02:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b79f0f4dd
							
						
					 | 
					
						
						
							
							feat:济南问题修改
						
						
						
						
						
						
					 | 
					
						2024-07-10 19:39:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d3813781c
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets
#	entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts
#	entry/src/main/ets/pages/judgeSDK/utils/fileModel.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeReal.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeTask.ts
#	entry/src/main/ets/pages/judgeSDK/utils/voiceAnnouncements.ts 
						
						
					 | 
					
						2024-07-10 19:27:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90133c0729
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-09 11:11:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92aa41bacc
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-05 18:10:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a72761601
							
						
					 | 
					
						
						
							
							feat:济南问题修改
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:34:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97768c336d
							
						
					 | 
					
						
						
							
							济南提交
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:08:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b82d3ff6bc
							
						
					 | 
					
						
						
							
							fix:修复一个写法问题
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:42:53 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ec6377f77
							
						
					 | 
					
						
						
							
							fix:提交视频文件mock数据
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:04:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e51a565d
							
						
					 | 
					
						
						
							
							注释添加冲突回复
						
						
						
						
						
						
					 | 
					
						2024-06-04 14:18:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e677eff7b
							
						
					 | 
					
						
						
							
							合并代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:08:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							168a2f5eac
							
						
					 | 
					
						
						
							
							暂存代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:30:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e65c48f1eb
							
						
					 | 
					
						
						
							
							优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:28:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9a69d2d84
							
						
					 | 
					
						
						
							
							优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:19:22 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5a3d43e20
							
						
					 | 
					
						
						
							
							feat: userInfo
						
						
						
						
						
						
					 | 
					
						2024-02-23 16:12:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							e53f84b3d3
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-02-23 15:23:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6420a333d
							
						
					 | 
					
						
						
							
							1111
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:43:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1ff0e8d2c
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.20.16:3000/shutdown/subject-two
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:10:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							38d48e778b
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.20.16:3000/shutdown/subject-two
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:06:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“wangzhongjie”
							
						 
					 | 
					
						
						
						
						
							
						
						
							62388d126a
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:04:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e8afd92db
							
						
					 | 
					
						
						
							
							feat: 优化
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:03:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efc98c114b
							
						
					 | 
					
						
						
							
							fix: 优化开始考试代码
						
						
						
						
						
						
					 | 
					
						2024-02-22 17:33:10 +08:00 | 
					
					
						
						
							
							
							
						
					 |