Commit Graph

13517 Commits

Author SHA1 Message Date
zhongchao
dbc751400d [3.2.0]fix bug of multi process cause the exception 2023-05-16 19:58:01 +08:00
zhongchao
b094b421bd [3.2.0] remove unuse code 2023-05-16 18:54:55 +08:00
zhongchao
c6737617f7 [3.2.0] add func of trafficlight support daylightmode and fix passport sn and token get problem 2023-05-16 18:47:41 +08:00
lixiaopeng
982139a078 [dev_minibus-d_230425_3.2.0] 修改红绿灯闪烁问题,优化红绿灯读秒三位数显示不全问题 2023-05-16 18:36:37 +08:00
wangmingjun
f79321b852 [3.2.0] 1、UI走查调整 2、-a环境大理/烟台绑定二维码url调整 2023-05-16 15:25:10 +08:00
wangmingjun
6def045a62 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-16 11:50:31 +08:00
wangmingjun
388ff3ed85 [3.2.0] M1乘客屏UI线程切换 2023-05-16 11:48:55 +08:00
renwj
ac11364624 [合并] 解决冲突 2023-05-16 10:56:59 +08:00
renwj
227ce3c3ad [合并] 将分支2.15.0_merge_master的最新代码合并过来 2023-05-16 10:56:36 +08:00
zhongchao
8a41795a79 [3.2.0] missing the batch draw marker control param 2023-05-15 19:20:02 +08:00
wangmingjun
3df9011f8d Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-15 18:33:24 +08:00
wangmingjun
6a03d0a784 [3.2.0] M1包车核销语音修改 2023-05-15 18:33:15 +08:00
yangyakun
b241227e35 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-15 18:14:15 +08:00
yangyakun
df3387feb8 [charter]
[3.2.0]
[UI调整]
2023-05-15 18:13:56 +08:00
wangmingjun
c0e1688958 [3.2.0] shuttle乘客屏,UI调整 2023-05-15 16:45:24 +08:00
wangmingjun
b9aa5ee746 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-15 16:21:41 +08:00
wangmingjun
766b8b5577 [3.2.0] bus乘客屏,修复地图和视频滑动bug 2023-05-15 16:21:12 +08:00
yangyakun
413954da11 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-15 15:22:01 +08:00
yangyakun
14750383be [charter]
[3.2.0]
[延时操作需要设置取消]
2023-05-15 15:21:50 +08:00
chenfufeng
fbd1818908 [3.2.0][Opt]打开matrix插件 2023-05-15 14:58:44 +08:00
yangyakun
0ef58f5355 [charter]
[3.2.0]
[自动驾驶状态、可以查看线路不能切换线路]
2023-05-15 14:43:23 +08:00
wangmingjun
fac0757836 [3.2.0] 司乘版本号3.2.0/2.2.0 2023-05-15 10:33:15 +08:00
wangmingjun
4cc8f25bae Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-15 10:16:13 +08:00
wangmingjun
97e28f3a05 [3.2.0] 版本号3.2.0 2023-05-15 10:16:03 +08:00
yangyakun
c5c800beb6 [charter]
[3.2.0]
[tts 查漏补缺]
2023-05-14 23:49:54 +08:00
wangmingjun
91a4c90eba [3.2.0] bus乘客屏recycleview 问题处理 2023-05-14 22:04:17 +08:00
wangmingjun
4c5da7b3e7 [3.2.0] m1司机端同一路线切换站点不再弹框 2023-05-14 21:51:38 +08:00
wangmingjun
fc49e84091 [3.2.0] bus乘客屏UI调整 2023-05-14 20:03:19 +08:00
wangmingjun
3fde1b42cd Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-12 12:50:53 +08:00
wangmingjun
a4ad075992 [3.2.0] UI调整 2023-05-12 12:50:44 +08:00
yangyakun
dfef5cba44 [charter]
[3.2.0]
[部分tts]
2023-05-12 11:47:41 +08:00
yangyakun
bd701580ed [charter]
[3.2.0]
[tts车门打开禁止启动自驾]
2023-05-12 11:11:08 +08:00
yangyakun
f115e03902 [charter]
[3.2.0]
[选择线路的部分逻辑]
2023-05-12 10:54:28 +08:00
yangyakun
44ff8788ff [tianjin]
[3.1.6]
[添加动画]
2023-05-12 00:01:49 +08:00
wangmingjun
b7ca5bc757 [3.2.0] try-catch 偶尔出现的轨迹集合清空情况 2023-05-11 20:54:43 +08:00
wangmingjun
5e41035151 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-11 20:13:07 +08:00
wangmingjun
5a98e90dd0 [3.2.0] bus/shuttle 乘客屏UI调整 2023-05-11 20:12:54 +08:00
yangyakun
ae42648b0a Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-11 18:25:14 +08:00
yangyakun
44d9c22172 [charter]
[3.2.0]
[引导页面搭建业务逻辑]
2023-05-11 18:25:05 +08:00
zhongchao
6fdf44b54f [3.2.0-aka-2.15.2] fix batch marker 2023-05-11 17:08:41 +08:00
zhongchao
660b879048 [3.2.0]fix batch marker 2023-05-11 17:08:41 +08:00
wangmingjun
506eee2747 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-11 16:51:48 +08:00
wangmingjun
9dbf45c41a [3.2.0] bus/shuttle 乘客屏UI调整 2023-05-11 16:50:57 +08:00
lixiaopeng
b06dbe26ac Merge branch 'dev_minibus-d_230425_3.2.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_minibus-d_230425_3.2.0 2023-05-11 16:47:20 +08:00
lixiaopeng
914106ca9a [dev_minibus-d_230425_3.2.0] add log 2023-05-11 16:47:12 +08:00
zhongchao
d8eb1cd8b8 [3.2.0-aka-2.15.2] remove plenty logs in small mapview 2023-05-11 16:13:26 +08:00
yangyakun
0639e93870 [charter]
[3.2.0]
[引导页面搭建]
2023-05-11 16:11:04 +08:00
zhongchao
bbee9856b7 [3.2.0-aka-2.15.2]change the batchMarker deleteRule 2023-05-11 16:02:02 +08:00
wangmingjun
8baf6250f6 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-11 14:58:52 +08:00
wangmingjun
299824fb74 [3.2.0] bus乘客屏视频/地图转换 2023-05-11 14:58:29 +08:00