yangyakun
|
632ecf5ed0
|
Merge remote-tracking branch 'origin/dev_robotaxi-d_241202_6.8.2' into dev_robobus-d_241202_6.8.4
# Conflicts:
# OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
# OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt
# OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt
# gradle.properties
|
2024-12-18 18:15:36 +08:00 |
|
yangyakun
|
6e4a22bbac
|
[6.8.4]
[fix]
[lineId 判空]
|
2024-12-18 17:59:24 +08:00 |
|
yangyakun
|
02fd2e3334
|
[6.8.4]
[fix]
[有任务 就要设置上自驾信息]
|
2024-12-18 16:27:32 +08:00 |
|
yangyakun
|
41575a7554
|
[6.8.4]
[fea]
[添加orderid]
|
2024-12-18 11:24:19 +08:00 |
|
yangyakun
|
1a55b23e03
|
[6.8.4]
[fea]
[recode]
|
2024-12-18 10:07:16 +08:00 |
|
yangyakun
|
c2593a8766
|
[6.8.4]
[fea]
[班车核销]
|
2024-12-17 17:10:54 +08:00 |
|
yangyakun
|
a2fe4e1ccf
|
[6.8.4]
[fea]
[detailId -> shiftsId]
|
2024-12-17 17:10:36 +08:00 |
|
yangyakun
|
60c13cab0c
|
[6.8.4]
[fea]
[班车核销]
|
2024-12-17 15:16:56 +08:00 |
|
yangyakun
|
af4b016f10
|
[6.8.4]
[fea]
[saas 公交、接驳、班车 从登录状态接口 恢复业务数据]
|
2024-12-17 11:00:07 +08:00 |
|
yangyakun
|
8de4bb649f
|
[6.8.4]
[fea]
[room 重写 update]
|
2024-12-16 17:21:25 +08:00 |
|
yangyakun
|
e4e72ec246
|
[6.8.4]
[fea]
[恢复taskId]
|
2024-12-16 15:21:56 +08:00 |
|
yangyakun
|
a476cb2722
|
[6.8.4]
[fea]
[班车同步和上报逻辑]
|
2024-12-13 16:31:47 +08:00 |
|
yangyakun
|
098b47246b
|
[6.8.4]
[fea]
[reset log]
|
2024-12-13 11:40:02 +08:00 |
|
yangyakun
|
ed30fe2694
|
[6.8.4]
[fea]
[add bridge module]
|
2024-12-12 17:05:08 +08:00 |
|
xyz
|
af9c61dbf3
|
Merge branch 'dev_robotaxi-d_241112_6.8.1' into dev_robobus-d_241202_6.8.4
# Conflicts:
# gradle.properties
|
2024-12-10 14:13:30 +08:00 |
|
yangyakun
|
51c22c805e
|
[6.8.4]
[fea]
[数据库降级处理]
|
2024-12-10 12:49:45 +08:00 |
|
yangyakun
|
2c73bf9f20
|
[6.8.4]
[fea]
[添加日志]
|
2024-12-09 19:08:40 +08:00 |
|
yangyakun
|
18fc3c11ef
|
[6.8.4]
[fea]
[添加日志]
|
2024-12-09 18:35:54 +08:00 |
|
yangyakun
|
49f0d96c07
|
[6.8.4]
[fea]
[数据库降级处理]
|
2024-12-09 17:23:52 +08:00 |
|
yangyakun
|
47718b2130
|
[6.8.4]
[fea]
[代码整理]
|
2024-12-06 18:18:31 +08:00 |
|
aibingbing
|
8600d61086
|
[数据上车] fix: 恢复被删除的代码；
|
2024-12-06 17:46:54 +08:00 |
|
yangyakun
|
cee6be8bb5
|
[6.8.2]
[fea]
[轨迹下载回调相关]
|
2024-12-06 14:31:57 +08:00 |
|
yangyakun
|
d98a9d3b1a
|
Rename .java to .kt
|
2024-12-06 14:31:57 +08:00 |
|
yangyakun
|
cc422a1eb2
|
[6.8.0]
[fea]
[添加地图参数]
|
2024-12-04 11:51:05 +08:00 |
|
yangyakun
|
acd15af0fa
|
[6.8.0]
[fea]
[添加地图参数]
|
2024-12-04 11:46:19 +08:00 |
|
yangyakun
|
656cfcad28
|
[6.8.0]
[fix]
[获取验证码添加日志]
|
2024-12-02 16:47:01 +08:00 |
|
yangyakun
|
e5964cfd14
|
[6.8.0]
[fix]
[handle 改 Rxjava]
|
2024-11-29 16:26:08 +08:00 |
|
yangyakun
|
73c9864685
|
[6.8.0]
[fix]
[时间戳统一除100]
|
2024-11-29 15:04:43 +08:00 |
|
yangyakun
|
57f2165634
|
[6.8.0]
[fix]
[bus 不带routeinfo]
|
2024-11-29 15:00:42 +08:00 |
|
yangyakun
|
b1e66d49c0
|
[6.8.0]
[fea]
[重新设置下载轨迹]
|
2024-11-29 12:05:13 +08:00 |
|
yangyakun
|
accaf2a35e
|
[6.8.0]
[fea]
[有待核销上传可以结束任务]
|
2024-11-29 11:14:31 +08:00 |
|
yangyakun
|
1d885d1503
|
[6.8.0]
[fix]
[站点展示]
|
2024-11-29 11:11:40 +08:00 |
|
yangyakun
|
e4e632f9aa
|
[6.8.0]
[fea]
[event 上报删除分页 并根据businessTime 排序]
|
2024-11-28 17:36:05 +08:00 |
|
yangyakun
|
6e826f3446
|
[6.8.0]
[fea]
[event 上报删除分页 并根据businessTime 排序]
|
2024-11-28 17:31:38 +08:00 |
|
yangyakun
|
f31d410610
|
[6.8.0]
[fix]
[蓝牙广播]
|
2024-11-28 14:08:26 +08:00 |
|
yangyakun
|
ed91f30f39
|
[6.8.0]
[fix]
[结束任务]
|
2024-11-28 14:08:13 +08:00 |
|
yangyakun
|
c50b69f14d
|
[6.8.0]
[fix]
[null 检测]
|
2024-11-28 10:38:50 +08:00 |
|
yangyakun
|
ffd3f0d3a0
|
[6.8.0]
[fix]
[核销顺序]
|
2024-11-27 18:32:02 +08:00 |
|
yangyakun
|
bc27dfefb0
|
[6.8.0]
[fix]
[其他车辆任务变更]
|
2024-11-27 15:11:41 +08:00 |
|
yangyakun
|
82a57c10f9
|
[6.8.0]
[fea]
[指挥底盘下载轨迹 变更]
|
2024-11-27 10:51:11 +08:00 |
|
yangyakun
|
9274957d2d
|
[6.8.0]
[fix]
[站点错误兼容]
|
2024-11-26 19:35:57 +08:00 |
|
yangyakun
|
e546dc20d4
|
[6.8.0]
[fix]
[任务重选问题]
|
2024-11-26 12:21:21 +08:00 |
|
yangyakun
|
fa053b81c7
|
[6.8.0]
[fix]
[蓝牙更多的监听]
|
2024-11-25 20:39:58 +08:00 |
|
yangyakun
|
925e190ad3
|
[6.8.0]
[fix]
[车外语音]
|
2024-11-25 10:54:39 +08:00 |
|
yangyakun
|
f18b9e8ed8
|
[6.8.0]
[fix]
[蓝牙维持30s连接]
|
2024-11-25 10:08:15 +08:00 |
|
yangyakun
|
b53d4d2df3
|
[6.8.0]
[fix]
[数据库添加索引]
|
2024-11-22 14:51:19 +08:00 |
|
yangyakun
|
06f880dd0c
|
[6.8.0]
[fix]
[待上传未上传核销人数统计]
|
2024-11-22 11:22:57 +08:00 |
|
yangyakun
|
6c07624991
|
[6.8.0]
[fea]
[核销人数计算]
|
2024-11-22 11:05:08 +08:00 |
|
yangyakun
|
8357a7933e
|
[6.8.0]
[fea]
[视频流广告]
|
2024-11-21 16:51:20 +08:00 |
|
yangyakun
|
ef966a1e73
|
[6.8.0]
[fea]
[日志]
|
2024-11-21 15:36:12 +08:00 |
|