Commit Graph

4055 Commits

Author SHA1 Message Date
yangyakun
f62fb218f7 [6.8.0]
[fea]
[核销次数查询和展示]
2024-11-19 19:42:18 +08:00
yangyakun
21003a1a8c [6.8.0]
[fea]
[核销次数校验]
2024-11-19 19:08:13 +08:00
yangyakun
6e2a9df424 [6.8.0]
[fea]
[本地缓存任务添加任务重等待上传的核销人数]
2024-11-19 18:22:40 +08:00
yangyakun
8af7cfd017 [6.8.0]
[fea]
[有未上传核销数据 不能结束任务]
2024-11-19 18:02:18 +08:00
yangyakun
93f6e9b72d [6.8.0]
[fea]
[shuttle 核销全流程]
2024-11-19 17:49:23 +08:00
yangyakun
241ba6feb6 Merge remote-tracking branch 'origin/dev_robotaxi-d_241112_6.8.0' into dev_robotaxi-d_241112_6.8.0
# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt
2024-11-19 14:27:08 +08:00
yangyakun
99815879f4 Merge branch 'refs/heads/dev_robobus-d_241028_6.8.0_yyk' into dev_robotaxi-d_241112_6.8.0
# Conflicts:
#	gradle.properties
2024-11-19 14:21:13 +08:00
yangyakun
7db12ccbe7 [6.8.0]
[fea]
[核销、未通知小程序]
2024-11-19 14:20:21 +08:00
xinfengkun
d8b78fdb1d Merge branch 'dev_robotaxi-d_241112_6.8.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_241112_6.8.0 2024-11-19 10:34:28 +08:00
xinfengkun
2531d8f4f2 [672][app][device]升级build gradle版本到3.5.4用于兼容Android11 manifest <queries>标签;添加硬件管理模块用于管理车载已硬件:新老核销、语音模块等;OCH核销依赖下沉; 2024-11-19 10:32:56 +08:00
donghongyu-pc
d1fa6a5aa1 Merge branch 'refs/heads/dev_robobus-d_241028_6.7.3' 2024-11-19 10:12:35 +08:00
yangyakun
da414503b9 [6.8.0]
[fea]
[核销、未通知小程序]
2024-11-18 14:53:59 +08:00
yangyakun
d680db18a4 Merge branch 'refs/heads/dev_robobus-d_241028_6.7.3' into dev_robobus-d_241028_6.8.0_yyk
# Conflicts:
#	OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json
2024-11-18 09:44:59 +08:00
yangyakun
0360652036 [6.7.3]
[fix]
[添加时间戳]
2024-11-15 17:21:17 +08:00
yangyakun
1bd92600c3 [6.7.3]
[fix]
[删除数据库 保留正在执行和已执行的任务]
2024-11-15 16:27:25 +08:00
donghongyu-pc
aac713d2b0 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' 2024-11-15 16:15:11 +08:00
yangyakun
e66b8ec900 [6.7.3]
[fix]
[add 删除多余操作]
2024-11-15 15:52:15 +08:00
yangyakun
124f3642cb [6.7.3]
[fix]
[msgid+null 处理]
2024-11-15 14:41:04 +08:00
yangyakun
4fccb7743c [6.7.3]
[fix]
[高度修改]
2024-11-15 13:53:02 +08:00
yangyakun
260a881d86 [6.7.3]
[fix]
[启动超时设置状态]
2024-11-15 12:14:45 +08:00
yangyakun
68f5567d9e [6.7.3]
[fix]
[属性变更]
2024-11-15 12:14:24 +08:00
yangyakun
4d89031d22 [6.7.3]
[fix]
[前台检测是否有执行的任务、loading 超时处理]
2024-11-15 11:07:07 +08:00
yangyakun
ac73ef625b [6.7.3]
[fix]
[media sn 获取逻辑]
2024-11-15 10:38:08 +08:00
yangyakun
412452d5ac [6.7.3]
[fix]
[添加 msgId和update_time]
2024-11-15 10:33:56 +08:00
donghongyu
434ebd2b99 Merge branch 'dev_robotaxi-d_240912_6.7.2_local' 2024-11-14 20:24:59 +08:00
donghongyu-pc
29ba00a84d Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' into dev_robobus-d_241028_6.7.3 2024-11-14 20:12:37 +08:00
donghongyu-pc
a8259b7510 [6.7.3]
1、修复乘客屏幕的状态栏高度,防止被遮盖
2024-11-14 19:49:21 +08:00
yangyakun
7b942cde74 [6.7.3]
[fix]
[writeversion 上报服务器后 再写入上报成功时间]
2024-11-14 18:58:18 +08:00
yangyakun
52f1a15b06 [6.7.3]
[fix]
[event 上报接口按照顺序上报]
2024-11-14 18:54:38 +08:00
donghongyu
341303fe8c [6.7.2]
1、修复B2车型因物理边框导致顶部Logo遮盖问题
2024-11-14 17:37:51 +08:00
yangyakun
ad532478e7 [6.8.4]
[fea]
[核销逻辑]
2024-11-14 16:09:16 +08:00
yangyakun
8016638ac6 [6.7.3]
[fix]
[数据库版本不兼容 直接重建数据库]
2024-11-14 11:24:08 +08:00
yangyakun
e22821e7c8 [6.7.3]
[fix]
[taxi 添加重试逻辑]
2024-11-14 11:09:03 +08:00
yangyakun
4a5da037bc Merge branch 'refs/heads/dev_robobus-d_241028_6.7.3' into dev_robobus-d_241028_6.8.0_yyk 2024-11-13 16:33:09 +08:00
yangyakun
74546bf626 [6.7.3]
[fix]
[自驾中启动自驾的特殊情况、日志继续上报 UI修复]
2024-11-13 16:31:15 +08:00
yangyakun
ced4cf7517 [6.8.0]
[fea]
[对任务进行排序]
2024-11-13 16:15:48 +08:00
yangyakun
4420086918 [6.8.0]
[fea]
[核销]
2024-11-13 11:37:52 +08:00
yangyakun
13aa8b4d5c [6.8.0]
[fea]
[改造lineRepository]
2024-11-13 11:37:52 +08:00
yangyakun
4a4659e300 [6.8.0]
[fea]
[bus shuttle code]
2024-11-13 11:37:52 +08:00
yangyakun
985578d9f9 [6.7.3]
[fix]
[高度修改]
2024-11-13 11:21:58 +08:00
yangyakun
0f4eb09546 [6.7.3]
[fix]
[offline UI展示]
2024-11-13 10:53:30 +08:00
yangyakun
d26c761e68 [6.7.3]
[fix]
[offline 添加判空]
2024-11-13 10:37:13 +08:00
yangyakun
04ce74a69c [6.7.3]
[fix]
[mogo dir create]
2024-11-12 19:20:17 +08:00
yangyakun
65d254249f [6.7.3]
[fix]
[乘客屏广告修复]
2024-11-12 16:03:49 +08:00
donghongyu-pc
2b3e3a2cf7 Merge branch 'refs/heads/dev_robobus-d_241028_6.7.3' 2024-11-12 11:41:09 +08:00
yangyakun
7e18ab9211 [6.7.3]
[fix]
[避免任务被删除]
2024-11-12 10:59:39 +08:00
yangyakun
06478bd548 [6.7.3]
[fix]
[line 唯一条件变更]
2024-11-11 18:45:56 +08:00
yangyakun
29927acaf6 [6.7.3]
[fix]
[线路和站点更新逻辑变更]
2024-11-11 15:59:42 +08:00
yangyakun
36d1132931 [6.7.3]
[fix]
[used_task_data_table add order by seq]
2024-11-11 14:29:33 +08:00
zhongchao
a72a136139 [master] merge 6.7.4 conflict gradle version 2024-11-11 14:27:10 +08:00