321 Commits

Author SHA1 Message Date
60a55f585d tcp重连 2024-07-19 13:27:51 +08:00
1be1d806f7 host优化 2024-07-19 09:21:47 +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
a7cf1eb007 Merge branch 'main' into feat_surenjun
# Conflicts:
#	entry/src/main/ets/pages/Index.ets
2024-07-17 09:02:29 +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
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
dba195cf8d feat:科目三评判优化 2024-07-11 16:16:43 +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
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
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
92aa41bacc 济南修改 2024-07-05 18:10:12 +08:00
4a72761601 feat:济南问题修改 2024-07-05 09:34:03 +08:00
83f6633957 Merge branch 'main' into feat_surenjun 2024-07-05 09:18:50 +08:00
97768c336d 济南提交 2024-07-05 09:08:17 +08:00
a117df4cac Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two 2024-07-04 10:20:47 +08:00
22acd782b9 表修改 2024-07-03 16:21:56 +08:00
9c83bdae52 表修改 2024-07-03 16:19:55 +08:00
Surenjun
1190d4da03 feat:科目三更新 2024-07-02 15:24:47 +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
wangzhongjie
998a1adb0d fix:优化了部分代码 2024-07-02 11:10:33 +08:00
wangzhongjie
b82d3ff6bc fix:修复一个写法问题 2024-07-02 10:42:53 +08:00
Surenjun
2f9db78e1b feat:合并master 2024-07-02 10:26:42 +08:00
Surenjun
45cf28fac8 feat:合并master 2024-07-02 10:14:38 +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
Surenjun
5524d0e7c9 feat:语音文件更新 2024-07-02 10:02:22 +08:00
f89fe36b10 cpp更新 2024-07-02 09:01:57 +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
Surenjun
3d5bba8022 Merge remote-tracking branch 'origin/feat_surenjun' into feat_surenjun 2024-06-21 10:48:26 +08:00
Surenjun
2481438651 feat:无锡usb设备调试 2024-06-21 10:45:53 +08:00