Commit Graph

1354 Commits

Author SHA1 Message Date
yangyakun
e9d2c5a7cb [m1]
[1.1.2]
[距离问题、包含问题]
2023-03-05 22:31:04 +08:00
yangyakun
9d5e66edc3 Rename .java to .kt 2023-03-05 22:31:04 +08:00
yangyakun
3f13c2491a [m1]
[1.1.2]
[选择时最后一个站点自动选中]
2023-03-05 20:08:18 +08:00
yangyakun
165ba9b010 [m1]
[1.1.2]
[结束订单进行靠边停车指令、全览添加终点站]
2023-03-04 16:29:16 +08:00
yangyakun
281078ff48 [m1]
[1.1.2]
[靠边停车后启动自驾需要重置靠边停车状态、确认线路和站点后弹出车控tab、添加靠边停车日志]
2023-03-04 13:52:12 +08:00
wangmingjun
ac0f902240 [shuttle] 离站播报逻辑保持跟接驳一致 2023-03-04 08:36:50 +08:00
wangmingjun
854b9af5e5 [M1] 烟台私有化 + 多语音 2023-03-03 23:59:05 +08:00
yangyakun
bd92b592c2 [m1]
[1.1.2]
[订单结束、车辆未还页面变更、站点可以添加注释]
2023-03-03 21:59:19 +08:00
wangmingjun
f5c5f1536c 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
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
2023-03-03 17:29:34 +08:00
yangyakun
73082244c1 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-03 14:54:30 +08:00
wangmingjun
8d0d82459f [M2] 处理偶现结束订单乘客屏不更新问题 2023-03-03 14:41:28 +08:00
wangmingjun
5d794b1474 [M1 司机端] 修复到计时bug 2023-03-03 13:19:12 +08:00
yangyakun
215f94f1c6 [m1]
[1.1.2]
[打包过滤]
2023-03-03 12:04:34 +08:00
yangyakun
96dc2b19c0 [m1]
[1.1.2]
[引用问题]
2023-03-03 09:19:05 +08:00
yangyakun
58acd2994b [m1]
[1.1.2]
[业务BUSINESS_STRING包裹类修改]
2023-03-03 08:42:22 +08:00
wangmingjun
3769f191c0 [M2] 处理轮询问题 2023-03-02 21:37:32 +08:00
wangmingjun
88112b522b [charter m1] tab阴影 2023-03-02 20:26:55 +08:00
wangmingjun
db8dd83c30 [charter m1] 轨迹下载修复 2023-03-02 19:52:24 +08:00
wangmingjun
8ebc0268e0 [M2] 处理线程问题 2023-03-02 15:35:08 +08:00
wangmingjun
0b862f6363 [M2] 1、视频渲染方式 2、走马灯效果 2023-03-02 14:48:04 +08:00
wangmingjun
0466ef4ce9 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:56:11 +08:00
wangmingjun
98820f2f65 [charter m1]增加平行驾驶 2023-03-01 21:56:04 +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
wangmingjun
c462ce404c [charter m1]司机端倒计时,UI处理 2023-03-01 19:15:50 +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
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
pangfan
71a7674bfb [M2-P v1.0.0]宣传视频全屏播放(拉伸铺满) 2023-03-01 15:41:52 +08:00
wangmingjun
95d138ed4d [charter] 司机端到轮询 2023-03-01 11:01:56 +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
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
64d9881231 [Opt3.0][fix]全览模式UI适配 2023-02-28 21:18:18 +08:00
wangmingjun
3645f73b4a [charter] 消息推送 2023-02-28 21:16:24 +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
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
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