Commit Graph

12542 Commits

Author SHA1 Message Date
xuxinchao
9a6d559d09 Merge branch 'dev_robobus-d_230322_3.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus-d_230322_3.0.0 2023-04-11 20:02:33 +08:00
xuxinchao
dac69f1114 [dev_robobus-d_230322_3.0.0]消息盒子调整.9图 2023-04-11 20:02:09 +08:00
yangyakun
0b3f264837 [3.0.0]
[m2]
[ui修改、视频变更 b2视频和b1视频]
2023-04-11 19:48:36 +08:00
yangyakun
f0f5e49078 [3.0.0]
[m2]
[车模调整]
2023-04-11 17:20:41 +08:00
yangyakun
7258c0ff07 [3.0.0]
[m2]
[ui调整]
2023-04-11 17:09:19 +08:00
yangyakun
ea6cba2ee5 [des]
[och各个模式对应的module]
2023-04-11 16:54:02 +08:00
xuxinchao
18cb9171b6 [dev_robobus-d_230322_3.0.0]Bus接驳乘客屏添加消息盒子 2023-04-11 16:29:20 +08:00
zhongchao
05e2a75523 [3.0.0] update log version 2023-04-11 14:41:46 +08:00
zhongchao
414463c09d [3.0.0] pre check null 2023-04-11 14:35:00 +08:00
xuxinchao
4a9e96ee87 [dev_robobus-d_230322_3.0.0]接管提示调整 2023-04-11 11:53:23 +08:00
yangyakun
30238e93b0 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-11 11:17:23 +08:00
yangyakun
c00c30d670 [video]
[配置修改]
2023-04-11 11:17:17 +08:00
zhongchao
a83f586620 [3.0.0] replace 3D res and light invoke 2023-04-11 10:48:49 +08:00
chenfufeng
2e00171e7a [3.0.0][opt]支持高德地图倾斜角可配置 2023-04-11 10:41:02 +08:00
zhongchao
f9b0d630d3 [m1-p-3.0.0] add take over func of new code 2023-04-11 10:30:48 +08:00
yangyakun
3620e039e5 [m1]
[日志调整]
2023-04-10 21:21:17 +08:00
yangyakun
382e8a32b7 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-10 21:17:09 +08:00
yangyakun
38009b33ac [m2]
[3.0.0]
[ui调整]
2023-04-10 21:16:38 +08:00
wangmingjun
9ae98eb279 [3.0.0] 处理包车司机端倒计时bug 2023-04-10 19:41:05 +08:00
xuxinchao
2002a21907 [dev_robobus-d_230322_3.0.0]调整M2布局宽度 2023-04-10 17:27:41 +08:00
wangmingjun
9c0ba1f3b0 [2.0.0] 修复接驳乘客屏偶现路线不更新问题 2023-04-10 15:32:04 +08:00
xuxinchao
56ff6e1bc4 [dev_robobus-d_230322_3.0.0]车速设置光标处理 2023-04-10 12:11:02 +08:00
xuxinchao
e56ccecc40 [dev_robobus-d_230322_3.0.0]云调度增加上报接果错误吐司提示,增加人为接管弹窗判断 2023-04-10 11:27:49 +08:00
xuxinchao
9a06b0161a [dev_robobus-d_230322_3.0.0]调整加入消息盒子位置 2023-04-10 10:28:35 +08:00
xuxinchao
22c03de59c [dev_robobus-d_230322_3.0.0]接管提示加入消息盒子 2023-04-10 00:03:34 +08:00
yangyakun
879ad7e3d6 Merge branch 'dev_robobus_network_weak_230323' into dev_robobus-d_230322_3.0.0 2023-04-08 10:42:36 +08:00
yangyakun
029f578c76 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 20:59:44 +08:00
yangyakun
7f67ea9027 [m2]
[3.0.0]
[广告视频从json配置文件获取视频]
2023-04-07 20:59:34 +08:00
yangyakun
429de28e85 [m2]
[3.0.0]
[shuttleM2司机屏车模修改]
2023-04-07 19:27:52 +08:00
yangyakun
61ee4d714a [m2]
[3.0.0]
[文案修改、页面微调]
2023-04-07 18:24:59 +08:00
wangmingjun
166cca136c Merge branch 'dev_robobus_network_weak_230323' into 'dev_robobus-d_230322_3.0.0'
Dev robobus network weak 230323

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!747
2023-04-07 10:08:46 +00:00
xuxinchao
f483f51c25 [dev_robubus-d_230322_3.0.0]工具箱车速设置调整 2023-04-07 17:58:00 +08:00
wangmingjun
bbce5fee4c Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus_network_weak_230323'
Dev robobus d 230322 3.0.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!746
2023-04-07 09:01:24 +00:00
yangyakun
aa7b51ca7a Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 16:30:59 +08:00
yangyakun
f689d7b0f5 [m2]
[3.0.0]
[glsurfaceview 叠加导致圆角无法使用暂时使用不使用]
2023-04-07 14:51:08 +08:00
wangmingjun
918352a0b4 [包车] 包车确认路线dialog文字过长 2023-04-07 14:38:01 +08:00
wangmingjun
620344482c [shuttle] 韩语更新 2023-04-07 14:01:20 +08:00
xuxinchao
7dad91ffd7 [dev_robobus-d_230322_3.0.0]地图版本回退到2.11.0.12 2023-04-07 12:36:39 +08:00
xuxinchao
ca5de5b11d [dev_robobus-d_230322_3.0.0]工具箱车速设置增加手动输入模式 2023-04-07 12:16:43 +08:00
yangyakun
6fd058457d [m2]
[3.0.0]
[间距]
2023-04-07 12:08:47 +08:00
yangyakun
47acf3e503 [m2]
[3.0.0]
[圆角修改]
2023-04-07 10:10:30 +08:00
wangmingjun
01fde7ba85 [B1/B2]乘客屏路线状态更新 2023-04-06 21:02:13 +08:00
xinfengkun
76f6ff1840 [2.15.0][mogo-adas] 修复车辆进站后无法出站问题,档车处于进站流程时系统还处于SystemState.AUTO_PILOT_RUNNING状态所以需要将此限制放开 2023-04-06 20:16:09 +08:00
wangmingjun
d11710ee11 [M2]乘客屏错误修复 2023-04-06 15:59:18 +08:00
yangyakun
13b2ce9da2 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-06 14:53:12 +08:00
yangyakun
7d4a9c1812 [m2]
[3.0.0]
[上下添加背景]
2023-04-06 14:52:54 +08:00
wangmingjun
fe98ec7a0f Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
2023-04-06 11:00:07 +08:00
xuxinchao
8426cd715d [dev_robobus-d_230322_3.0.0]消息盒子V2X布局调整 2023-04-04 19:26:07 +08:00
yangyakun
4400b3d9ef [m2]
[3.0.0]
[站点样式变更]
2023-04-04 17:11:47 +08:00
chenfufeng
7c66a3deed [m2][3.0.0]新增画站点的接口 2023-04-04 16:24:15 +08:00