Commit Graph

3550 Commits

Author SHA1 Message Date
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +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
61ee4d714a [m2]
[3.0.0]
[文案修改、页面微调]
2023-04-07 18:24:59 +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
9639c41ef4 [2.15.0] 解决taxi指针异常 2023-04-07 16:16:41 +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
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
renwj
695fd6188d [2.15.0] 整合基于ByteX开发的自研及三方插件 2023-04-06 19:45:38 +08:00
xuxinchao
f0a2a20460 [dev_robobus-d_230322_3.0.0]消息盒子V2X布局调整 2023-04-06 18:59:23 +08:00
xuxinchao
53563005bd [dev_opt_2.15.0]小巴乘客端增加气泡态消息盒子 2023-04-06 18:57:52 +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
donghongyu
378a161acb 「dev_robobus-d_230322_3.0.0」
1、合并直播功能
2、修复乘客端打包不能运行bug
2023-04-04 17:53:30 +08:00
yangyakun
4400b3d9ef [m2]
[3.0.0]
[站点样式变更]
2023-04-04 17:11:47 +08:00
yangyakun
6ba6d7233f [m2]
[3.0.0]
[页面改版]
2023-04-04 16:14:45 +08:00
zhongchao
c52c3828f8 [merge] 2023-04-04 15:09:31 +08:00
yangyakun
f790a64f24 [m2]
[3.0.0]
[页面改版]
2023-04-04 10:18:18 +08:00
bxb
4cc8a10f3d [清扫车]sweeper 3.0.0合并到master 2023-04-03 20:14:59 +08:00
wangmingjun
21ac2f8f4a [shuttle-B1/B2] 弱网调试完成 2023-03-31 20:47:19 +08:00
wangmingjun
393c77c9b6 [3.0.0] merge dev_robobus_network_weak_230323 2023-03-31 18:46:21 +08:00
wangmingjun
4625cc45e0 [3.0.0] 增加log日志 2023-03-31 18:35:23 +08:00
wangmingjun
08337e0002 [3.0.0] 去除无用类 2023-03-31 18:18:37 +08:00
wangmingjun
65a83154c7 [shuttle-B1/B2] 弱网增加登陆状态缓存 2023-03-31 16:55:05 +08:00
wangmingjun
8051629a30 [opt] 修改实体类造成的崩溃 2023-03-30 19:54:04 +08:00
wangmingjun
40983e1a22 [2.15.0] 小地图轨迹点集合判断>=2 2023-03-30 19:28:07 +08:00
pangfan
b795ca2f78 [opt]1.RoboTaxi埋点增加lineId 2023-03-30 19:19:19 +08:00
wangmingjun
e545d80418 Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323 2023-03-30 18:02:15 +08:00
wangmingjun
dec5d11208 [opt] 弱网缓存处理 2023-03-30 18:02:08 +08:00
yangyakun
fad8d4327c [map]
[模型修改、高精地图版本升级]
2023-03-30 16:34:16 +08:00
yangyakun
e6ad52324b [3.0.0]
[韩语null、去掉多余的站]
2023-03-30 14:37:00 +08:00
wangmingjun
bf60ded6a5 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-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
2023-03-30 11:13:00 +08:00
wangmingjun
2c2fb65d1e [opt] 司乘弱网缓存 2023-03-30 10:54:59 +08:00
wangmingjun
45079b946d [3.0.0] 司机端韩语 2023-03-29 20:35:15 +08:00
yangyakun
8cccfcbd5d Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-03-29 20:11:06 +08:00
yangyakun
60baec6a95 [m1]
[韩文兼容]
2023-03-29 20:10:54 +08:00
wangmingjun
ca1809bed7 [3.0.0] 司机端二维码 2023-03-29 18:16:29 +08:00
yangyakun
46870bb805 Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_network_weak_230323 2023-03-29 17:59:20 +08:00
bxb
1a6d6bccb5 [清扫车]贴边大于1.0m 2023-03-29 17:32:08 +08:00
bxb
b3c308cf41 [清扫车]贴边数据显示问题修改 2023-03-29 17:30:22 +08:00
yangyakun
8528eac080 [m1]
[不需要兼容]
2023-03-29 15:03:39 +08:00