dev #63

Merged
wangzhongjie merged 206 commits from dev into main 2024-12-16 10:31:20 +08:00

206 Commits

Author SHA1 Message Date
wangzhongjie
c912d437dd fix: 济南稳定版本 2025-01-20 08:50:40 +08:00
47a575a464 feat:修改 2025-01-14 19:43:14 +08:00
ec42803348 feat:request&judge修改 2025-01-14 15:34:13 +08:00
78c897feaa feat:断网补传 2025-01-14 15:13:50 +08:00
9ff557da80 feat:ksks.wav文件替换 2025-01-14 13:46:04 +08:00
1c1eccb250 feat:y优化 2025-01-13 15:05:03 +08:00
3714ed2478 feat:y优化 2025-01-12 19:44:59 +08:00
4f1a4f894c 1. 新增623参数控制联网模式实施轨迹显示
2. 新增监管结束考试异常,错误提示弹窗显示
3. 优化文件系统:考试结束关闭文件读写
2025-01-09 20:56:36 +08:00
cd4affcb6f Merge remote-tracking branch 'origin/dev' into dev 2025-01-08 18:15:26 +08:00
1f5d1eb221 feat: 修复四合一画面偶现显示不对的问题 2025-01-08 18:15:10 +08:00
10b005cd25 Merge 2025-01-07 16:01:07 +08:00
3e641b22d5 promise修改 2025-01-07 15:50:48 +08:00
f5c701dcda feat: 评判udp添加日志 2025-01-07 15:25:43 +08:00
3481502c58 feat: 屏蔽webrtc功能 2025-01-07 12:11:39 +08:00
6d0a2589ba Merge remote-tracking branch 'origin/dev' into dev 2025-01-07 12:08:02 +08:00
0f47c181ff feat: 苏州科目二问题修改 2025-01-07 12:07:53 +08:00
29332c5ae8 userinfo 2025-01-06 13:55:39 +08:00
26e45415c5 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2025-01-06 13:48:31 +08:00
77e6dbc78a feat: 预进项目事件修改 2025-01-06 10:23:33 +08:00
0141f8178a Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2025-01-04 14:28:05 +08:00
e828c532de user 2025-01-04 14:27:45 +08:00
d1a2170ee8 Merge remote-tracking branch 'origin/dev' into dev 2025-01-04 14:24:31 +08:00
a12d8c79e9 1 2025-01-04 13:51:34 +08:00
9337adc8cc 删除相册&&用户切换 2025-01-03 17:24:11 +08:00
71e51f4e7d 图片删除 2025-01-03 13:34:03 +08:00
ff23f6383d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets
2025-01-03 13:08:46 +08:00
619a67906a feat:评判相关更新 2025-01-03 13:08:00 +08:00
bf0e77bf1f tcp send重连修改 2025-01-03 10:25:31 +08:00
f35cf5fd22 tcp修改提交 2025-01-02 19:09:45 +08:00
8b915c2465 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2025-01-02 17:53:59 +08:00
0643956543 dev 2025-01-02 17:53:34 +08:00
9dd3b84534 feat:更新 2025-01-02 17:50:08 +08:00
ac95a82524 语音修改 2025-01-02 11:01:09 +08:00
c1f27d8d5a bug修改 2025-01-01 16:18:52 +08:00
37c99d885c Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2025-01-01 10:40:57 +08:00
2aa2179dc8 拍照响应bug修改 2025-01-01 10:40:23 +08:00
0ddf1ac518 feat:request优化 2025-01-01 09:38:33 +08:00
17ef3ce4be feat:更新 2024-12-31 17:51:25 +08:00
c7dd0aa000 feat:request优化 2024-12-31 11:31:11 +08:00
f0c6451623 feat:评判修噶 2024-12-31 10:36:43 +08:00
e917107df1 提交修改 2024-12-31 10:21:19 +08:00
ac5186ef97 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-12-30 16:53:36 +08:00
b021a94b8f 考试员单机显示 2024-12-30 16:53:14 +08:00
8b6bfd0e20 Revert "feat:评判优化"
This reverts commit 8d489592
2024-12-30 16:48:27 +08:00
e8f787408a Merge remote-tracking branch 'origin/dev' into dev 2024-12-30 16:41:03 +08:00
4bfbfe1516 Revert "feat:评判优化"
This reverts commit 8d489592
2024-12-30 16:40:54 +08:00
d0ac2bf04a Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-12-30 15:32:56 +08:00
c4071d0817 1 2024-12-30 15:32:14 +08:00
1f645f3b3a feat:考前绕车一周信号提示关掉 2024-12-30 15:11:11 +08:00
fbfb6e9f4f feat:judgeConfig更改 2024-12-30 13:43:30 +08:00
389258b6ee Merge remote-tracking branch 'origin/dev' into dev 2024-12-30 13:36:20 +08:00
cbb88acae2 feat:评判更新 2024-12-30 13:36:10 +08:00
be34664f42 合并 2024-12-30 13:26:35 +08:00
17106b34c3 1 2024-12-30 13:21:26 +08:00
40d5a9cdc0 按钮变化修改 2024-12-30 13:20:49 +08:00
aaeef94c9c feat:新监管去除照片转换 2024-12-30 12:56:27 +08:00
d254686159 feat:语音文件添加 2024-12-30 12:55:13 +08:00
8d489592d8 feat:评判优化 2024-12-30 12:53:42 +08:00
1e2b71e499 Merge remote-tracking branch 'origin/dev' into dev 2024-12-30 09:22:11 +08:00
c2a74379ef 1 2024-12-29 21:43:12 +08:00
1fd57572af feat:初始化异常能结束 2024-12-25 09:02:29 +08:00
0fa4bb81cc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	entry/src/main/ets/common/utils/File.ts
2024-12-24 17:28:55 +08:00
fbc1d49af1 feat:评判写入文件openFile优化 2024-12-24 17:27:02 +08:00
c1363263b2 1 2024-12-24 16:43:59 +08:00
2de46a9d1a Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-12-20 13:28:18 +08:00
8e2b093a67 修改 2024-12-20 13:28:03 +08:00
4ac12f6526 feat:gitigore文件添加 2024-12-20 11:33:11 +08:00
fbfdbd797b feat:差分异常显示处理 2024-12-20 09:28:49 +08:00
7673a13455 Merge remote-tracking branch 'origin/dev' into dev 2024-12-20 09:07:13 +08:00
02c021da14 feat:差分兼容 2024-12-20 09:07:04 +08:00
eb9d46e904 忽略上传文件 2024-12-19 11:38:26 +08:00
93c1d95e36 忽略CPP目录 2024-12-19 11:15:25 +08:00
30063c3d6a feat:放开里程上传修改 2024-12-17 17:27:07 +08:00
a74dd69704 feat:放开里程上传 2024-12-17 17:26:25 +08:00
d28b9a2caa feat:济南优化 2024-12-05 18:31:06 +08:00
cd245ac226 优化 2024-12-05 13:51:36 +08:00
56f6a671eb feat:杭州&济南优化 2024-11-26 15:35:05 +08:00
daadbf868b 代码合并 2024-11-20 14:17:07 +08:00
7bed5cae6d 修改 2024-11-20 13:45:49 +08:00
33534c7253 1 2024-11-20 13:44:40 +08:00
d842eeb7bd feat:评判优化&新语音包 2024-11-18 15:16:42 +08:00
wangzhongjie
b5c67dd3e5 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-11-13 15:39:53 +08:00
64264506aa feat:fileLog提交 2024-11-06 14:49:56 +08:00
wangzhongjie
efaad0e449 新变化 2024-11-05 09:47:58 +08:00
0b2b653b8e 合并dev 2024-11-05 09:31:24 +08:00
8cf02ec456 Merge branch 'dev' into lv_chengmai 2024-11-04 10:44:53 +08:00
0140c2197c 速度显示 2024-11-01 13:44:14 +08:00
f68a521f8c 速度修改 2024-11-01 13:37:14 +08:00
4ee1c95f3b 日期修改 2024-11-01 10:30:10 +08:00
8732b4f9cc 日期显示修改 2024-10-31 15:59:47 +08:00
2d562dd3f7 1 2024-10-31 08:14:43 +08:00
abdd7664d4 双中心修改 2024-10-30 17:18:39 +08:00
aa0651ec0d 合并dev 2024-10-28 17:11:22 +08:00
21a1f20cef 合并dev代码 2024-10-28 13:47:53 +08:00
73bc75388f dev修改 2024-10-28 13:47:03 +08:00
3fade2df24 tcp carno上传 2024-10-21 09:34:27 +08:00
Surenjun
91491432d8 feat:添加里程上传 2024-10-14 09:22:29 +08:00
Surenjun
6536f9532b feat:添加里程上传 2024-10-11 13:47:24 +08:00
68d93b3b55 feat:评判优化 2024-10-09 09:15:36 +08:00
9ba033954b feat:评判优化 2024-09-27 09:50:29 +08:00
d2d13502c3 Merge remote-tracking branch 'origin/dev' into dev 2024-09-20 17:36:31 +08:00
bbc4ff8ac4 feat:评判优化 2024-09-20 17:35:54 +08:00
5bf630182e 数据库优化 2024-09-20 16:24:11 +08:00
68bef062ba 日志添加 2024-09-20 13:19:06 +08:00
264db77192 Merge remote-tracking branch 'origin/dev' into dev 2024-09-19 18:47:18 +08:00
936fec380a feat:评判更新 2024-09-19 18:46:35 +08:00
dbbe31cd41 顺序考试 2024-09-19 09:49:35 +08:00
f46c7ecd8b Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-09-18 17:05:20 +08:00
c4b8a00636 差分修改 2024-09-18 17:05:04 +08:00
5a859eb692 feat:判断更新 2024-09-18 16:50:26 +08:00
e19a2e61ed feat:添加人工扣分日志 2024-09-18 14:27:41 +08:00
842675cdf0 feat:添加人工扣分日志 2024-09-14 14:17:41 +08:00
808692d5eb Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-09-14 09:18:33 +08:00
9949fa676e 差分状态异常提示 2024-09-14 09:18:19 +08:00
b42f9c2251 Merge remote-tracking branch 'origin/dev' into dev 2024-09-14 09:10:22 +08:00
5ebf805a2c feat:添加jdzt差分判断 2024-09-14 09:10:11 +08:00
d3e022cba8 差分状态提示修改 2024-09-14 09:06:38 +08:00
811d3bda7a Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-09-13 15:42:31 +08:00
2a308302ce 人脸修改 2024-09-13 15:42:13 +08:00
9364f0ae96 feat:科目三634参数添加 2024-09-13 14:27:58 +08:00
2fb7e0c069 feat:c++更新 2024-09-13 11:17:58 +08:00
5733bf3fad feat:科目二优化 2024-09-13 11:16:04 +08:00
c0425b6e3b feat:科目二优化 2024-09-12 18:15:05 +08:00
91fa95aa9f 更新限制 2024-09-12 13:30:04 +08:00
a298fbd33c 开始考试学员切换 2024-09-12 13:06:59 +08:00
c643766f31 下载考生无学员状态修改 2024-09-12 11:27:42 +08:00
5f0ed2b450 interval修改 2024-09-12 11:23:27 +08:00
c2fa43f720 双中心修改 2024-09-12 10:51:02 +08:00
e0b0a7b777 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-09-11 16:50:10 +08:00
69a7828b40 cpp修改 2024-09-11 16:49:38 +08:00
9445377a5d Merge remote-tracking branch 'origin/dev' into dev 2024-09-09 16:59:17 +08:00
6a131afd8a feat:科目二读取项目模型优化 2024-09-09 16:59:08 +08:00
6097346330 定时器修改 2024-09-06 15:42:06 +08:00
86e101e091 Merge remote-tracking branch 'origin/dev' into dev 2024-09-06 13:36:43 +08:00
ac1e2d27b8 feat:cdsbInfo表读取优化,只存储当前考试项目 2024-09-06 13:36:33 +08:00
e148b3a5d4 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-09-05 09:02:31 +08:00
e6f5e564cf 冲突修改 2024-09-05 08:59:37 +08:00
f19a7a7743 stach 2024-09-05 08:56:01 +08:00
2a32af7fa1 feat:评判修改 2024-09-03 19:28:07 +08:00
23a4b0829a feat:评判修改 2024-09-03 14:04:47 +08:00
6ecddd7cbf feat:评判修改 2024-09-02 19:23:56 +08:00
9e5749b296 Merge remote-tracking branch 'origin/dev' into dev 2024-09-02 18:23:57 +08:00
c612ff8afd 默认值去除 2024-09-02 18:23:00 +08:00
8da91d74e0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	entry/src/main/ets/common/service/voiceService.ts
2024-09-02 18:20:19 +08:00
77ddbc9c1f 拍照錄像修改 2024-08-30 12:30:17 +08:00
a4065dde4c tcp驗證 2024-08-30 10:16:07 +08:00
ca8a535eab 刪除圖片修改 2024-08-30 09:04:23 +08:00
747f88e65a 圖片刪除 2024-08-29 12:28:19 +08:00
8e276824e8 圖片刪除 2024-08-29 11:04:10 +08:00
997cd3dc88 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-08-29 08:10:37 +08:00
157a3e86f9 定期清理日志 2024-08-29 08:10:20 +08:00
9082c5169c feat:评判修改 2024-08-28 16:39:18 +08:00
c3eecd2b1a feat:评判修改 2024-08-27 19:51:58 +08:00
7c42a590a6 大網照片 2024-08-27 19:41:15 +08:00
555aa845fd 兼容處理 2024-08-27 12:42:06 +08:00
c76615d4de 補齊字段 2024-08-27 11:31:17 +08:00
e92daee125 1 2024-08-27 11:29:08 +08:00
708dd377af 1 2024-08-27 10:49:43 +08:00
7e0ba0b21d ksyh 2024-08-27 10:14:06 +08:00
a22a8b1b00 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-08-26 19:29:34 +08:00
7ba4c2f5f0 外殼修改 2024-08-26 19:27:23 +08:00
8b9ed58a2d Merge remote-tracking branch 'origin/dev' into dev 2024-08-26 16:07:31 +08:00
522b5d32ee feat:更新 2024-08-26 16:07:11 +08:00
002a1e84d8 設備注冊提示 2024-08-26 16:00:45 +08:00
9e7e1fc4e9 Merge branch 'dev' into lv_chengmai 2024-08-26 15:11:15 +08:00
5a9af48cd9 wirteLog 2024-08-26 15:09:13 +08:00
30255599e1 Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev 2024-08-23 19:42:14 +08:00
682ec92a3b 音頻 2024-08-23 19:41:42 +08:00
9cf8b0dc58 feat:版本号修改 2024-08-23 15:59:56 +08:00
5fba22c2ed 彈框修改 2024-08-23 13:44:42 +08:00
4e4d357f7a 彈框 2024-08-23 09:37:47 +08:00
86a905e949 Merge branch 'dev' into lv_chengmai 2024-08-22 15:25:13 +08:00
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