Commit Graph

13187 Commits

Author SHA1 Message Date
yangyakun
0b3f264837 [3.0.0]
[m2]
[ui修改、视频变更 b2视频和b1视频]
2023-04-11 19:48:36 +08:00
wangmingjun
a520449296 [包车] 包车司机端订单显示逻辑:乘客下单后立马显示订单 2023-04-11 17:24:56 +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
wangmingjun
f5808c9744 Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323 2023-04-11 15:19:19 +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
e6ed1c6533 Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus-p_230322_2.0.0'
Dev robobus d 230322 3.0.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!751
2023-04-10 11:43:09 +00: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
wangmingjun
6b8b0f89a2 [2.0.0] 修复接驳乘客屏偶现路线不更新问题 2023-04-10 15:30:36 +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
b338a97fb9 Merge branch 'dev_robobus_network_weak_230323' into dev_robobus-p_230322_2.0.0 2023-04-08 10:49:10 +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
wangmingjun
8f17cf1998 [2.0.0] 版本号修改为2.0.0 2023-04-07 19:21:14 +08:00
wangmingjun
56422251af Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus-p_230322_2.0.0'
Dev robobus d 230322 3.0.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!748
2023-04-07 11:11:51 +00: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