| 
						
					 | 
					
						
						
						
						
							
						
						
							75058b49bb
							
						
					 | 
					
						
						
							
							carchekc和dialog
						
						
						
						
						
						
					 | 
					
						2024-08-12 09:28:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c2ec74f30
							
						
					 | 
					
						
						
							
							衝突修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:35:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3458289d19
							
						
					 | 
					
						
						
							
							問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:00:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							36cb737068
							
						
					 | 
					
						
						
							
							feat:评判修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 20:15:02 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a5b2ed48e
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets 
						
						
					 | 
					
						2024-07-31 14:18:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddaefab76f
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:47:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c844c19b60
							
						
					 | 
					
						
						
							
							信号显示修改
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:19:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf8e2226a7
							
						
					 | 
					
						
						
							
							carcheck修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 08:56:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1be1d806f7
							
						
					 | 
					
						
						
							
							host优化
						
						
						
						
						
						
					 | 
					
						2024-07-19 09:21:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							699317b1fe
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-07-18 09:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43a673fa4f
							
						
					 | 
					
						
						
							
							设备注册修改
						
						
						
						
						
						
					 | 
					
						2024-07-17 10:19:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7cf1eb007
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/Index.ets 
						
						
					 | 
					
						2024-07-17 09:02:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03df4becd9
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:32:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9be42f086
							
						
					 | 
					
						
						
							
							host配置修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:23:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a4301f424
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-16 15:02:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ac3e76957
							
						
					 | 
					
						
						
							
							feat:删除无用文件
						
						
						
						
						
						
					 | 
					
						2024-07-16 12:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dba195cf8d
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-11 16:16:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5544ae8e9
							
						
					 | 
					
						
						
							
							冲突解决
						
						
						
						
						
						
					 | 
					
						2024-07-11 13:23:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							28244bd8e7
							
						
					 | 
					
						
						
							
							111
						
						
						
						
						
						
					 | 
					
						2024-07-11 13:21:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a15aae60d7
							
						
					 | 
					
						
						
							
							合并主分支
						
						
						
						
						
						
					 | 
					
						2024-07-11 11:17:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5b99e81b05
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2024-07-11 10:26:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73360f518c
							
						
					 | 
					
						
						
							
							济南代码合并
						
						
						
						
						
						
					 | 
					
						2024-07-11 10:22:31 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5770833621
							
						
					 | 
					
						
						
							
							文件添加
						
						
						
						
						
						
					 | 
					
						2024-07-10 14:09:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c09d24fea
							
						
					 | 
					
						
						
							
							无用文件删除
						
						
						
						
						
						
					 | 
					
						2024-07-09 13:22:17 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							83f6633957
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:18:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97768c336d
							
						
					 | 
					
						
						
							
							济南提交
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:08:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c83bdae52
							
						
					 | 
					
						
						
							
							表修改
						
						
						
						
						
						
					 | 
					
						2024-07-03 16:19:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							1190d4da03
							
						
					 | 
					
						
						
							
							feat:科目三更新
						
						
						
						
						
						
					 | 
					
						2024-07-02 15:24:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efcb6f79ad
							
						
					 | 
					
						
						
							
							fix:将部分假数据移入mock
						
						
						
						
						
						
					 | 
					
						2024-07-02 11:39:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							998a1adb0d
							
						
					 | 
					
						
						
							
							fix:优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-07-02 11:10:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b82d3ff6bc
							
						
					 | 
					
						
						
							
							fix:修复一个写法问题
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:42:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f9db78e1b
							
						
					 | 
					
						
						
							
							feat:合并master
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:26:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							45cf28fac8
							
						
					 | 
					
						
						
							
							feat:合并master
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:14:38 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71ed3fb4d4
							
						
					 | 
					
						
						
							
							表更新
						
						
						
						
						
						
					 | 
					
						2024-07-01 12:36:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f42f45cb9
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-06-27 20:53:36 +08:00 | 
					
					
						
						
							
							
							
						
					 |