Commit Graph

1731 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
renwj
314a0899d6 [V2X][Road]施工区域添加围栏 2022-10-26 11:54: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
xuxinchao
6c64b74384 BadCase自定义Topic 2022-10-26 10:53:19 +08:00
yangyakun
79de6f731f [2.12.0-f] tts 级别 2022-10-25 17:58:48 +08:00
lixiaopeng
453c08d34b 删除魔戒的实现,添加操作魔方的约束 2022-10-25 17:23:02 +08:00
renwj
6e3b39c276 [V2X]移除无用代码;简化v2x事件触发逻辑;移除5分钟时间限制 2022-10-25 17:02:39 +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
renwj
7a10b36a7d [V2X][Road]延长过期时间至一分钟 2022-10-25 14:30:44 +08:00
renwj
b7403fed96 [V2X][Road]优化超时逻辑,并添加日志
[V2X][Road]优化计算距离逻辑
2022-10-25 12:20:49 +08:00
yangyakun
80c085c4cb Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 2022-10-24 16:40:13 +08:00
lixiaopeng
50fef032e9 添加施工占道预警下发工控机 2022-10-24 16:32:31 +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
xuxinchao
49f6a5778e 工具箱调整速度设置 2022-10-24 10:23:24 +08:00
renwj
de5eabd2c1 [V2X][Road]添加所有marker清空监听回调;解决相关bug 2022-10-21 19:46:49 +08:00
renwj
d14b2d3cb6 [Route]优化引导线绘制逻辑
xx
2022-10-21 18:08:54 +08:00
renwj
8b510d23d0 [CrashFix]由于系统配置更改导致Timer创建过多 2022-10-21 17:54:11 +08:00
xuxinchao
a5c2dcd843 SOP运营面板 2022-10-21 17:14:39 +08:00
xuxinchao
8d5af865d2 红路灯显示控制更改 2022-10-21 15:53:49 +08:00
xuxinchao
6b9dbbb8d2 扩大开启调试屏长按区域 2022-10-21 15:35:55 +08:00
chenfufeng
6a206ba7fe [Fix]解决docker2.3.0乘客屏不渲染感知定位等数据 2022-10-21 14:58:01 +08:00
lixiaopeng
c0ab0408b1 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0_gkjpb' into dev_robotaxi-d-app-module_2120_221017_2.12.0 2022-10-21 10:20:28 +08:00
xuxinchao
6cdfc4b1f0 BadCase录包 2022-10-21 09:58:16 +08:00
wangmingjun
058c6b922f Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into 'dev_robotaxi-d-app-module_2120_221017_2.12.0'
Test robotaxi d app module 2110 220915 2.11.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!294
2022-10-20 11:39:35 +00:00
xuxinchao
8837bde8a5 BadCase录包 2022-10-20 19:37:20 +08:00
lixiaopeng
553b26da7d Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_gkjpb 2022-10-20 19:13:45 +08:00
lixiaopeng
dffef06340 添加行程信息接口 2022-10-20 18:29:04 +08:00
xuxinchao
db18f69471 SOP面板 2022-10-20 18:00:28 +08:00
renwj
79e3c515a3 [V2X][Road]解决锥筒和气泡消失,但道路依然高亮的的情况 2022-10-20 17:13:49 +08:00
zhongchao
75533484ae fix bug of fun biz config 2022-10-20 16:24:31 +08:00
renwj
16d4018741 [V2X][Road]增加移除锥筒后超时消失逻辑 2022-10-20 16:22:02 +08:00
lixiaopeng
eaf201a116 优化cmdb接口 2022-10-20 15:20:28 +08:00
lixiaopeng
ada7044520 opt log 2022-10-20 14:52:33 +08:00
lixiaopeng
3bd3ece6c4 修改cmdb接口 2022-10-20 14:32:43 +08:00
zhongchao
ba02f80f3d open the limit of take over 2022-10-20 13:15:13 +08:00
renwj
a9573f21a3 [V2X][Road]非城市占道事件到来时,移除之前城市占道绘制 2022-10-20 10:40:08 +08:00
zhongchao
b7b8e0faab reopen the fun config setting 2022-10-20 09:27:27 +08:00
wangmingjun
bc01ed9e72 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0 2022-10-19 19:46:59 +08:00
wangmingjun
bb5c7a07e0 [2.11.0 fix] 暂时关闭配置中心(zhongchao) 2022-10-19 19:46:47 +08:00
renwj
6eb097a033 [状态栏][GPS]修正应用首次启动后,授权后,GPS状态未高亮显示 2022-10-19 19:41:35 +08:00
zhongchao
1f1ea72c16 .. 2022-10-19 14:48:53 +08:00
zhongchao
644789bd3b fix bug of ui 2022-10-19 14:48:16 +08:00
zhongchao
fc71e35270 fix ui problem of vip 2022-10-19 11:51:59 +08:00
xinfengkun
ded5a700e1 [change] 更新数据采集配置 添加参数 2022-10-18 21:42:53 +08:00
zhongchao
49570aab23 🆕 add func of biz config in 2.11.0 2022-10-18 19:11:31 +08:00
zhongchao
3879bcde7c reset traffic light control api 2022-10-18 16:51:27 +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
zhongchao
e481a899e8 fix bug of vip multi times 2022-10-18 15:33:42 +08:00