Commit Graph

8292 Commits

Author SHA1 Message Date
donghongyu
d010ee33a8 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-27 11:26:35 +08:00
donghongyu
4b7ded6036 [Upload]
整理ADAS模块
替换3D模型

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-27 11:26:23 +08:00
renwj
9a4b270213 [BadCase]添加内置数据 2022-01-27 11:24:04 +08:00
wangmingjun
291b66643d [taxi/bus 2.5.1] bus调整UI 2022-01-27 11:21:36 +08:00
wangmingjun
ba242960c8 [taxi/bus 2.5.1] taxi/bus绘制起点终点 2022-01-26 19:47:03 +08:00
renwj
70632376e0 [Reminder]修正内存泄漏 2022-01-26 18:27:43 +08:00
lixiaopeng
bc71fa590a opt host 2022-01-26 18:14:43 +08:00
donghongyu
3d0c86e323 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-26 18:04:18 +08:00
donghongyu
24e8de608c [Upload]
删除adas部分废弃逻辑

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-26 18:04:12 +08:00
lianglihui
b91f7e2df2 2.5.1 演示模式下 到达终点将忽略 引导线绘制 选项关闭 2022-01-26 17:50:30 +08:00
renwj
f4e7e6998b [Reminder]WarningFloat添加是否入队的配置项 2022-01-26 17:36:45 +08:00
donghongyu
62a544242b Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-26 17:23:28 +08:00
renwj
04503751f0 [Reminder]修正处理逻辑 2022-01-26 17:20:00 +08:00
renwj
1bb4faa139 [Reminder]修正DebugView弹窗逻辑 2022-01-26 17:17:32 +08:00
pangfan
8a4887947c [TaxiPassengerV1.0.0]OCH: 导入Taxi乘客app首版code 2022-01-26 16:56:15 +08:00
donghongyu
f8ae514688 [Upload]
整理资源删除废弃代码

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-26 16:54:40 +08:00
renwj
5002b28ef7 [V2X]弹窗互斥逻辑和更改道路事件展示弹窗的方式 2022-01-26 16:47:21 +08:00
renwj
19ae5c4250 [BadCase]BadCase入口展示状态逻辑优化 2022-01-26 16:32:31 +08:00
donghongyu
7289326289 [Upload]
修复自车位置回调失效问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-26 15:30:39 +08:00
wangmingjun
018c206f1a [taxi/bus 2.5.1]修复bus定时任务 2022-01-26 15:15:28 +08:00
wangmingjun
bf50aa3af7 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-26 13:18:39 +08:00
wangmingjun
6ce92edaa9 [taxi/bus 2.5.1]修复定时任务 2022-01-26 13:13:08 +08:00
donghongyu
7e82e7645b [Upload]
关闭绘制Marker日志打印

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-26 11:49:22 +08:00
lixiaopeng
8ca4806527 merge old branch 2022-01-26 10:48:48 +08:00
wangmingjun
40824e822e [taxi/bus 2.5.1] 修复订单轮询 2022-01-26 10:47:58 +08:00
donghongyu
2b50699418 [Upload]
删除目的地车友相关功能

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 21:21:19 +08:00
donghongyu
93d6b4a021 [Upload]
删除目的地车友相关功能

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 21:18:25 +08:00
lianglihui
79a246ebc2 2.5.1 暂不绘制终点marker 2022-01-25 19:33:51 +08:00
pangfan
4081eef234 [251]OCH: update get BASE_URL method(基于env flavor) 2022-01-25 18:39:31 +08:00
donghongyu
0ac920fa08 [Upload]
打开加载网约车逻辑

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 18:32:20 +08:00
lianglihui
f39aff7c8c 2.5.1 美化模式 订单行程中 继续绘制车前引导线 2022-01-25 18:20:31 +08:00
donghongyu
2e636b8cb7 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-25 18:14:32 +08:00
donghongyu
102fe8d833 [Upload]
地图是否忽略判断条件直接绘制工控机引导线数据&全局路径规划
true  - 忽略
false - 不忽略
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 18:13:51 +08:00
donghongyu
9e9a4643aa [Upload]
地图是否忽略判断条件直接绘制工控机引导线数据&全局路径规划
true  - 绘制
false - 不绘制
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 18:12:56 +08:00
wangmingjun
ea64b5eb19 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1
# Conflicts:
#	OCH/mogo-och-noop/build.gradle
#	OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java
2022-01-25 17:59:19 +08:00
wangmingjun
6871ffcdb0 [taxi/bus 2.5.1] bus/noop报错处理 2022-01-25 17:48:19 +08:00
donghongyu
71898883e5 [Upload]
//是否是演示(美化)模式,会存在SP中,方便做现场恢复
FunctionBuildConfig.isDemoMode
当前APP的身份模式
0 = 司机模式(默认)
1 = 乘客模式(部分功能受到影响)
FunctionBuildConfig.appIdentityMode

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 17:42:43 +08:00
wangmingjun
d2ab2e09aa [taxi/bus 2.5.1] application 区分och设置 2022-01-25 16:54:43 +08:00
wangmingjun
9397ec6e7f Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-25 16:47:25 +08:00
wangmingjun
e015ab91a1 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1
# Conflicts:
#	app/functions/och.gradle
2022-01-25 16:47:17 +08:00
renwj
a108a1f955 [BadCase]BadCase记录添加持久化逻辑 2022-01-25 16:38:10 +08:00
wangmingjun
8a33a15cd6 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1
# Conflicts:
#	settings.gradle
2022-01-25 16:35:46 +08:00
donghongyu
46bdb9d200 [Upload]
增加乘客渠道

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 16:33:27 +08:00
wangmingjun
9bb90b9ea7 [taxi/bus 2.5.1] taxi统一 dp -> px 2022-01-25 15:36:31 +08:00
wangmingjun
d24bdacb6e [taxi/bus 2.5.1] taxi统一 dp -> px 2022-01-25 15:16:42 +08:00
wangmingjun
63d8e353b2 [taxi/bus 2.5.1] 优化jar包使用 2022-01-25 14:54:17 +08:00
wangmingjun
53e96dcb27 [taxi/bus 2.5.1] 调整订单轮询开始时机修复NPE 2022-01-25 14:26:21 +08:00
wangmingjun
fab30ebaaa [taxi/bus 2.5.1] 合并OCH到eagle, 暂时将release debuggable设置成true 2022-01-25 14:11:44 +08:00
renwenjie
b289f143de [Merge]修正冲突 2022-01-24 20:00:04 +08:00
zhongchao
429c1f1599 fix bug and update liblog verion 2022-01-24 19:26:42 +08:00