Commit Graph

16867 Commits

Author SHA1 Message Date
wangmingjun
98820f2f65 [charter m1]增加平行驾驶 2023-03-01 21:56:04 +08:00
yangyakun
eeff0d2e46 [m1]
[1.1.2]
[tts 临时导入]
2023-03-01 21:52:07 +08:00
yangyakun
ab8b257eeb 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 21:49:41 +08:00
yangyakun
105cf686b7 [m1]
[1.0.2]
[动画结束前不显示背景]
2023-03-01 21:49:21 +08:00
wangmingjun
979789b7e8 [charter m1]增加订单轮询 2023-03-01 21:33:06 +08:00
yangyakun
84c5a4b664 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 21:13:14 +08:00
yangyakun
93932684a8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 21:12:46 +08:00
yangyakun
822ceb71d5 [m1]
[1.1.2]
[结束订单跳转到还车页面]
2023-03-01 21:08:23 +08:00
yangyakun
a66d00efc3 [m1]
[1.1.2]
[提前结束页面]
2023-03-01 20:10:14 +08:00
bxb
314e8b9c77 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
2023-03-01 19:59:48 +08:00
bxb
e00fb594ae [清扫车]贴边数据精确到厘米,保存二位小数处理 2023-03-01 19:56:28 +08:00
chenfufeng
06d347c4ef [Opt3.0]全览地图默认不绘制起、终点 2023-03-01 19:41:00 +08:00
chenfufeng
15f0d4d27d [Opt3.0]全览地图默认不绘制起、终点 2023-03-01 19:39:17 +08:00
chenfufeng
de9f23cf20 [Opt3.0]默认不绘制起、终点 2023-03-01 19:27:10 +08:00
lixiaopeng
5f4a69588d Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 19:26:59 +08:00
lixiaopeng
4d67e7400f [dev_arch_opt_3.0] add log 2023-03-01 19:26:51 +08:00
chenfufeng
47559eb4fd [Opt3.0]默认不绘制起、终点 2023-03-01 19:26:03 +08:00
wangmingjun
c462ce404c [charter m1]司机端倒计时,UI处理 2023-03-01 19:15:50 +08:00
xinfengkun
a0574091a6 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 19:14:30 +08:00
xinfengkun
0cbfc9616e [工控机监控] OBU SDK Java对象转PB对象自测 2023-03-01 19:14:23 +08:00
lixiaopeng
31c3bf480f [dev_arch_opt_3.0] add log 2023-03-01 19:11:21 +08:00
yangyakun
d8278f6cea [m1]
[1.1.2]
[到达站点后选择站点置空]
2023-03-01 18:22:59 +08:00
zhongchao
66b321a2a9 [2.13.0-arch-opt] fix bug of track and loc reason, wait for map version ,plus remove aicloud sdk httpdns,which update version to fix passport . and plus found the line id problem because of code opt 2023-03-01 18:07:30 +08:00
wangmingjun
0a4b4132af Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!637
2023-03-01 08:57:54 +00:00
pangfan
2ac38d689b [M2-P v1.0.0]宣传视频全屏播放(拉伸铺满) 2023-03-01 16:57:02 +08:00
wangmingjun
8a6a4374b8 Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 16:56:06 +08:00
wangmingjun
62fbe08b3b [charter m1]司机端埋点逻辑 2023-03-01 16:55:57 +08:00
yangyakun
ffee21ad6f 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 15:55:11 +08:00
yangyakun
b822934ba7 [m1]
[1.1.2]
[到达站点、启动自驾、结束订单、tts、车模修改]
2023-03-01 15:54:36 +08:00
xinfengkun
0b8193d24c [m1]清扫车放开档位限制,同步配置文件 2023-03-01 15:42:22 +08:00
pangfan
71a7674bfb [M2-P v1.0.0]宣传视频全屏播放(拉伸铺满) 2023-03-01 15:41:52 +08:00
xinfengkun
d1fac54bc8 [m1]清扫车放开档位限制,同步配置文件 2023-03-01 15:40:17 +08:00
xinfengkun
5560e0b293 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 15:37:21 +08:00
xinfengkun
734b7d60ba [opt3.0]清扫车放开档位限制 2023-03-01 15:37:13 +08:00
lixiaopeng
8ac43fd6fd [dev_arch_opt_3.0] 优化升级功能 2023-03-01 15:12:29 +08:00
xinfengkun
447a4f9a9f Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 14:25:04 +08:00
xinfengkun
b57c490a6f [工控机监控]增加打包信息 2023-03-01 14:24:55 +08:00
lixiaopeng
29494b8503 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 11:42:05 +08:00
lixiaopeng
b1fe51d182 [dev_arch_opt_3.0] 添加obu 的versionName 2023-03-01 11:41:57 +08:00
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
bxb
0e75ce4cc8 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
2023-03-01 09:35:07 +08:00
bxb
612a875a03 [清扫车]由于启动自驾和开始任务使用同一个按钮,与实际业务冲突,把启动自驾和开始任务拆分 2023-03-01 09:27:07 +08:00
wangmingjun
76a5e7e005 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!635
2023-02-28 13:43:09 +00: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