| 
						
					 | 
					
						
						
						
						
							
						
						
							672e1fa229
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:58:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddaefab76f
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:47:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c844c19b60
							
						
					 | 
					
						
						
							
							信号显示修改
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:19:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b987bac5f0
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#38) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #38 
						
						
					 | 
					
						2024-07-30 10:41:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3bbf35a1db
							
						
					 | 
					
						
						
							
							tcp修改
						
						
						
						
						
						
					 | 
					
						2024-07-30 10:35:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							33a719a462
							
						
					 | 
					
						
						
							
							双中心修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 14:29:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							abb3e1bb47
							
						
					 | 
					
						
						
							
							双中心修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 09:51:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf8e2226a7
							
						
					 | 
					
						
						
							
							carcheck修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 08:56:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							23ea400ee3
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#37) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #37 
						
						
					 | 
					
						2024-07-19 14:50:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60a55f585d
							
						
					 | 
					
						
						
							
							tcp重连
						
						
						
						
						
						
					 | 
					
						2024-07-19 13:27:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1be1d806f7
							
						
					 | 
					
						
						
							
							host优化
						
						
						
						
						
						
					 | 
					
						2024-07-19 09:21:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							abc48bd774
							
						
					 | 
					
						
						
							
							Merge pull request '设备注册修改' (#36) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #36 
						
						
					 | 
					
						2024-07-18 15:20:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e509779f1
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#35) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #35 
						
						
					 | 
					
						2024-07-17 09:01:30 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9473b8c466
							
						
					 | 
					
						
						
							
							Merge pull request 'host配置修改' (#33) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #33 
						
						
					 | 
					
						2024-07-16 17:43:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3f04ed436
							
						
					 | 
					
						
						
							
							首页音频
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:35:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4d02a8a9e
							
						
					 | 
					
						
						
							
							权限修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:32:53 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4038aa6858
							
						
					 | 
					
						
						
							
							Merge pull request 'c++' (#30) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #30 
						
						
					 | 
					
						2024-07-16 14:31:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ac3e76957
							
						
					 | 
					
						
						
							
							feat:删除无用文件
						
						
						
						
						
						
					 | 
					
						2024-07-16 12:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							811b6e4812
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two
						
						
						
						
						
						
					 | 
					
						2024-07-16 11:12:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							0121207189
							
						
					 | 
					
						
						
							
							fix:忽略cpp目录
						
						
						
						
						
						
					 | 
					
						2024-07-16 11:12:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af40efb3f6
							
						
					 | 
					
						
						
							
							c++
						
						
						
						
						
						
					 | 
					
						2024-07-16 09:59:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40db7bbc9a
							
						
					 | 
					
						
						
							
							Merge pull request 'feat:科目三评判优化' (#29) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #29 
						
						
					 | 
					
						2024-07-15 10:09:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c4c217dc8
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two
						
						
						
						
						
						
					 | 
					
						2024-07-12 10:15:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							0eec64a718
							
						
					 | 
					
						
						
							
							fix:删除不必要的
						
						
						
						
						
						
					 | 
					
						2024-07-12 10:15:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dba195cf8d
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-11 16:16:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c42286a6e4
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#28) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #28 
						
						
					 | 
					
						2024-07-11 13:30:47 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9083b82678
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#27) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #27 
						
						
					 | 
					
						2024-07-11 10:46:49 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							514d3beb60
							
						
					 | 
					
						
						
							
							中心udp修改
						
						
						
						
						
						
					 | 
					
						2024-07-10 14:31:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5770833621
							
						
					 | 
					
						
						
							
							文件添加
						
						
						
						
						
						
					 | 
					
						2024-07-10 14:09:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b4b8f75d0
							
						
					 | 
					
						
						
							
							Merge pull request '济南修改' (#25) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #25 
						
						
					 | 
					
						2024-07-09 14:29:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c09d24fea
							
						
					 | 
					
						
						
							
							无用文件删除
						
						
						
						
						
						
					 | 
					
						2024-07-09 13:22:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb276de665
							
						
					 | 
					
						
						
							
							删除无用文件
						
						
						
						
						
						
					 | 
					
						2024-07-09 13:18:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acc9f03109
							
						
					 | 
					
						
						
							
							udp修改
						
						
						
						
						
						
					 | 
					
						2024-07-09 13:13:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90133c0729
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-09 11:11:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							04483be75c
							
						
					 | 
					
						
						
							
							Merge pull request '济南修改' (#24) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #24 
						
						
					 | 
					
						2024-07-08 13:49:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92aa41bacc
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-05 18:10:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a72761601
							
						
					 | 
					
						
						
							
							feat:济南问题修改
						
						
						
						
						
						
					 | 
					
						2024-07-05 09:34:03 +08:00 | 
					
					
						
						
							
							
							
						
					 |