Commit Graph

2579 Commits

Author SHA1 Message Date
bxb
aff744f816 [sweeper-cloud]大任务正常结束逻辑处理以及大任务各种结束状态模拟处理 2023-05-13 19:18:55 +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
wangmingjun
9dbf45c41a [3.2.0] bus/shuttle 乘客屏UI调整 2023-05-11 16:50:57 +08:00
yangyakun
0639e93870 [charter]
[3.2.0]
[引导页面搭建]
2023-05-11 16:11:04 +08:00
wangmingjun
299824fb74 [3.2.0] bus乘客屏视频/地图转换 2023-05-11 14:58:29 +08:00
bxb
122e0bf686 Merge branch 'dev_sweeper-d_230423_3.1.0' of http://gitlab.zhidaoauto.com/SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0 2023-05-10 19:49:05 +08:00
bxb
8d16bfd00d [sweeper-cloud]模拟获取当前正在执行的的任务逻辑处理 2023-05-10 19:48:52 +08:00
yangyakun
e7836b87cd Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-10 19:22:43 +08:00
yangyakun
1ba3a702e6 [charter]
[3.2.0]
[适配]
2023-05-10 19:22:23 +08:00
wangmingjun
0edda6baa4 [3.2.0] shuttle b1乘客屏错误处理 2023-05-10 19:13:24 +08:00
wangmingjun
62d2e6a6e7 [3.2.0] bus乘客屏视频地图切换 2023-05-10 18:34:04 +08:00
aibingbing
508339a095 fix: 为了避免自车定位提前结束任务导致的溜车问题,这里删除自车定位触发到站; 2023-05-10 18:28:10 +08:00
xuxinchao
43e4d50768 [dev_minibus-d_230425_3.2.0]漫游更改为司乘屏独立漫游 2023-05-10 18:02:52 +08:00
yangyakun
30c1b606b8 [charter]
[3.2.0]
[1.15.2适配]
2023-05-10 16:57:24 +08:00
bxb
29650a6051 [sweeper-cloud]大任务正常结束和提前结束逻辑处理 2023-05-10 16:03:51 +08:00
wangmingjun
4b9691d2e8 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-10 15:51:06 +08:00
wangmingjun
5eb4ed0c6e [3.2.0] shuttle司机端报错处理 2023-05-10 15:50:58 +08:00
yangyakun
630f2b76e4 [charter]
[3.2.0]
[debugview]
2023-05-10 11:29:18 +08:00
renwj
9ce2b83bb3 [Build] 修正某些库设置的compileSdkVersion过高,导致需要更高的JDK版本才能构建成功 2023-05-10 11:10:08 +08:00
renwj
6295fc3c57 [下载工具] 重构下载工具类;支持断点续传;网络状态监听 2023-05-10 10:45:56 +08:00
bxb
b88a86d595 [sweeper-cloud] 云控子任务状态更新逻辑处理 2023-05-09 10:48:21 +08:00
yangyakun
0066c01e9b [charter]
[3.2.0]
[更换ui+debugview]
2023-05-08 18:33:19 +08:00
zhongchao
7ef091faf6 [3.2.0]fix bug of merge 2023-05-08 18:02:47 +08:00
wangmingjun
863407db2a 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-08 17:51:53 +08:00
wangmingjun
9bee56d0f4 [3.2.0] bus/shuttle乘客屏状态栏, 包车司机端二维码-a环境修改 2023-05-08 17:51:48 +08:00
zhongchao
a73c3af897 [3.2.0] 2023-05-08 17:45:51 +08:00
zhongchao
5c8a559ec4 [3.2.0]fix bug of merge problem 2023-05-08 17:41:30 +08:00
yangyakun
a7f29daecf [charter]
[3.2.0]
[选择线路右侧展示线路和站名]
2023-05-08 17:33:35 +08:00
yangyakun
a72053ad30 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-08 16:19:53 +08:00
zhongchao
2bc64adb67 Merge branch '2.15.0_merge_master' into dev_minibus-d_230425_3.2.0 2023-05-08 15:27:54 +08:00
renwj
22cf999031 [MAP] 高精地图Marker绘制逻辑重构 2023-05-08 15:10:46 +08:00
zhongchao
891e200788 [3.2.0] fix ui bug of roma view has written by iacollect 2023-05-08 12:10:59 +08:00
yangyakun
45263667d1 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-08 11:24:02 +08:00
zhongchao
eecea49493 [2.15.0_merge_3.2.0] 2023-05-08 11:21:15 +08:00
zhongchao
5005745645 [2.15.0_merge_master] merge problem fix 2023-05-06 20:18:07 +08:00
zhongchao
64bcb93bff [2.15.0-merge-master] 2023-05-06 20:03:51 +08:00
bxb
7dc77457d2 [sweeper-cloud] 接取任务弹窗逻辑封装处理 2023-05-06 19:17:21 +08:00
bxb
a0e486988d [sweeper-cloud]通用加载中loading封装 2023-05-06 19:15:52 +08:00
yangyakun
44d162555d [charter]
[3.2.0]
[debugview]
2023-05-06 15:47:05 +08:00
yangyakun
04be64e9b9 [charter]
[3.2.0]
[日志+debugview]
2023-05-06 15:23:34 +08:00