211 Commits

Author SHA1 Message Date
829a18a314 洛陽修改 2024-08-13 11:50:38 +08:00
1b3093b067 衝突解決 2024-08-12 14:54:10 +08:00
3e53801f12 提交 2024-08-12 14:46:16 +08:00
1704325d87 feat:科目三修改 2024-08-12 10:19:31 +08:00
0c2ec74f30 衝突修改 2024-08-10 14:35:16 +08:00
3458289d19 問題修改 2024-08-10 14:00:18 +08:00
0369c2c98f feat:评判修改 2024-08-08 20:12:19 +08:00
34017a09d1 日志&&問題修改 2024-08-08 18:09:06 +08:00
afd3dbd72d udp 2024-08-07 08:57:40 +08:00
e14e3d4fb5 feat:科目三优化 2024-08-05 09:47:44 +08:00
1a5b2ed48e Merge branch 'main' into feat_surenjun
# Conflicts:
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets
2024-07-31 14:18:09 +08:00
ddaefab76f feat:科目三评判优化 2024-07-31 13:47:40 +08:00
c844c19b60 信号显示修改 2024-07-31 13:19:41 +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
60a55f585d tcp重连 2024-07-19 13:27:51 +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
a15aae60d7 合并主分支 2024-07-11 11:17:11 +08:00
514d3beb60 中心udp修改 2024-07-10 14:31:55 +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
92aa41bacc 济南修改 2024-07-05 18:10:12 +08:00
97768c336d 济南提交 2024-07-05 09:08:17 +08:00
9c83bdae52 表修改 2024-07-03 16:19:55 +08:00
Surenjun
2f9db78e1b feat:合并master 2024-07-02 10:26:42 +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
71ed3fb4d4 表更新 2024-07-01 12:36:46 +08:00
0f42f45cb9 济南修改 2024-06-27 20:53:36 +08:00
Surenjun
2481438651 feat:无锡usb设备调试 2024-06-21 10:45:53 +08:00
Surenjun
94e060187e feat:无锡usb设备调试 2024-06-20 10:47:02 +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
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
Surenjun
ed0858a5c0 feat:错误信息修改 2024-05-16 11:19:10 +08:00
Surenjun
18fff647a6 Merge branch 'main' into feat_surenjun
# Conflicts:
#	entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
#	entry/src/main/ets/common/utils/FileConfig.ts
#	entry/src/main/ets/common/utils/SerialPortClient.ts
#	entry/src/main/ets/common/utils/request.ts
2024-05-16 11:09:07 +08:00
“wangzhongjie”
059ff04fad 拉取SVN 2024-05-16 11:05:19 +08:00
“wangzhongjie”
4fe8bc2a39 拉取SVN 2024-05-16 09:53:10 +08:00
Surenjun
d793c15c79 feat:评判代码更新 2024-05-15 16:22:48 +08:00
“wangzhongjie”
70a5e3a0a0 优化部分 2024-05-09 13:42:56 +08:00
“wangzhongjie”
0f87d3c8a3 杭州现场处理问题 2024-03-12 15:32:48 +08:00