Commit Graph

1524 Commits

Author SHA1 Message Date
yangyakun
f689d7b0f5 [m2]
[3.0.0]
[glsurfaceview 叠加导致圆角无法使用暂时使用不使用]
2023-04-07 14:51:08 +08:00
yangyakun
6fd058457d [m2]
[3.0.0]
[间距]
2023-04-07 12:08:47 +08:00
yangyakun
47acf3e503 [m2]
[3.0.0]
[圆角修改]
2023-04-07 10:10:30 +08:00
wangmingjun
d11710ee11 [M2]乘客屏错误修复 2023-04-06 15:59:18 +08:00
yangyakun
13b2ce9da2 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-06 14:53:12 +08:00
yangyakun
7d4a9c1812 [m2]
[3.0.0]
[上下添加背景]
2023-04-06 14:52:54 +08:00
wangmingjun
fe98ec7a0f Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
2023-04-06 11:00:07 +08:00
yangyakun
4400b3d9ef [m2]
[3.0.0]
[站点样式变更]
2023-04-04 17:11:47 +08:00
yangyakun
6ba6d7233f [m2]
[3.0.0]
[页面改版]
2023-04-04 16:14:45 +08:00
yangyakun
f790a64f24 [m2]
[3.0.0]
[页面改版]
2023-04-04 10:18:18 +08:00
wangmingjun
21ac2f8f4a [shuttle-B1/B2] 弱网调试完成 2023-03-31 20:47:19 +08:00
wangmingjun
4625cc45e0 [3.0.0] 增加log日志 2023-03-31 18:35:23 +08:00
wangmingjun
08337e0002 [3.0.0] 去除无用类 2023-03-31 18:18:37 +08:00
wangmingjun
65a83154c7 [shuttle-B1/B2] 弱网增加登陆状态缓存 2023-03-31 16:55:05 +08:00
wangmingjun
8051629a30 [opt] 修改实体类造成的崩溃 2023-03-30 19:54:04 +08:00
wangmingjun
e545d80418 Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323 2023-03-30 18:02:15 +08:00
wangmingjun
dec5d11208 [opt] 弱网缓存处理 2023-03-30 18:02:08 +08:00
yangyakun
fad8d4327c [map]
[模型修改、高精地图版本升级]
2023-03-30 16:34:16 +08:00
yangyakun
e6ad52324b [3.0.0]
[韩语null、去掉多余的站]
2023-03-30 14:37:00 +08:00
wangmingjun
bf60ded6a5 Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323
# Conflicts:
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
2023-03-30 11:13:00 +08:00
wangmingjun
2c2fb65d1e [opt] 司乘弱网缓存 2023-03-30 10:54:59 +08:00
wangmingjun
45079b946d [3.0.0] 司机端韩语 2023-03-29 20:35:15 +08:00
yangyakun
8cccfcbd5d Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-03-29 20:11:06 +08:00
yangyakun
60baec6a95 [m1]
[韩文兼容]
2023-03-29 20:10:54 +08:00
wangmingjun
ca1809bed7 [3.0.0] 司机端二维码 2023-03-29 18:16:29 +08:00
yangyakun
46870bb805 Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_network_weak_230323 2023-03-29 17:59:20 +08:00
yangyakun
8528eac080 [m1]
[不需要兼容]
2023-03-29 15:03:39 +08:00
wangmingjun
7bbb65bf9c Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus_network_weak_230323'
Dev robobus d 230322 3.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!743
2023-03-28 09:08:22 +00:00
wangmingjun
47baed0f22 [shuttle] 乘客屏增加运营消息 2023-03-27 15:34:57 +08:00
yangyakun
0162908f33 Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_network_weak_230323 2023-03-27 14:31:42 +08:00
yangyakun
a0629d1426 [bus]
[删除乘客屏带有的shuttle]
2023-03-24 15:31:49 +08:00
yangyakun
31c219f693 [m1]
[增大靠边停车监听范围]
2023-03-24 13:02:35 +08:00
xuxinchao
26f49ac7cc [dev_robobus-d_230322_3.0.0]云调度和Bus乘客端消息盒子 2023-03-23 20:40:21 +08:00
yangyakun
a141cc3d66 [m1]
[切换线路、根据靠边停车状态变更]
2023-03-23 18:01:06 +08:00
yangyakun
dc32885197 [shuttle] 2023-03-23 17:24:42 +08:00
yangyakun
6173626ad6 [m1]
[靠边停车逻辑]
2023-03-23 15:46:18 +08:00
yangyakun
2b2ec07a57 [shuttle]
[分离shuttle]
2023-03-23 11:37:05 +08:00
wangmingjun
7840beb74b [M2/shuttle] 乘客屏缓存sn 2023-03-22 21:13:36 +08:00
yangyakun
bafceb6c4f [m1]
[倒计时]
[添加到站记录项:1、底盘传递2订单轮训3距离展示(新增)]
2023-03-21 18:16:11 +08:00
wangmingjun
ea10cbf660 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-21 13:10:24 +08:00
wangmingjun
50fa213673 [M2/shuttle] 登陆状态轮询 2023-03-21 13:10:13 +08:00
yangyakun
1492df10b6 [m1]
[到站结束路算]
2023-03-21 12:28:33 +08:00
wangmingjun
0432ead06f 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-21 11:50:00 +08:00
wangmingjun
250dc3e206 [shuttle/M2/M1] 处理语音播报"蘑菇车联"读成"蘑菇车 联"问题 2023-03-21 11:49:51 +08:00
renwj
08eacd81a0 [m1] 状态栏中的电量进度不可拖动,滑动不触发地图视角变化 2023-03-21 11:09:14 +08:00
yangyakun
a1017f7981 [M1]
[超时时间修改]
2023-03-21 07:56:37 +08:00
yangyakun
6e2f9f732c [m1]
[时间过滤]
2023-03-20 21:07:48 +08:00
yangyakun
0d340f2581 [m1]
[线程错误]
2023-03-20 21:03:39 +08:00
yangyakun
9f93f234d2 [m1]
[recycleview 滚动问题]
2023-03-20 21:02:39 +08:00
yangyakun
ec702e64f3 [m1]
[v2x+通知]
2023-03-20 20:15:43 +08:00