| 
						
					 | 
					
						
						
						
						
							
						
						
							bd62ff705d
							
						
					 | 
					
						
						
							
							外殼
						
						
						
						
						
						
					 | 
					
						2024-08-22 15:24:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0855162b43
							
						
					 | 
					
						
						
							
							feat:版本号修改
						
						
						
						
						
						
					 | 
					
						2024-08-22 14:21:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b013f451c
							
						
					 | 
					
						
						
							
							feat:结束考试日志添加
						
						
						
						
						
						
					 | 
					
						2024-08-22 14:20:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb86c2b903
							
						
					 | 
					
						
						
							
							feat:添加程序运行里程
						
						
						
						
						
						
					 | 
					
						2024-08-22 13:59:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ad5458a6b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-08-22 09:05:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b62a22b25d
							
						
					 | 
					
						
						
							
							feat:audioPlayer播放器日志添加
						
						
						
						
						
						
					 | 
					
						2024-08-22 09:05:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2fb04cbc52
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-21 18:06:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2efd38f73a
							
						
					 | 
					
						
						
							
							外殼問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-21 18:05:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65b80bb0fb
							
						
					 | 
					
						
						
							
							feat:评判更新
						
						
						
						
						
						
					 | 
					
						2024-08-21 17:53:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							68821fa208
							
						
					 | 
					
						
						
							
							版本號
						
						
						
						
						
						
					 | 
					
						2024-08-21 12:01:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4380fce2ca
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-08-21 11:59:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eac7d94b98
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-21 11:57:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bbd5edd1ea
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-21 09:03:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5dda1b57d3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-08-21 08:59:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b76a2a3f58
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-08-21 08:53:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ab8521d54
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-20 14:49:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							46cc3a311f
							
						
					 | 
					
						
						
							
							防抖
						
						
						
						
						
						
					 | 
					
						2024-08-20 11:26:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d86dad782
							
						
					 | 
					
						
						
							
							拍照error提示
						
						
						
						
						
						
					 | 
					
						2024-08-20 10:56:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0aaf5ddd1a
							
						
					 | 
					
						
						
							
							單機userlist
						
						
						
						
						
						
					 | 
					
						2024-08-20 10:16:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdaba29b5c
							
						
					 | 
					
						
						
							
							彈框修改
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:43:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d18527b96
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:16:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63542bef08
							
						
					 | 
					
						
						
							
							feat:globalThis.lsh修改
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:13:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f61ec2bc2e
							
						
					 | 
					
						
						
							
							外殼問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:12:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05f31c4b7c
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2024-08-19 14:56:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a618adeff
							
						
					 | 
					
						
						
							
							彈框userlist修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 14:54:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb8e7bc7c5
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-19 11:31:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05f8798973
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-19 11:19:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b021e3221e
							
						
					 | 
					
						
						
							
							衝突解決
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:19:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54403ef2c7
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:11:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							638477891c
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-19 09:33:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f414114cf1
							
						
					 | 
					
						
						
							
							table表修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 09:32:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0837bd20d8
							
						
					 | 
					
						
						
							
							feat:userInfo修改
						
						
						
						
						
						
					 | 
					
						2024-08-16 08:53:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							559d6cef2c
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-16 08:52:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7717785a5
							
						
					 | 
					
						
						
							
							feat:科目三联网优化
						
						
						
						
						
						
					 | 
					
						2024-08-16 08:52:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1301334230
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#62) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #62 
						
						
					 | 
					
						2024-08-16 08:40:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c62d6f365
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-15 17:56:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							295c8c10cf
							
						
					 | 
					
						
						
							
							userinfo單機修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 17:55:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b6ea810892
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#61) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #61 
						
						
					 | 
					
						2024-08-15 14:24:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							56369ec982
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 13:48:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f440fd7630
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 13:42:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							438e8bc278
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:14:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b96d9fb27c
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#60) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #60 
						
						
					 | 
					
						2024-08-15 09:13:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb1ea1c5b4
							
						
					 | 
					
						
						
							
							feat:删除多余文件
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:09:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7f891b3644
							
						
					 | 
					
						
						
							
							Merge pull request '單機模式修改' (#59) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #59 
						
						
					 | 
					
						2024-08-15 09:08:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9be231d31e
							
						
					 | 
					
						
						
							
							feat:合并代码
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:05:53 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f98ce3d832
							
						
					 | 
					
						
						
							
							Merge pull request 'tcp修改' (#58) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #58 
						
						
					 | 
					
						2024-08-14 14:52:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b89b0c911e
							
						
					 | 
					
						
						
							
							tcp修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 14:46:33 +08:00 | 
					
					
						
						
							
							
							
						
					 |