Commit Graph

10968 Commits

Author SHA1 Message Date
zhongchao
8a75f3bb22 [2.13.0] merge yakun and code style 2022-11-21 18:30:49 +08:00
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +08:00
zhongchao
1fec32f633 merge 2022-11-21 14:47:53 +08:00
zhongchao
b119e62fe5 .. 2022-11-21 12:49:50 +08:00
zhongchao
3d46df4d32 fix status bar 2022-11-21 12:49:27 +08:00
zhongchao
0ba6d8896e .. 2022-11-21 12:08:26 +08:00
yangyakun
014d4f0aa7 适配 2022-11-18 15:43:28 +08:00
yangyakun
4be507613b StatusBar 高度计算 设置background后需要重新设置padding 2022-11-18 12:49:34 +08:00
yangyakun
1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
2022-11-18 10:36:15 +08:00
pangfan
2b38bf67c0 Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-11-15 11:23:39 +08:00
wangmingjun
10a9e7e3b1 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!364
2022-11-11 13:49:29 +00:00
wangmingjun
f12974f73c [2.12.0] taxi送驾高德导航优化 2022-11-11 21:48:51 +08:00
zhongchao
900213d694 [2.12.0]find the wu yu zi code and update log version 2022-11-11 19:16:53 +08:00
zhongchao
e52ba22a56 wait 2022-11-11 18:07:24 +08:00
lixiaopeng
9707137c21 修改设置速度按钮 2022-11-11 17:11:22 +08:00
yangyakun
0aadcd8763 [2.8.0-f] 资源整理 2022-11-11 15:12:17 +08:00
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08:00
wangmingjun
e8e84d586e Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!361
2022-11-10 12:06:28 +00:00
wangmingjun
6ec0f08275 [2.12.0] taxi/bus 启动自驾埋点代码优化 2022-11-10 20:05:53 +08:00
zhongchao
2156d2cd18 wait 2022-11-10 16:54:26 +08:00
yangyakun
31a840c78a [2.8.0-f] 不支持sp 防止影响Toast 2022-11-10 16:51:54 +08:00
wangmingjun
1c94413930 [2.12.0] taxi/bus 美化模式下启动自驾失败,自动驾驶按钮状态不弹失败 2022-11-10 16:28:40 +08:00
wangmingjun
e6e8267583 [2.12.0] add taxi乘客屏增加启动自驾超时埋点原因 2022-11-10 15:56:38 +08:00
wangmingjun
95535ec201 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!358
2022-11-10 07:19:34 +00:00
wangmingjun
1a01a01dd6 [2.12.0] fix taxi乘客屏送驾高德导航优化 2022-11-10 15:14:26 +08:00
wangmingjun
b4d64c5b27 [2.12.0] fix taxi司机端点击送驾导航崩溃问题 2022-11-10 14:55:29 +08:00
zhongchao
5322d03ec1 wait 2022-11-10 11:58:05 +08:00
zhongchao
a836c31728 wait to finish 2022-11-10 10:54:57 +08:00
yangyakun
e75db415e7 [2.8.0-f] 方向盘向左时竖线bug 2022-11-10 10:45:05 +08:00
wangmingjun
fe16c3942f Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!355
2022-11-09 13:34:42 +00:00
wangmingjun
a9333e0123 [2.12.0] taxi/bus自动驾驶启动失败返回逻辑处理 2022-11-09 21:32:03 +08:00
wangmingjun
26da04fc37 [2.12.0] taxi-d/-p /bus-d 增加启动自驾失败埋点上传, 2022-11-09 20:00:08 +08:00
wangmingjun
3035d2ba86 [2.12.0] taxi-d/-p /bus-d 增加启动自驾失败埋点 2022-11-09 18:30:39 +08:00
yangyakun
4cdcd9bad2 [2.8.0-f] 版本号修改、background影响paddin、图片适配 2022-11-09 17:15:00 +08:00
wangmingjun
6732ed9a00 [2.12.0] 1、taxi司机端解决取消上一单,新订单里程和时间闪一下旧数据问题 2022-11-09 16:46:14 +08:00
lianglihui
b9c0718d63 2.12.0 hdmap mapParams 增加地图显示数据类型 2022-11-09 16:28:07 +08:00
lianglihui
9a43fe76dc 2.12.0 hdmap mapParams 增加地图显示数据类型 2022-11-09 16:26:53 +08:00
renwj
2909b2e041 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2120_221017_2.12.0' into test_robotaxi-d-app-module_2120_221017_2.12.0.1 2022-11-09 16:17:22 +08:00
renwj
623d835119 [2.12.0][Route]移除引导线相关日志 2022-11-09 16:13:10 +08:00
wangmingjun
089e2b9025 [2.12.0] 1、bus乘客屏断开司机端连接时候,轨迹计算结束 2、bus司机端乘客核销语音播报文字修改 2022-11-09 15:32:47 +08:00
lianglihui
8b473ec4b6 2.12.0 revert 小地图修改 213再处理 2022-11-09 14:51:20 +08:00
xinfengkun
79780c804b [change] 统计回调添加注册取消注册 2022-11-09 14:51:20 +08:00
lianglihui
e2d90821eb 2.12.0 revert 小地图修改 213再处理 2022-11-09 14:49:54 +08:00
xinfengkun
59710530fe 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-11-09 14:22:11 +08:00
xinfengkun
8ba6f22c19 [change] 统计回调添加注册取消注册 2022-11-09 14:22:00 +08:00
wangmingjun
490603220d Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!352
2022-11-08 11:37:48 +00:00
chenfufeng
6cb5ff049a [Fix]解决高精地图在NUC设备上崩溃问题 2022-11-08 18:23:28 +08:00
wangmingjun
2225fed83a [2.12.0] taxi预约单关闭时候中断语音播报 2022-11-08 17:57:18 +08:00
lianglihui
d4b800e89e 2.12.0 fix ADCU 全局路径数据和自动驾驶状态不一致导致的 小地图轨迹被清除 2022-11-08 16:55:18 +08:00
lianglihui
594859bf01 2.12.0 fix ADCU 全局路径数据和自动驾驶状态不一致导致的 小地图轨迹被清除 2022-11-08 16:41:32 +08:00