Commit Graph

16867 Commits

Author SHA1 Message Date
renwj
75096f01b5 [2.15.0][V2N] 修正逻辑问题 2023-04-17 20:09:46 +08:00
wangmingjun
d0f2621773 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
Dev robobus d 230413 3.1.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!760
2023-04-17 10:34:38 +00:00
xuxinchao
c3badacbbc [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管更改 2023-04-17 18:30:24 +08:00
yangyakun
1d0030f9dd [bugfix]
[视频源修改、添加双视频]
2023-04-17 17:22:32 +08:00
wangmingjun
95f81150ba [3.2.0] m1 司机端确认路线改为一次确认 2023-04-17 16:41:37 +08:00
yangyakun
b7a83dbfbb [bugfix]
[删掉空格]
2023-04-17 16:33:07 +08:00
yangyakun
1f1989174f Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
2023-04-17 15:16:03 +08:00
yangyakun
c30851958e [bugfix]
[3.1.0]
[pnc]
2023-04-17 15:10:53 +08:00
yangyakun
e0cac99c4d Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0 2023-04-17 15:05:28 +08:00
wangmingjun
ae2e8fddbb Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-17 14:33:32 +08:00
wangmingjun
3a4867ee7c Merge branch 'dev_robobus-d_230413_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus-d_230413_3.1.0 2023-04-17 12:54:04 +08:00
wangmingjun
2fcd217c04 [3.1.0] m2路线id不同,清除全览轨迹 2023-04-17 12:53:56 +08:00
xuxinchao
49eaecb096 [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管补交 2023-04-17 12:32:52 +08:00
yangyakun
6203738612 [m2]
[3.1.0]
[pnc]
2023-04-17 12:19:10 +08:00
xuxinchao
f655da0bde [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管提示 2023-04-17 11:31:13 +08:00
yangyakun
464ef23c54 [m2]
[3.1.0]
[动画展示和隐藏]
2023-04-17 11:23:30 +08:00
zhongchao
a793844e1a [2.15.0]add func 2023-04-14 20:20:49 +08:00
wangmingjun
5171cb0a92 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
[dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题追加

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!759
2023-04-14 12:13:23 +00:00
zhongchao
445fb4b393 [2.15.0]fix bug of roma which click has no react and multi obj problem 2023-04-14 20:08:36 +08:00
wangmingjun
19af6cdeee [merge] merge robobus-d 3.1.0 2023-04-14 17:46:12 +08:00
yangyakun
722ee12e2b Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 2023-04-14 17:40:27 +08:00
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