| 
						
					 | 
					
						
						
						
						
							
						
						
							7ba4c2f5f0
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-26 19:27:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							002a1e84d8
							
						
					 | 
					
						
						
							
							設備注冊提示
						
						
						
						
						
						
					 | 
					
						2024-08-26 16:00:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5a9af48cd9
							
						
					 | 
					
						
						
							
							wirteLog
						
						
						
						
						
						
					 | 
					
						2024-08-26 15:09:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5fba22c2ed
							
						
					 | 
					
						
						
							
							彈框修改
						
						
						
						
						
						
					 | 
					
						2024-08-23 13:44:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e4d357f7a
							
						
					 | 
					
						
						
							
							彈框
						
						
						
						
						
						
					 | 
					
						2024-08-23 09:37:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb86c2b903
							
						
					 | 
					
						
						
							
							feat:添加程序运行里程
						
						
						
						
						
						
					 | 
					
						2024-08-22 13:59:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2efd38f73a
							
						
					 | 
					
						
						
							
							外殼問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-21 18:05:24 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a618adeff
							
						
					 | 
					
						
						
							
							彈框userlist修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 14:54:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b021e3221e
							
						
					 | 
					
						
						
							
							衝突解決
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:19:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54403ef2c7
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:11:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f414114cf1
							
						
					 | 
					
						
						
							
							table表修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 09:32:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f440fd7630
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 13:42:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							49358bb95c
							
						
					 | 
					
						
						
							
							單機模式修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 17:26:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b89b0c911e
							
						
					 | 
					
						
						
							
							tcp修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 14:46:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b121ed5b2
							
						
					 | 
					
						
						
							
							外殼優化
						
						
						
						
						
						
					 | 
					
						2024-08-14 13:15:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f974da9303
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 09:18:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							829a18a314
							
						
					 | 
					
						
						
							
							洛陽修改
						
						
						
						
						
						
					 | 
					
						2024-08-13 11:50:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e53801f12
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-08-12 14:46:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75058b49bb
							
						
					 | 
					
						
						
							
							carchekc和dialog
						
						
						
						
						
						
					 | 
					
						2024-08-12 09:28:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3458289d19
							
						
					 | 
					
						
						
							
							問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:00:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34017a09d1
							
						
					 | 
					
						
						
							
							日志&&問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 18:09:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1be1d806f7
							
						
					 | 
					
						
						
							
							host优化
						
						
						
						
						
						
					 | 
					
						2024-07-19 09:21:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43a673fa4f
							
						
					 | 
					
						
						
							
							设备注册修改
						
						
						
						
						
						
					 | 
					
						2024-07-17 10:19:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9be42f086
							
						
					 | 
					
						
						
							
							host配置修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:23:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90133c0729
							
						
					 | 
					
						
						
							
							济南修改
						
						
						
						
						
						
					 | 
					
						2024-07-09 11:11:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22acd782b9
							
						
					 | 
					
						
						
							
							表修改
						
						
						
						
						
						
					 | 
					
						2024-07-03 16:21:56 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Surenjun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f9db78e1b
							
						
					 | 
					
						
						
							
							feat:合并master
						
						
						
						
						
						
					 | 
					
						2024-07-02 10:26:42 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c89302ef9
							
						
					 | 
					
						
						
							
							依赖删除
						
						
						
						
						
						
					 | 
					
						2024-06-04 16:19:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54c7428b36
							
						
					 | 
					
						
						
							
							注释添加
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:56:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d30b6d67ab
							
						
					 | 
					
						
						
							
							fix:提交视频文件mock数据
						
						
						
						
						
						
					 | 
					
						2024-06-04 15:08:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e51a565d
							
						
					 | 
					
						
						
							
							注释添加冲突回复
						
						
						
						
						
						
					 | 
					
						2024-06-04 14:18:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b269b1d913
							
						
					 | 
					
						
						
							
							废弃代码
						
						
						
						
						
						
					 | 
					
						2024-06-04 13:14:48 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |