Commit Graph

13492 Commits

Author SHA1 Message Date
yangyakun
9936fb84ac [m2]
[3.1.0]
[动画展示和隐藏]
2023-04-14 17:23:12 +08:00
xuxinchao
eaff125080 [dev_robotaxi-d_230412_2.15.0]fix车速设置光标位置问题追加 2023-04-14 16:18:45 +08:00
xuxinchao
e59d32e7d1 [dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题追加 2023-04-14 16:16:34 +08:00
yangyakun
a0c1258d9f Merge remote-tracking branch 'origin/dev_robobus-p_230413_2.1.0' into dev_robobus-p_230413_2.1.0 2023-04-14 16:01:25 +08:00
yangyakun
1d49120170 [m2]
[3.1.0]
[隐藏Ui]
2023-04-14 16:01:15 +08:00
donghongyu
57d0ace65d Merge branch 'dev_opt_2.15.0' into dev_robotaxi-d_230412_2.15.0 2023-04-14 15:03:10 +08:00
wangmingjun
9a18a7c49b Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
[3.1.0] M1处理自动驾驶按钮bug

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!757
2023-04-14 04:05:00 +00:00
wangmingjun
c70680db9d [3.1.0] M1处理自动驾驶按钮bug 2023-04-14 12:02:42 +08:00
xuxinchao
de16d07cb9 [dev_robotaxi-d_230412_2.15.0]fix车速设置光标位置问题 2023-04-14 11:54:38 +08:00
yangyakun
04898e25b7 Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0
# Conflicts:
#	gradle.properties
2023-04-14 11:53:51 +08:00
yangyakun
8cf62c11c0 Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0 2023-04-14 11:48:34 +08:00
xuxinchao
943abe3171 [dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题 2023-04-14 11:43:23 +08:00
renwj
660413439d [2.15.0][增量升级] 优化下载过程中的逻辑 2023-04-14 11:03:30 +08:00
yangyakun
67e5531d80 Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
#	OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
#	app/config/tempConfig.json
#	app/config/urlConfig.json
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
#	gradle.properties
2023-04-14 10:40:00 +08:00
pangfan
2496875fb6 [大理/烟台交付]release v2.1.0 2023-04-13 20:47:39 +08:00
pangfan
dbb5707239 [大理/烟台交付]release v3.1.0 2023-04-13 20:46:49 +08:00
zhongchao
5e7fa79828 [2.15.0]code opt of roma and add trace 2023-04-13 20:41:49 +08:00
wangmingjun
1076cccb77 [2.15.0] bus乘客屏增加同步路线信息 2023-04-13 20:09:49 +08:00
zhongchao
7a1933055c [2.15.0]fix }bug 2023-04-13 19:54:16 +08:00
renwj
2a4ee254df [2.15.0] 修正状态栏中的状态偶现与调试面板不一致的问题 2023-04-13 19:48:16 +08:00
lixiaopeng
d041d8ef94 [dev_robotaxi-d_230412_2.15.0] 修改图标 2023-04-13 19:35:56 +08:00
lixiaopeng
8e9a60d931 Merge branch 'dev_robotaxi-d_230412_2.15.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230412_2.15.0 2023-04-13 19:30:54 +08:00
xuxinchao
143f01dd4c [dev_robotaxi-d_230412_2.15.0]调整M2布局宽度 2023-04-13 19:30:21 +08:00
xuxinchao
3b008b0b85 [dev_robotaxi-d_230412_2.15.0]接管提示加入消息盒子 2023-04-13 19:26:16 +08:00
xuxinchao
5a0718e1c4 [dev_robotaxi-d_230412_2.15.0]工具箱车速设置增加手动输入模式 2023-04-13 19:15:22 +08:00
yangyakun
6d82c8c67a Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus-p_230322_2.0.0 2023-04-13 19:13:32 +08:00
yangyakun
de89d77e49 [bugfix]
[角标越界问题]
2023-04-13 19:12:25 +08:00
yangyakun
059271cb86 [m2]
[3.0.0]
[隐藏转向灯、添加伪圆角]
2023-04-13 19:11:58 +08:00
zhongchao
ec1a359dd3 [2.15.0].. 2023-04-13 18:43:49 +08:00
zhongchao
78dfd5f83f [3.0.0]reload 3d res ,can't merge res of 3d 2023-04-13 18:33:15 +08:00
lixiaopeng
fd3c662436 [dev_robotaxi-d_230412_2.15.0] test git 权限 2023-04-13 18:10:43 +08:00
zhongchao
98599f0739 [3.0.0] cherry pick 2.15.0 func of map and fix bug of log 2023-04-13 18:06:54 +08:00
lixiaopeng
976bd6a275 Merge branch 'dev_robotaxi-d_230412_2.15.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230412_2.15.0 2023-04-13 18:04:54 +08:00
lixiaopeng
f250381229 [dev_robotaxi-d_230412_2.15.0] 添加v2i新类型,优化升级请求 2023-04-13 18:04:47 +08:00
zhongchao
bce4d3ed56 [2.15.0]fix bug of request url of roma 2023-04-13 18:01:37 +08:00
xuxinchao
f7316c13cd [dev_robotaxi-d_230412_2.15.0]同步云调度功能 2023-04-13 17:53:50 +08:00
wangmingjun
3bd4c6e450 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!755
2023-04-13 09:38:43 +00:00
wangmingjun
cd8bbc7ba0 [2.15.0] try-catch 选择任务数组越界情况 2023-04-13 17:26:12 +08:00
wangmingjun
793d960140 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 17:10:45 +08:00
wangmingjun
1fcfe2af60 [bus/shuttle/charter/taxi] 各端fragment初始化bug 2023-04-13 17:10:38 +08:00
renwj
ea4f43002b [2.15.0][ByteX] 修正偶现打包失败问题 2023-04-13 16:35:35 +08:00
xinfengkun
d6b5035f55 Merge remote-tracking branch 'origin/dev_robotaxi-d_230412_2.15.0' into dev_robotaxi-d_230412_2.15.0 2023-04-13 15:28:42 +08:00
xinfengkun
09fbccbcd0 [dev2.15.0][obu]升级OBU SDK版本新增交通标志类型 注意合流和人行横道 2023-04-13 15:28:30 +08:00
renwj
845a6b557c [2.15.0][V2N] 优化V2N预警触发后,预警红边总闪不消失问题 2023-04-13 15:26:34 +08:00
renwj
99210e0492 [2.15.0][ByteX] 升级插件版本,解决打包异常 2023-04-13 15:26:34 +08:00
xinfengkun
517c97b85e [opt2.15.0][adas]升级Maven mogo-adas版本,移除mogo-adas-data aar中的proto文件 2023-04-13 15:23:01 +08:00
zhongchao
deac094158 [2.15.0] roma change and track color change 2023-04-13 15:21:37 +08:00
renwj
b28e8b213b [2.15.0][V2N] V2N上车新老链路兼容处理 2023-04-13 14:45:47 +08:00
xuxinchao
c92233455e [dev_robotaxi-d_230412_2.15.0]DNS域名增加正式地址域名 2023-04-13 14:36:01 +08:00
xinfengkun
c4d2ea0f95 [opt2.15.0][adas]升级Maven mogo-adas版本,移除mogo-adas-data aar中的proto文件 2023-04-13 14:19:44 +08:00