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 |
|
wangmingjun
|
7703b3a560
|
[mini bus3.0.0] 司机端版本号为3.0.0
|
2023-04-10 19:39:02 +08:00 |
|
wangmingjun
|
5caa72202f
|
[3.0.0] 处理包车司机端倒计时bug
|
2023-04-10 19:38:35 +08:00 |
|
yangyakun
|
59d48423b6
|
[mini bus2.0.0] 处理包车韩语问题
|
2023-04-10 18:04:18 +08:00 |
|
wangmingjun
|
73abb50a44
|
Merge branch 'dev_minibus-p_230322_2.0.0' into 'dev_minibus-d_230322_3.0.0'
# Conflicts:
# gradle.properties
|
2023-04-10 09:35:32 +00:00 |
|
wangmingjun
|
8038a94e26
|
[mini bus3.0.0] 司机端二维码合并问题处理
|
2023-04-10 17:30:41 +08:00 |
|
xuxinchao
|
2002a21907
|
[dev_robobus-d_230322_3.0.0]调整M2布局宽度
|
2023-04-10 17:27:41 +08:00 |
|
wangmingjun
|
6dab66de84
|
[shuttle] 韩语更新
|
2023-04-10 16:43:21 +08:00 |
|
yangyakun
|
5a15eb21eb
|
[3.0.0]
[韩语null、去掉多余的站]
# Conflicts:
# OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
|
2023-04-10 16:42:26 +08:00 |
|
wangmingjun
|
01cd5e4848
|
[3.0.0] 司机端韩语
|
2023-04-10 16:39:28 +08:00 |
|
wangmingjun
|
1755396f72
|
[mini bus] merge 司机端二维码冲突
|
2023-04-10 16:36:11 +08:00 |
|
wangmingjun
|
9c0ba1f3b0
|
[2.0.0] 修复接驳乘客屏偶现路线不更新问题
|
2023-04-10 15:32:04 +08:00 |
|
donghongyu
|
faa191d8f9
|
「dev_robobus-d_230322_3.0.0」
1、增加
lintOptions {
abortOnError false
}
|
2023-04-10 14:24:03 +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 |
|
wangmingjun
|
c28112cd29
|
[包车] 本地暂存包车问题修复
|
2023-04-07 16:12:28 +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
|
61329df94b
|
[2.15.0][mogo-adas] 修复车辆进站后无法出站问题，档车处于进站流程时系统还处于SystemState.AUTO_PILOT_RUNNING状态所以需要将此限制放开
|
2023-04-06 20:18:54 +08:00 |
|
xinfengkun
|
4a15d67afd
|
[2.15.0][mogo-adas] 修复车辆进站后无法出站问题，档车处于进站流程时系统还处于SystemState.AUTO_PILOT_RUNNING状态所以需要将此限制放开
|
2023-04-06 20:17:36 +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 |
|
yangyakun
|
6ba6d7233f
|
[m2]
[3.0.0]
[页面改版]
|
2023-04-04 16:14:45 +08:00 |
|
yangyakun
|
f790a64f24
|
[m2]
[3.0.0]
[页面改版]
|
2023-04-04 10:18:18 +08:00 |
|
xuxinchao
|
75536bda37
|
[dev_robobus-d_230322_3.0.0]云调度增加重启自驾功能
|
2023-04-02 00:34:19 +08:00 |
|