| 
						
					 | 
					
						
						
						
						
							
						
						
							92aa41bacc
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-05 18:10:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97768c336d
							
						
					 | 
					
						
						
							
							济南提交
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:08:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a117df4cac
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two
						
						
						
						
						
						
					 | 
					
						2024-07-04 10:20:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22acd782b9
							
						
					 | 
					
						
						
							
							表修改
						
						
						
						
						
						
					 | 
					
						2024-07-03 16:21:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c83bdae52
							
						
					 | 
					
						
						
							
							表修改
						
						
						
						
						
						
					 | 
					
						2024-07-03 16:19:55 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f89fe36b10
							
						
					 | 
					
						
						
							
							cpp更新
						
						
						
						
						
						
					 | 
					
						2024-07-02 09:01:57 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d5bba8022
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feat_surenjun' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-06-21 10:48:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2481438651
							
						
					 | 
					
						
						
							
							feat:无锡usb设备调试
						
						
						
						
						
						
					 | 
					
						2024-06-21 10:45:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							e355f3d283
							
						
					 | 
					
						
						
							
							feat:无锡usb设备调试
						
						
						
						
						
						
					 | 
					
						2024-06-20 10:49:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							94e060187e
							
						
					 | 
					
						
						
							
							feat:无锡usb设备调试
						
						
						
						
						
						
					 | 
					
						2024-06-20 10:47:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							982fd6273d
							
						
					 | 
					
						
						
							
							feat:科目三问题修改
						
						
						
						
						
						
					 | 
					
						2024-06-18 16:44:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcf41bb2f0
							
						
					 | 
					
						
						
							
							feat:sysset表387参数修改
						
						
						
						
						
						
					 | 
					
						2024-06-18 09:27:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c89302ef9
							
						
					 | 
					
						
						
							
							依赖删除
						
						
						
						
						
						
					 | 
					
						2024-06-04 16:19:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e6ca1a051
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2024-06-04 16:01:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							664a4a91c6
							
						
					 | 
					
						
						
							
							废弃代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 16:00:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54c7428b36
							
						
					 | 
					
						
						
							
							注释添加
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:56:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a48ba68e5c
							
						
					 | 
					
						
						
							
							context修改
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:36:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d30b6d67ab
							
						
					 | 
					
						
						
							
							fix:提交视频文件mock数据
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:08:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ec6377f77
							
						
					 | 
					
						
						
							
							fix:提交视频文件mock数据
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:04:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e51a565d
							
						
					 | 
					
						
						
							
							注释添加冲突回复
						
						
						
						
						
						
					 | 
					
						2024-06-04 14:18:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b269b1d913
							
						
					 | 
					
						
						
							
							废弃代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 13:14:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45d394d89d
							
						
					 | 
					
						
						
							
							提交代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:09:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e677eff7b
							
						
					 | 
					
						
						
							
							合并代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 12:08:32 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e65c48f1eb
							
						
					 | 
					
						
						
							
							优化了部分代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 11:28:15 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							600dfbe397
							
						
					 | 
					
						
						
							
							润和串口调试
						
						
						
						
						
						
					 | 
					
						2024-05-30 15:52:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9623750d0b
							
						
					 | 
					
						
						
							
							异步串口调试
						
						
						
						
						
						
					 | 
					
						2024-05-29 10:13:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							424dc1ab23
							
						
					 | 
					
						
						
							
							串口更新
						
						
						
						
						
						
					 | 
					
						2024-05-27 17:25:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63145aec13
							
						
					 | 
					
						
						
							
							udp动态绑定修改
						
						
						
						
						
						
					 | 
					
						2024-05-23 08:45:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8609d30a0a
							
						
					 | 
					
						
						
							
							Merge pull request 'feat:cpp代码更新' (#5) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #5 
						
						
					 | 
					
						2024-05-22 08:50:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							902130f07a
							
						
					 | 
					
						
						
							
							feat:cpp代码更新
						
						
						
						
						
						
					 | 
					
						2024-05-21 19:45:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60582e4e5e
							
						
					 | 
					
						
						
							
							carChekck检查项添加
						
						
						
						
						
						
					 | 
					
						2024-05-20 09:09:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef94029967
							
						
					 | 
					
						
						
							
							feat:评判更新
						
						
						
						
						
						
					 | 
					
						2024-05-17 16:34:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cfcff1bef
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2024-05-17 08:55:23 +08:00 | 
					
					
						
						
							
							
							
						
					 |