yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,968 Commits 1 Branch 0 Tags
8a75f3bb22f9df042a68da314f9efc573dcfe3c8
Commit Graph

920 Commits

Author SHA1 Message Date
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
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
f12974f73c [2.12.0] taxi送驾高德导航优化 2022-11-11 21:48:51 +08:00
zhongchao
e52ba22a56 wait 2022-11-11 18:07:24 +08:00
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08: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
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
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
a836c31728 wait to finish 2022-11-10 10:54:57 +08: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
wangmingjun
089e2b9025 [2.12.0] 1、bus乘客屏断开司机端连接时候，轨迹计算结束 2、bus司机端乘客核销语音播报文字修改 2022-11-09 15:32:47 +08:00
wangmingjun
2225fed83a [2.12.0] taxi预约单关闭时候中断语音播报 2022-11-08 17:57:18 +08:00
wangmingjun
633212a9fe [2.12.0] taxi司机端前往目的地轨迹里里程播报逻辑调整 2022-11-08 14:30:58 +08:00
zhongchao
7868bf626f Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_212-_221017_2.12.0_code_style_opt 2022-11-08 11:07:32 +08:00
zhongchao
fbe1801488 [2.12.0] local code style change 2022-11-08 11:03:10 +08:00
wangmingjun
5ba5ca015d [2.12.0] bus乘客屏轨迹绘制条件调整 2022-11-07 17:56:01 +08:00
wangmingjun
05bb472d9b [2.11.0] fix bus两个站点时，乘客屏估计绘制bug 2022-11-07 17:55:24 +08:00
pangfan
453e0f2773 [2.12.0]增加"无法开启自驾前已知异常"埋点上报 2022-11-03 20:06:40 +08:00
wangmingjun
e42d256d09 [2.12.0] fix taxi司机端取消订单后，再次下单无语音播报问题 2022-11-03 17:35:18 +08:00
wangmingjun
33a462aa1c [2.12.0] bus 添加外屏接口log 2022-11-03 15:09:46 +08:00
yangyakun
78bdc25166 [2.8.0-f] 司机端sn 2022-11-01 19:55:11 +08:00
yangyakun
77987b66cd [2.8.0-f] taxip 适配完成 2022-11-01 19:53:14 +08:00
yangyakun
0bc581a394 [2.8.0-f] bus busp taxi 适配完成 2022-11-01 17:21:42 +08:00
pangfan
a676ea93c9 opt:merge conflict resolved(清扫车司机端app修改引入) 2022-10-31 14:23:20 +08:00
pangfan
a68463a813 Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1' 
# Conflicts:
#   app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#   core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
 2022-10-31 03:08:24 +00:00
yangyakun
79e4606461 土司 AlertDialog 修改 2022-10-30 23:44:10 +08:00
wangmingjun
c672905b7e [2.12.0] bus乘客屏轨迹绘制条件调整 2022-10-29 13:21:38 +08:00
wangmingjun
e9fe4599a0 [2.11.0] fix bus两个站点时，乘客屏估计绘制bug 2022-10-29 11:42:28 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
renwj
803386c9c7 [解决冲突]code fix 2022-10-27 18:44:53 +08:00
wangmingjun
6021a30ba9 [2.12.0] bus司机端结束/跑完路线后清空鹰眼小地图轨迹 2022-10-27 15:37:05 +08:00
yangyakun
b91f1d0675 [2.12.0-f] tts 补漏 2022-10-26 21:04:07 +08:00
zhongchao
16c7bd9755 add func of statusbar and func config wait to update 2022-10-26 18:59:08 +08:00
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
5707d28ae9 [2.11.0] bus司机端显示/隐藏轨迹调试信息 2022-10-26 14:40:55 +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