Commit Graph

13577 Commits

Author SHA1 Message Date
zhongchao
7d876fbfd8 [2.15.0] fix bug of log and roma host , and obu from telematics source 2023-04-12 18:27:36 +08:00
yangyakun
2067769d03 [delete function] 2023-04-12 17:58:57 +08:00
yangyakun
3aee93c15d [bugfix]
[无法到站、到站后韩文空指针]
2023-04-12 17:58:54 +08:00
xuxinchao
8d5465920b [dev_robobus-d_230322_3.0.0]正式环境去除端口号
# Conflicts:
#	app/urlConfig.json
2023-04-12 16:55:00 +08:00
lixiaopeng
2aeb897959 [dev_opt_2.15.0] 添加红绿灯分发 相关的日志 2023-04-12 16:41:04 +08:00
chenfufeng
0cbdfafadc [3.0.0][Fix]解决科大讯飞Tts默认发音人不对的问题 2023-04-12 15:02:39 +08:00
lixiaopeng
fc34a76ccc [2.15.0] 修改地图版本 2023-04-12 12:14:35 +08:00
lixiaopeng
c3188ef076 [dev_opt_2.15.0] 修改地图版本为2.12.0.9 2023-04-12 11:30:49 +08:00
xuxinchao
f1e1dcf5e1 [dev_opt_2.15.0]调整消息盒子V2X布局背景 2023-04-11 20:43:05 +08:00
yangyakun
3869871bdc Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_gradle_och_230317
# Conflicts:
#	app/build.gradle
#	app/productFlavors/fOchShuttlePassengerM2.gradle
#	app/productFlavors/flavorsFilterConfig.gradle
#	app/script/functions/och.gradle
#	app/script/vehicleFlavors/fOchShuttleM2.gradle
2023-04-11 20:39:01 +08:00
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
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
lixiaopeng
4a97a9ee80 Merge branch 'dev_opt_2.15.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_opt_2.15.0 2023-04-11 16:10:16 +08:00
lixiaopeng
aa5336b216 [dev_opt_2.15.0] 优化地图的绘制 2023-04-11 16:09:50 +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
b571fedb2c [2.15.0] update log version 2023-04-11 14:42:51 +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
xinfengkun
dc58434187 [opt2.15.0]升级Maven mogo-adas版本 2023-04-11 11:08:45 +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
xinfengkun
eea22feb44 [dev_opt_2.15.0] 添加环岛模式开关接口 2023-04-10 14:53:17 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +08:00