Commit Graph

16867 Commits

Author SHA1 Message Date
zhongchao
7bd6e35e6f [3.2.0] remove unuse code 2023-05-08 11:49:29 +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
48f32d0644 [3.2.0]remove gradle setting of uploadtime 2023-05-08 11:22:41 +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
9ed33343e0 [2.15.0_merge_master] merge problem fix 2023-05-06 20:08:48 +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
chenfufeng
99d87e54c0 [3.2.0][opt]支持绘制独立站点轨迹 2023-05-06 15:32:18 +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
e5d8aca194 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-05 17:19:32 +08:00
bxb
55238dd0ed [sweeper-cloud] 接取云控任务确认弹窗逻辑处理 2023-05-05 17:19:17 +08:00
chenfufeng
45a7aa768a [3.2.0][feat]支持绘制并更新站点名 2023-05-05 17:18:52 +08:00
xinfengkun
5de57350c4 [dev_sweeper_3.1.0] 修改错误注解 2023-05-05 17:17:50 +08:00
xinfengkun
66a20e80d1 [工控机监控] 移除工控机监控app 2023-05-05 17:08:53 +08:00
wangmingjun
f191c02f33 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-05 15:49:29 +08:00
wangmingjun
d98396bb69 [3.2.0] 包车司机端增加到站接口、同步报站屏信息 2023-05-05 15:49:21 +08:00
chenfufeng
b5fb64d1b9 [3.2.0][opt]删除消息盒子历史数据时切换线程 2023-05-05 10:35:16 +08:00
chenfufeng
aa90caff35 [3.2.0][feat]删除消息盒子的历史数据 2023-05-04 20:09:52 +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
da3a923e65 [3.2.0]增加fuzhou flavor 2023-05-04 17:50:00 +08:00
wangmingjun
87571bd501 Merge branch 'dev_robobus-d_230418_3.1.0_fuzhou' into dev_minibus-d_230425_3.2.0
# Conflicts:
#	app/build.gradle
#	app/productFlavors/flavorsFilterConfig.gradle
2023-05-04 17:22:43 +08:00
wangmingjun
97bc4f4ea7 [3.2.0] charter 司机端增加核销传递给乘客屏 2023-05-04 17:07:26 +08:00
wangmingjun
c1a79c2b69 [3.2.0] charter 司机端, 到站同步 2023-05-04 16:15:55 +08:00
xinfengkun
54ea3e3022 [dev_sweeper310][adas] 轨迹下载请求接口添加消息来源字段 2023-05-04 16:07:17 +08:00
xinfengkun
65c39167fd dev_sweeper310][adas]云控清扫车接收接口添加可空参数类型,添加未知类型回调 2023-05-04 15:16:12 +08:00
xinfengkun
1ce857a56f dev_sweeper310][adas]云控清扫车接收接口添加可空参数类型,添加未知类型回调 2023-05-04 15:15:19 +08:00
wangmingjun
0c04ccf258 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-04 14:59:16 +08:00
wangmingjun
cb51f1f2ac [3.2.0] bus乘客屏UI opt 2023-05-04 14:58:51 +08:00
aibingbing
626737db2c fix: 为了避免自车定位提前结束任务导致的溜车问题,这里删除自车定位触发到站; 2023-05-04 14:37:37 +08:00
bxb
1c46f27af8 [sweeper-cloud] 清扫车获取云端正在执行的任务逻辑处理 2023-05-04 14:10:37 +08:00
yangyakun
420c3f3b8c Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-04 11:41:13 +08:00
yangyakun
04932ce67e [charter]
[3.2.0]
[到站和结束订单数据传输到司机屏]
2023-05-04 11:41:02 +08:00
yangyakun
0fe15c01f9 [charter]
[3.2.0]
[定义到站和结束订单的局域网结构]
2023-05-04 11:40:10 +08:00
wangmingjun
09adc8cc59 Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-04-28 19:31:15 +08:00
wangmingjun
8f879a54e5 [3.2.0] shuttle乘客屏UI opt 2023-04-28 19:31:08 +08:00
yangyakun
35b276f720 [charter]
[3.2.0]
[订单信息页]
2023-04-28 18:38:40 +08:00