Commit Graph

125 Commits

Author SHA1 Message Date
9250be8780 增加开发包文件 2025-09-18 13:36:01 +08:00
4569d28811 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
#	Module/DeviceInfo.py
#	Utils/ControlUtils.py
#	script/ScriptManager.py
2025-09-18 13:11:50 +08:00
d7e1d993fb 20250904-初步功能已完成 2025-09-18 13:07:11 +08:00
2fe1576eaa 20250904-初步功能已完成 2025-09-17 23:09:02 +08:00
2c3a71fe3c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
#	build.bat
2025-09-17 22:59:44 +08:00
81bc1f5f50 20250904-初步功能已完成 2025-09-17 22:59:15 +08:00
dfb03cb362 合并代码 2025-09-17 22:33:58 +08:00
f21b44cf19 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
#	Module/DeviceInfo.py
#	build.bat
#	resources/FlashLink.exe
2025-09-17 22:26:04 +08:00
5d63cc7961 20250904-初步功能已完成 2025-09-17 22:24:16 +08:00
6e2486a036 性能优化 2025-09-17 22:23:57 +08:00
db67024157 合并代码 2025-09-17 15:48:41 +08:00
deffd48bb7 调整设备拔出方案 2025-09-17 15:43:23 +08:00
1830c27fc5 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
2025-09-16 21:34:27 +08:00
bb73fa6d9e 20250916-正式上线测试 2025-09-16 21:34:15 +08:00
daa6345c15 调整日志 2025-09-16 21:33:44 +08:00
c29a663300 优化拔出逻辑 2025-09-16 20:03:17 +08:00
46b8576a16 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
#	Utils/ControlUtils.py
2025-09-16 16:18:17 +08:00
c65eb95699 20250916-正式上线测试 2025-09-16 16:16:50 +08:00
9490da09f4 修改多点触控方法 2025-09-16 16:08:41 +08:00
e6768b14a5 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	Utils/ControlUtils.py
2025-09-16 15:38:59 +08:00
e0dc14ea73 20250916-正式上线测试 2025-09-16 15:37:36 +08:00
a0e1f9ef8d 合并代码 2025-09-16 15:31:55 +08:00
b91aa99048 20250916-正式上线测试 2025-09-16 14:03:43 +08:00
b203579649 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
2025-09-15 22:41:12 +08:00
096b10f5f0 20250904-初步功能已完成 2025-09-15 22:40:45 +08:00
824cff5ab6 优化flask日志报错问题。优化tidevice运行报错问题 2025-09-15 21:58:47 +08:00
155f11de91 增强flask健壮度 2025-09-15 16:01:27 +08:00
e71bd48468 修复端口号错误的问题 2025-09-13 01:11:28 +08:00
177757a143 Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI
# Conflicts:
#	.idea/workspace.xml
#	Module/DeviceInfo.py
2025-09-13 01:03:29 +08:00
3f5c880c0f 20250904-初步功能已完成 2025-09-13 01:03:15 +08:00
06fd7ce885 添加忽略文件 2025-09-13 00:59:22 +08:00
6766ac8c20 添加忽略文件 2025-09-13 00:57:08 +08:00
6da5926b4b Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI
# Conflicts:
#	.idea/workspace.xml
2025-09-12 21:37:01 +08:00
aa2f291f49 20250904-初步功能已完成 2025-09-12 21:36:47 +08:00
398d980caa 添加wda守护 2025-09-12 21:36:29 +08:00
f450226d2d Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI
# Conflicts:
#	.idea/workspace.xml
2025-09-12 13:46:31 +08:00
5732db2cc2 20250904-初步功能已完成 2025-09-12 13:46:11 +08:00
9cf094986c 优化拔出设备逻辑 2025-09-12 13:44:26 +08:00
1653da2f37 Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI
# Conflicts:
#	.idea/workspace.xml
2025-09-12 13:12:44 +08:00
9eb2a82880 20250904-初步功能已完成 2025-09-12 13:12:35 +08:00
9770ce3ad3 合并代码 2025-09-11 22:49:08 +08:00
6bb7ae23db 优化丢设备问题 2025-09-11 22:46:55 +08:00
c1cf6c04e2 20250911-初步功能已完成 2025-09-11 22:39:57 +08:00
19780a8a85 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
2025-09-11 21:15:19 +08:00
7e7d183f5f 20250911-初步功能已完成 2025-09-11 21:14:57 +08:00
2b3fb6871f 调整发消息逻辑 2025-09-11 20:32:08 +08:00
a3019ffee4 临时提交 2025-09-11 19:33:21 +08:00
9775b1a063 temp 2025-09-11 19:06:41 +08:00
a408a01110 20250904-初步功能已完成 2025-09-11 18:55:35 +08:00
a2287b47d5 20250904-初步功能已完成 2025-09-11 18:49:40 +08:00