Commit Graph

14844 Commits

Author SHA1 Message Date
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
wangmingjun
d1cb15537d Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-04-28 18:00:10 +08:00
wangmingjun
e107a91db1 [3.2.0] 地图sdk升级到2.12.1.1 2023-04-28 17:59:52 +08:00
xinfengkun
feaed1a916 [dev_bus320] 允许网络通信使用明文网络流量 2023-04-28 17:09:41 +08:00
chenfufeng
4543287ff0 [3.2.0][opt]关闭Matrix的日志 2023-04-28 11:49:49 +08:00
yangyakun
f42b2e8e51 [charter]
[3.2.0]
[缓存fragment]
2023-04-28 11:46:59 +08:00
bxb
9763ebdae7 [sweeper-cloud]pb回调部分代码修改 2023-04-28 11:34:25 +08:00
yangyakun
977a3c77fb [charter]
[3.2.0]
2023-04-28 11:18:33 +08:00
yangyakun
f238af5729 [charter]
[3.2.0]
[结束订单样式修改]
2023-04-28 10:19:46 +08:00
yangyakun
34ae08c5d4 [charter]
[3.2.0]
[不切换背景]
2023-04-27 20:59:18 +08:00
yangyakun
5815f2e974 [charter]
[3.2.0]
[底部导航栏功能]
2023-04-27 20:56:37 +08:00
yangyakun
6a54b17f13 [charter]
[3.2.0]
[底部导航栏功能]
2023-04-27 18:34:31 +08:00
chenfufeng
a591dd4387 [3.2.0][opt]集成Matrix的TraceCanary模块 2023-04-27 17:50:58 +08:00
yangyakun
0705256eed [charter]
[3.2.0]
2023-04-27 15:28:13 +08:00
bxb
fb5f86fb82 [sweeper-cloud]调整任务面板间距问题 2023-04-27 10:59:47 +08:00
bxb
dfcf558109 [sweeper-cloud]解决代码合并冲突 2023-04-27 10:59:12 +08:00
wangmingjun
b9a721faee [3.1.4] 更新司机端版本号 3.1.4 2023-04-26 19:33:25 +08:00
wangmingjun
77cc5e20b3 Merge branch 'dev_minibus-d_230425_3.2.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-26 18:24:51 +08:00
wangmingjun
ab0ea94455 [3.2.0] 1、倒计时120s 2、类魔方功能加减速 3、三方同步opt 2023-04-26 18:23:14 +08:00
wangmingjun
c635c130e0 Merge branch 'dev_robobus-d_230425_3.1.4' into 'dev_robobus-p_230425_2.1.4'
[福州3.1.4] 更换司机端绑定二维码

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!765
2023-04-26 10:20:03 +00:00
bxb
d9a1c24945 Merge branch 'bxb/dev_sweeper-d_modify_domain_name' into dev_sweeper-d_230423_3.1.0
# Conflicts:
#	app/config/urlConfig.json
2023-04-26 18:12:56 +08:00
bxb
de81c7a414 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-04-26 17:57:24 +08:00
bxb
209020f4c0 [sweeper-cloud]删除清扫车无用的布局和部分代码 2023-04-26 17:56:01 +08:00
bxb
8c9ef04ac2 [sweeper-cloud]子任务列表布局搭建及其修改 2023-04-26 17:55:06 +08:00