Commit Graph

12018 Commits

Author SHA1 Message Date
wangmingjun
c33b2bae36 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 11:02:03 +08:00
wangmingjun
95d138ed4d [charter] 司机端到轮询 2023-03-01 11:01:56 +08:00
yangyakun
9ca0e19490 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 10:43:15 +08:00
yangyakun
81dcad204c [gradle]
[去掉assemble 过滤]
2023-03-01 10:41:46 +08:00
wangmingjun
0940edc9ea [charter] 司机端到站 2023-03-01 10:28:31 +08:00
yangyakun
6c1de0de21 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 21:22:57 +08:00
yangyakun
b3bd27ab52 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-28 21:22:21 +08:00
yangyakun
3c332847f7 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle
2023-02-28 21:22:06 +08:00
chenfufeng
4051b982ca [m1][Update]增加定位处理时间的日志 2023-02-28 21:21:31 +08:00
chenfufeng
c74fb5aca9 [Opt3.0][fix]全览模式UI适配 2023-02-28 21:19:46 +08:00
chenfufeng
64d9881231 [Opt3.0][fix]全览模式UI适配 2023-02-28 21:18:18 +08:00
wangmingjun
3645f73b4a [charter] 消息推送 2023-02-28 21:16:24 +08:00
chenfufeng
b43476c229 [Opt3.0]支持配置高德地图可选范围的padding 2023-02-28 20:58:11 +08:00
chenfufeng
92f8f45e9a [Opt3.0]支持配置高德地图可选范围的padding 2023-02-28 20:55:19 +08:00
yangyakun
d7e883b569 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 20:40:12 +08:00
yangyakun
74b11c7eaf [m1]
[1.1.2]
[接受小程序开关门推送   小程序-> 服务 -> 司机端 -> 乘客端]
2023-02-28 20:39:55 +08:00
zhongchao
bdb516ab49 [2.13.0-arch-opt] dispatch upload 2023-02-28 20:14:07 +08:00
zhongchao
85a6305319 [2.13.0-arch-opt] obu warning v2v and socket toast 2023-02-28 20:14:07 +08:00
wangmingjun
8f5de916a2 [M2]增加自动驾驶参数 2023-02-28 19:40:22 +08:00
chenfufeng
ad00d381a5 [m1][Update]增加定位处理时间的日志 2023-02-28 18:21:27 +08:00
xinfengkun
1fc73dc097 [工控机监控]验证各车型档位对自动驾驶的影响 2023-02-28 18:15:21 +08:00
xinfengkun
9216aa99f4 [opt3.0][mogo-adas]修改m1不能启动自动驾驶的档位 2023-02-28 18:15:12 +08:00
wangmingjun
b75071fb64 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!631
2023-02-28 10:12:17 +00:00
wangmingjun
d45418038a [m2] 站点/路线走马灯 2023-02-28 18:10:03 +08:00
xinfengkun
601b95772f [工控机监控] 注释掉司机端服务和乘客端连接 2023-02-28 18:04:48 +08:00
xinfengkun
aaf1cb9211 [工控机监控] 注释掉司机端服务和乘客端连接 2023-02-28 18:04:44 +08:00
xinfengkun
205746164b [m1]修改m1不能启动自动驾驶的档位 2023-02-28 17:15:50 +08:00
xuxinchao
c94043344e [dev_arch_opt_3.0]版本号显示View改为两行显示 2023-02-28 17:12:38 +08:00
xinfengkun
df50a24958 [m1][app] 修改配置文件错误 2023-02-28 16:55:20 +08:00
xinfengkun
8b1a519813 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-28 16:27:31 +08:00
xinfengkun
34b8afcd1c [工控机监控]验证各车型档位对自动驾驶的影响 2023-02-28 16:27:12 +08:00
lixiaopeng
5a8e5e3934 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-28 16:22:22 +08:00
lixiaopeng
31cfcbe406 [dev_arch_opt_3.0] 添加清扫车模型处理,修改调试面板obu显示 2023-02-28 16:22:14 +08:00
wangmingjun
7d95f59572 bus 编译错误 2023-02-28 15:17:58 +08:00
wangmingjun
6090a5fe18 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 14:10:48 +08:00
wangmingjun
a8af73deb3 bus 编译错误 2023-02-28 14:10:36 +08:00
yangyakun
55673e3eb4 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 12:16:49 +08:00
yangyakun
793b5fe417 [m1]
[1.1.2]
[实时计算到终点距离]
2023-02-28 12:16:36 +08:00
yangyakun
8288d24f12 [m2]
[1.0.2]
[gradle 打包]
2023-02-28 11:05:14 +08:00
zhongchao
74d616c092 [2.13.0-arch-opt] add trace of httpdns and fix small map draw line 2023-02-28 10:45:11 +08:00
chenfufeng
404150e24a [Opt3.0]解决司乘屏重连的问题 2023-02-28 10:35:30 +08:00
chenfufeng
93addfeeab [Opt3.0]自动切换Tts实现 2023-02-28 10:35:30 +08:00
chenfufeng
10e2a8531f [Opt3.0]兼容以前的单语言功能 2023-02-28 10:35:30 +08:00
wangmingjun
4a05f7d78a [m1] 倒计时 2023-02-28 10:33:36 +08:00
xinfengkun
0d83e54d43 [m1][app] 修改配置文件错误 2023-02-28 10:09:07 +08:00
wangmingjun
6f49208d21 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-27 21:40:28 +08:00
wangmingjun
1ea0f88c53 解决编译错误 2023-02-27 21:40:19 +08:00
yangyakun
baf7b15fd7 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-27 21:23:13 +08:00
yangyakun
707e0e03db [m2]
[1.1.2]
[计算下一个可选站点]
2023-02-27 21:22:57 +08:00
wangmingjun
7ea3604ad2 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!626
2023-02-27 13:01:22 +00:00