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 |
|
lixiaopeng
|
fc2a750c6c
|
[dev_minibus-d_230425_3.2.0] 修改红绿灯按钮同步乘客屏
|
2023-05-11 14:02:44 +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 |
|
aibingbing
|
4268320dff
|
Merge branch 'release_sweeper-d_230328_3.0.0.1_bugfix' into 'master'
[Sweeper] fix: 为了避免自车定位提前结束任务导致的溜车问题，这里删除自车定位触发到站;
See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!768
|
2023-05-10 10:25:00 +00: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
|
20cd34caf5
|
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
Conflicts:
OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
|
2023-05-10 16:05:31 +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
|
b8dd7063d5
|
[Code] 简化ByteX相关的配置
|
2023-05-10 11:11:01 +08:00 |
|
renwj
|
9ce2b83bb3
|
[Build] 修正某些库设置的compileSdkVersion过高，导致需要更高的JDK版本才能构建成功
|
2023-05-10 11:10:08 +08:00 |
|
xinfengkun
|
22eba9793d
|
[adas] 增强代码健壮性
|
2023-05-10 10:51:32 +08:00 |
|
pangfan
|
17b882567f
|
Merge branch 'dev_robobus-p_230506_2.1.6' into 'dev_robobus-d_230506_3.1.6'
# Conflicts:
# gradle.properties
|
2023-05-10 02:48:52 +00:00 |
|
renwj
|
6295fc3c57
|
[下载工具] 重构下载工具类;支持断点续传;网络状态监听
|
2023-05-10 10:45:56 +08:00 |
|
pangfan
|
3b21672300
|
[MogoGo]天津项目：司机提供核销小程序用的二维码不区分环境
|
2023-05-09 20:15:12 +08:00 |
|
pangfan
|
04169052c8
|
[MogoGo]天津项目：适配新的qa环境域名
|
2023-05-09 19:38:35 +08:00 |
|
xinfengkun
|
f0467b6f15
|
[m1] M1拼接视频数据接口和清扫车摄像头数据接口遗漏提交
|
2023-05-09 18:09:51 +08:00 |
|
xuxinchao
|
0d6ec28599
|
[dev_minibus-d_230425_3.2.0]M1乘客屏核销订单删除消息历史缓存
|
2023-05-09 16:19:44 +08:00 |
|
xinfengkun
|
e0b2cd3529
|
Merge branch 'dev_sweeper-d_230423_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0
|
2023-05-09 15:33:36 +08:00 |
|
xinfengkun
|
bb22ec10d5
|
[m1] 添加M1拼接视频数据订阅接口、清扫车摄像头View和M1摄像头View共用
|
2023-05-09 15:33:08 +08:00 |
|
xuxinchao
|
26285c77c6
|
[dev_minibus-d_230425_3.2.0]fix云调度空指针异常
|
2023-05-09 15:22:14 +08:00 |
|
xinfengkun
|
9f47d1ed6b
|
[adas] 添加M1拼接视频接收接口
|
2023-05-09 15:20:18 +08:00 |
|
xinfengkun
|
3d23a1fd59
|
[dev_sweeper_3.1.0] WebSocket空指针修复
|
2023-05-09 14:59:00 +08:00 |
|
aibingbing
|
e56f106a90
|
feat: 增加 连续点击 返回键 才能推出应用，避免误操作；
|
2023-05-09 10:57:42 +08:00 |
|
bxb
|
b88a86d595
|
[sweeper-cloud] 云控子任务状态更新逻辑处理
|
2023-05-09 10:48:21 +08:00 |
|
yangyakun
|
05f07320b2
|
[tianjin]
[3.1.6]
[string]
|
2023-05-08 22:41:52 +08:00 |
|
yangyakun
|
7a3e9a4abc
|
[tianjin]
[3.1.6]
[string]
|
2023-05-08 22:29:13 +08:00 |
|
yangyakun
|
562bb8dbb9
|
[tianjin]
[3.1.6]
[版本号]
|
2023-05-08 21:46:30 +08:00 |
|