Commit Graph

13492 Commits

Author SHA1 Message Date
xinfengkun
d2f14a99a9 Merge branch 'dev_opt_2.15.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_opt_2.15.0 2023-03-09 10:25:37 +08:00
xinfengkun
07fc1d99a8 [工控机监控]调整图片显示 2023-03-09 10:25:30 +08:00
yangyakun
e37509886f Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-09 10:02:00 +08:00
yangyakun
6a99016b90 [m1]
[1.1.2]
[倒计时和司机端同步 添加60s]
2023-03-09 10:01:45 +08:00
wangmingjun
eed1ce5003 [M2] 删除无用引用 2023-03-09 09:17:44 +08:00
wangmingjun
167c78c49c [M2] 视频默认图片加载网络图片 2023-03-09 00:26:59 +08:00
wangmingjun
35192ca1ed Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 22:39:08 +08:00
wangmingjun
ae3282e554 [M2] 视频封面问题调整 2023-03-08 22:38:39 +08:00
yangyakun
3922cdf250 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 22:06:55 +08:00
yangyakun
4e2cc41f63 [m1]
[1.1.2]
[到达时间修改位订单倒计时、轮训是否立即执行]
2023-03-08 22:06:46 +08:00
wangmingjun
04dec9e2fe Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 22:01:00 +08:00
yangyakun
49d3a89027 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
2023-03-08 21:40:34 +08:00
wangmingjun
2210379543 [M2] 视频首帧加载默认本地图片 2023-03-08 21:39:57 +08:00
pangfan
37a3f2e5af opt 2023-03-08 21:31:35 +08:00
wangmingjun
0ca2c14b79 Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 21:21:32 +08:00
wangmingjun
c7e162271e [M2] 视频首帧加载默认本地图片 2023-03-08 21:21:15 +08:00
xuxinchao
d1e2bf8022 [opt-3.0]去除测试代码 2023-03-08 20:11:41 +08:00
xuxinchao
0a349896bc [opt-3.0]fix消息盒子气泡消息偶现未及时消除Bug 2023-03-08 20:08:09 +08:00
renwj
01d9042887 [dev_arch_opt_3.0] 修正云通话窗口被遮挡问题 2023-03-08 19:52:30 +08:00
bxb
e75fc7567a Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
2023-03-08 19:25:46 +08:00
bxb
00721c0e77 [清扫车]UI相关展示问题修改 2023-03-08 18:53:09 +08:00
xuxinchao
5d05f0fded [opt-3.0]fix消息盒子车辆系统信息闪烁问题 2023-03-08 18:51:52 +08:00
xuxinchao
ab22a6f6a3 [m1]消息盒子增加停车预告运营消息 2023-03-08 18:11:56 +08:00
wangmingjun
78ad8103ce [shuttle] 1、增加接驳下发乘客屏运营消息功能 2、接驳平行驾驶显示 2023-03-08 17:39:32 +08:00
lixiaopeng
bc4c87acd7 [dev_arch_opt_3.0] 添加大于10m,才显示rsi信息 2023-03-08 17:25:03 +08:00
lixiaopeng
7fa70569f5 [dev_arch_opt_3.0] 添加魔方toast控制,修改HDMAP 2023-03-08 17:24:12 +08:00
lixiaopeng
04c63a7977 [dev_arch_opt_3.0] 添加大于10m,才显示rsi信息 2023-03-08 17:15:00 +08:00
yangyakun
d6f9565526 [m1]
[1.1.2]
[切换线路、清理轨迹]
2023-03-08 17:05:02 +08:00
yangyakun
a7cd802b21 [m1]
[1.1.2]
[m1默认车模]
2023-03-08 17:03:59 +08:00
yangyakun
b1dff6b91f Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 17:02:59 +08:00
yangyakun
e8e55a5400 [tts]
[tts引用问题]
2023-03-08 17:02:47 +08:00
lixiaopeng
2005201d04 [dev_arch_opt_3.0] 添加魔方toast控制,修改HDMAP 2023-03-08 16:40:26 +08:00
wangmingjun
070197c100 [M1] 司机端还车时间修复 2023-03-08 16:24:28 +08:00
xinfengkun
e159cfbae6 Merge branch 'dev_opt_2.15.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_opt_2.15.0 2023-03-08 16:19:34 +08:00
xinfengkun
a4370eb06e [opt2.15.0][adas-lib]增加lanning控制命令(目前用于襄阳驾照考试),增加控制V2N数据给车端PnC接口 2023-03-08 16:19:21 +08:00
wangmingjun
1b3b157714 [M1] 司机端还车时间修复 2023-03-08 16:18:05 +08:00
bxb
105b7e6ede [清扫车]UI 底部按钮图片修改 2023-03-08 16:08:01 +08:00
wangmingjun
3194c67f26 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 15:49:56 +08:00
wangmingjun
25e9a3acc3 [M2] M2车模替换 2023-03-08 15:48:40 +08:00
wangmingjun
96256811a9 [M2] 1、视频下载优化 2023-03-08 15:34:38 +08:00
pangfan
5d2ff266eb [V1.1.0]增加Mis运营后台推送消息 2023-03-08 14:32:21 +08:00
xuxinchao
6686eaee21 [清扫车]fix消息盒子车辆系统信息闪烁问题 2023-03-08 11:55:38 +08:00
renwj
660a878207 [dev_opt_2.15.0] 优化下载相关的数据库操作 2023-03-08 11:24:05 +08:00
xinfengkun
ea6f95ea20 Merge branch 'dev_opt_2.15.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_opt_2.15.0 2023-03-08 10:50:24 +08:00
xinfengkun
bb298d60ab [opt2.15.0][adas-lib]障碍物接口新增盲区数据,添加发送配置命令接口,添加盲区开关控制接口 2023-03-08 10:50:14 +08:00
lixiaopeng
05e319453b [dev_arch_opt_3.0] 优化cmdb存储 2023-03-08 10:08:57 +08:00
lixiaopeng
bc3b3f1a48 [dev_arch_opt_3.0] 优化cmdb存储 2023-03-08 09:59:24 +08:00
yangyakun
2e35de029e Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 09:56:30 +08:00
yangyakun
dadf330a2c [shuttle]
[方向盘修改]
2023-03-08 09:36:48 +08:00
wangmingjun
39afcde96c Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!657
2023-03-07 16:33:22 +00:00