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 |
|
yangyakun
|
629cc39705
|
[charter]
[3.2.0]
[轨迹]
|
2023-05-06 11:19:29 +08:00 |
|
wangmingjun
|
357b5fc877
|
[3.2.0] 包车司机端确认倒计时
|
2023-05-05 19:37:35 +08:00 |
|
wangmingjun
|
8c3f02b9c1
|
[3.2.0] 包车司机同步报站屏信息增加订单号和站点列表
|
2023-05-05 18:02:44 +08:00 |
|
wangmingjun
|
c1f57688da
|
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-05 17:46:44 +08:00 |
|
wangmingjun
|
16bc0e0785
|
[3.2.0] 包车司机同步报站屏信息修改
|
2023-05-05 17:46:37 +08:00 |
|
yangyakun
|
08bbbe9eec
|
[charter]
[3.2.0]
[add orderNo change]
|
2023-05-05 17:35:34 +08:00 |
|
yangyakun
|
2b30071f55
|
[charter]
[3.2.0]
[line view change]
|
2023-05-05 17:23:04 +08:00 |
|
bxb
|
55238dd0ed
|
[sweeper-cloud] 接取云控任务确认弹窗逻辑处理
|
2023-05-05 17:19:17 +08:00 |
|
wangmingjun
|
d98396bb69
|
[3.2.0] 包车司机端增加到站接口、同步报站屏信息
|
2023-05-05 15:49:21 +08:00 |
|
yangyakun
|
a31df5ea07
|
[charter]
[3.2.0]
[data change]
|
2023-05-04 18:37:00 +08:00 |
|
yangyakun
|
b6cb2c591a
|
Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0
|
2023-05-04 18:22:08 +08:00 |
|
yangyakun
|
a6af328c08
|
[charter]
[3.2.0]
[select line and site]
|
2023-05-04 18:21:58 +08:00 |
|
wangmingjun
|
16fc295063
|
[3.2.0] bus 乘客屏删除无用ui
|
2023-05-04 18:08:35 +08:00 |
|
wangmingjun
|
7a66b05dd9
|
[3.2.0] charter 类魔方功能增加日志
|
2023-05-04 18:05:35 +08:00 |
|
wangmingjun
|
97bc4f4ea7
|
[3.2.0] charter 司机端增加核销传递给乘客屏
|
2023-05-04 17:07:26 +08:00 |
|