Commit Graph

1316 Commits

Author SHA1 Message Date
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
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
wangmingjun
4a05f7d78a [m1] 倒计时 2023-02-28 10:33:36 +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
wangmingjun
bdffe3b560 [M2] 乘客屏轨迹排查日志 2023-02-27 20:41:17 +08:00
wangmingjun
03d5e173ee [M1] 司机端增加运营消息盒子 2023-02-27 20:23:04 +08:00
wangmingjun
3603487d85 [M1] 自驾相关添加 2023-02-27 17:40:28 +08:00
wangmingjun
1c6f6d43f8 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!620
2023-02-27 07:40:16 +00:00
wangmingjun
bfcc3fff30 [M2] m2 EB5时间错误 2023-02-27 15:11:02 +08:00
yangyakun
e9e26b31cf [m1]
[1.1.2]
[页面逻辑]
2023-02-27 14:35:24 +08:00
yangyakun
0fca7b2c38 [m1]
[1.1.2]
[根据不同状态展示不同页面]
2023-02-27 12:33:06 +08:00
yangyakun
33f39fef2b [m1]
[1.1.2]
[通讯]
2023-02-27 11:16:37 +08:00
wangmingjun
387572900b [shuttle] m2乘客屏auto bug 2023-02-27 10:52:56 +08:00
yangyakun
377271fe25 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 09:45:57 +08:00
yangyakun
815c8eba3a [页面调整] 2023-02-27 07:31:41 +08:00
yangyakun
09a8303426 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-26 19:18:18 +08:00
wangmingjun
9f576a66bb [jinlv bus] 增加中英韩播报 2023-02-25 20:24:08 +08:00
wangmingjun
667a0d4544 [charter] M1司机端 2023-02-25 19:37:52 +08:00
yangyakun
d590eb5717 [m1]
[1.1.2]
[rename]
2023-02-25 18:03:16 +08:00
yangyakun
823fbcaf3d [m1]
[1.1.2]
[订单轮训、车态轮训、时间校准轮训]
2023-02-25 16:41:33 +08:00
yangyakun
ebf9cd4220 [m1]
[1.1.2]
[登录状态查询轮训]
2023-02-25 14:47:07 +08:00
yangyakun
03e8de4831 [m1]
[1.1.2]
[接口定义]
2023-02-25 11:27:20 +08:00
yangyakun
f6e749a2ac 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-25 10:33:06 +08:00
yangyakun
645ebe1665 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/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
yangyakun
c2ccda0d3c 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-24 18:45:07 +08:00
yangyakun
e80dcc118a [m1]
[1.1.2]
[m1 逻辑]
2023-02-24 18:44:54 +08:00
yangyakun
dec7494f35 Rename .java to .kt 2023-02-24 18:44:54 +08:00
wangmingjun
6106228186 [charter] m1司乘通信结构体 2023-02-24 16:01:18 +08:00
wangmingjun
ee1d9a04a7 [charter] m1司/乘结构体 2023-02-24 15:19:46 +08:00
yangyakun
4300185a27 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-23 21:51:48 +08:00
yangyakun
c45d0e7840 [m1]
[1.1.2]
[m1 页面]
2023-02-23 21:51:36 +08:00