Commit Graph

858 Commits

Author SHA1 Message Date
yangyakun
1b1ad39fe7 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-10-26 15:19:28 +08:00
wangmingjun
f33a63cb64 [2.12.0] bus司机端给外屏接口调整 2022-10-26 12:13:21 +08:00
xinfengkun
6b5549d2f8 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2120_221017_2.12.0 2022-10-26 11:34:16 +08:00
xinfengkun
9300baf426 [change] 更新行程信息接口 2022-10-26 11:34:02 +08:00
wangmingjun
e20abe099b [2.12.0] bus司机端参数异常处理 2022-10-26 10:57:20 +08:00
yangyakun
79de6f731f [2.12.0-f] tts 级别 2022-10-25 17:58:48 +08:00
wangmingjun
022edb39b6 [2.12.0] common 增加轨迹计算新方法代码(暂不用) 2022-10-25 17:33:41 +08:00
wangmingjun
a718188b99 Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into dev_robotaxi-d-app-module_2120_221017_2.12.0
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-10-25 14:51:01 +08:00
wangmingjun
0e8cf29171 [2.12.0] 1、bus司机端增加通知外屏的行程信息 2、taxi 司机屏送驾导航优化 2022-10-25 14:18:50 +08:00
wangmingjun
b20d8e20b0 [2.12.0] taxi 司机屏送驾导航优化 2022-10-24 19:21:59 +08:00
wangmingjun
c4a4e864eb Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_221017_2.12.0
# Conflicts:
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
2022-10-24 18:37:39 +08:00
wangmingjun
2d35081c74 [2.12.0] taxi 乘客屏增加无轨迹导航 2022-10-24 18:35:10 +08:00
yangyakun
4d0083968e Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-10-24 16:22:32 +08:00
zhongchao
f98195788b merge 2022-10-24 11:15:57 +08:00
wangmingjun
295300c54f [2.12.0] taxi 司机端送驾高德导航 2022-10-23 16:21:41 +08:00
wangmingjun
94747dc1ec [2.11.0] bus 司机端在中断任务后清除marker 2022-10-21 17:15:04 +08:00
wangmingjun
b29c35ada5 [2.12.0] taxi 司机端增加送驾带轨迹导航 2022-10-21 17:09:32 +08:00
wangmingjun
6f5855af44 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_local_2.12.0 2022-10-21 14:51:42 +08:00
wangmingjun
e52bf89c99 [2.12.0] taxi 司机端增加送驾带轨迹导航 2022-10-21 14:50:23 +08:00
wangmingjun
96111fe9cd [2.12.0] 根据自驾轨迹绘制前往目的地路线 2022-10-20 19:21:07 +08:00
wangmingjun
413ea46fab [2.11.0] 1、bus到站接口请求容错处理 2、taxi乘客屏偶现崩溃处理 2022-10-20 14:18:38 +08:00
wangmingjun
1d88fa124b Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_local_2.12.0 2022-10-20 10:49:55 +08:00
wangmingjun
8bef04383e [2.12.0] opt 2022-10-20 10:49:31 +08:00
wangmingjun
744be59e4d [2.12.0 fix] opt 2022-10-19 19:37:42 +08:00
wangmingjun
1109917f73 [2.11.0 fix] bus司机端解决Map280版本到站密集问题, 只比对坐标前五位 2022-10-19 11:24:09 +08:00
wangmingjun
bd33717c10 [2.11.0 fix] bus司机端解决Map280版本到站返回密集中间站滑动出发立马到站问题 2022-10-18 19:06:45 +08:00
wangmingjun
c9bd42373d [2.11.0 fix] bus司机端解决Map280版本到站返回密集中间站滑动出发立马到站问题 2022-10-18 19:04:55 +08:00
wangmingjun
8fc495ecb9 [2.12.0 ] opt 2022-10-18 18:04:58 +08:00
wangmingjun
463e481aad Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_local_2.12.0
# Conflicts:
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
2022-10-18 16:49:28 +08:00
yangyakun
15aacad278 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 2022-10-18 15:56:53 +08:00
wangmingjun
143c082a6d [2.11.0] taxi 司机端AdasAbilityManager release 2022-10-18 15:24:55 +08:00
wangmingjun
772c4fd920 [2.11.0] opt 2022-10-18 15:22:26 +08:00
yangyakun
20fb8567ae [feature] taxi乘客验证小键盘调整 2022-10-18 14:48:47 +08:00
renwj
46f8bc8c94 [V2X][Road]视角切换也要保持绘制状态 2022-10-18 14:13:26 +08:00
wangmingjun
95906ace1f Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_local_2.12.0 2022-10-18 14:12:17 +08:00
wangmingjun
ef50758aaf [2.11.0]远近视角下对marker显示不再做限制 2022-10-18 13:19:38 +08:00
wangmingjun
959f0bafab [2.11.0]美化模式下,bus司机端到达中间站,强制绘制不传false,乘客屏同步不传false 2022-10-18 12:06:20 +08:00
wangmingjun
e3d60b975e [2.12.0] opt 2022-10-18 10:58:38 +08:00
renwj
a8eb16f43e [V2X][Road]城市占道施工适配地图视角切换逻辑 2022-10-17 19:52:13 +08:00
yangyakun
ebac03d7f2 [feature] 通过反射调整间隙 2022-10-17 18:04:11 +08:00
wangmingjun
0ada00a5c5 [2.11.0] bus司机端自驾状态赋值逻辑优化 2022-10-17 17:46:46 +08:00
wangmingjun
4e30eda32f [2.11.0] 1、bus司机端 规范结束/中断任务 清空tag 2022-10-17 12:00:15 +08:00
yangyakun
2d7970bfa0 [feature] 跑马灯 2022-10-17 11:39:17 +08:00
wangmingjun
0234b9cc60 [2.11.0] 1、bus 司机端添加日志 2022-10-17 08:52:47 +08:00
wangmingjun
fbe11c22c4 [2.11.0] [fix]1、bus 小地图清除轨迹 2、taxi自驾按钮显示bug修复 2022-10-14 19:58:52 +08:00
wangmingjun
ecda801c35 [2.11.0] [fix]1、bus美化模式结束任务自驾按钮展示调整 2、taxi订单列表catch异常 2022-10-14 16:53:06 +08:00
wangmingjun
040cc745dc [2.11.0 fix] 空指针异常 2022-10-14 13:19:36 +08:00
yangyakun
aa3594d75c [fix] 加上trycatch 2022-10-14 12:08:56 +08:00
wangmingjun
5410a659f2 [2.11.0 fix] 1、bus司机端修复美化模式下结束路线自动驾驶按钮状态bug 2、bus乘客屏结束路线bug 2022-10-13 19:05:33 +08:00
wangmingjun
f5a1acbce8 [2.11.0 fix] 1、bus司机端 中间站启动自动驾驶动画bug 2、启动自驾档位异常区分taxi和bus 2022-10-13 15:55:46 +08:00