Commit Graph

501 Commits

Author SHA1 Message Date
yangyakun
0856e5b0d8 [6.8.4]
[fix]
[driver]
[数据版本兼容]
2025-01-07 11:43:00 +08:00
xinfengkun
909809fead Merge branch 'refs/heads/dev_robobus-d_241226_6.8.6' into dev_robotaxi-d_241210_6.9.0
# Conflicts:
#	OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
#	gradle.properties
2025-01-03 18:19:58 +08:00
yangyakun
434ea16e63 [6.9.0]
[fea]
[offline bus shuttle Scheduled]
[db bean 分离]
2025-01-02 10:17:16 +08:00
yangyakun
decb2f1112 Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0
# Conflicts:
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
2024-12-31 18:17:12 +08:00
yangyakun
c3019e389e [6.8.4]
[fix]
[bus、shuttle、Scheduled]
[led end station]
2024-12-31 18:14:18 +08:00
yangyakun
8b10cb6df1 [6.8.4]
[fix]
[bus、shuttle、Scheduled]
[led end station]
2024-12-31 18:07:27 +08:00
yangyakun
f436374079 [6.9.0]
[fea]
[taxi]
[ota 升级]
2024-12-31 17:16:02 +08:00
yangyakun
cff56a1267 [6.9.0]
[fea]
[taxi]
[选择新的标定站点]
2024-12-30 18:03:24 +08:00
yangyakun
1dd4829509 [6.8.4]
[fix]
[shuttle、bus、scheduled]
[参数相反]
2024-12-27 12:01:34 +08:00
yangyakun
416c6240bf Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0 2024-12-26 17:41:57 +08:00
yangyakun
5b487440ea [6.8.4]
[fix]
[shuttle、bus、scheduled]
[轨迹处理]
2024-12-26 17:41:16 +08:00
yangyakun
434d781511 Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0
# Conflicts:
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
2024-12-26 15:31:03 +08:00
yangyakun
47bb6ec86d [6.8.4]
[fea]
[all]
[LineInfo 中添加 线路中所有的站点]
2024-12-26 11:28:26 +08:00
yangyakun
64b343c5ba [6.8.4]
[fea]
[bus、shuttle、scheduled]
[下发轨迹 在选择任务时]
2024-12-26 10:14:48 +08:00
yangyakun
24563d2c2d [6.8.4]
[fix]
[全局添加shiftsId]
2024-12-25 19:15:54 +08:00
yangyakun
7dc8771656 [6.8.4]
[fea]
[核销 type 兼容]
2024-12-25 11:51:11 +08:00
yangyakun
1e4c4b6331 [6.8.4]
[fea]
[核销二维码兼容]
2024-12-24 18:40:07 +08:00
yangyakun
875243be9a [6.8.4]
[fix]
[单程结束 不下发轨迹]
2024-12-24 18:26:14 +08:00
yangyakun
e1948f62f0 Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0 2024-12-24 17:29:44 +08:00
yangyakun
85bf4e840b [6.8.4]
[fix]
[错误二维码]
2024-12-24 17:18:04 +08:00
yangyakun
c0c42e76f8 [6.8.4]
[fea]
[taxi 展示当前所在站点]
2024-12-24 17:16:10 +08:00
yangyakun
93ac33eb69 [6.8.4]
[fix]
[未选择任务、核销提示]
2024-12-24 16:55:29 +08:00
yangyakun
d79a22d8a1 [6.9.0]
[fea]
[tts 文案修改]
2024-12-24 10:39:22 +08:00
xyz
70cb6b528e [6.8.2]
1、找回融合红绿灯事件
2024-12-20 10:14:28 +08:00
yangyakun
4eccafe8d0 [6.9.0]
[fea]
[dao 不能混用]
2024-12-19 18:22:57 +08:00
yangyakun
88566ffe0e [6.9.0]
[fea]
[访客模式]
2024-12-19 17:16:07 +08:00
yangyakun
67e8d3f294 [6.9.0]
[fea]
[recode]
2024-12-19 09:49:58 +08:00
yangyakun
7308373ff3 [6.9.0]
[fix]
[部分db迁移]
2024-12-18 18:27:22 +08:00
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
yangyakun
33e474ea7f [6.8.2]
[fix]
[暂时隐藏路口事件]
2024-12-12 12:06:24 +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