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 |
|
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 |
|
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
|
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 |
|
wangmingjun
|
1b3b157714
|
[M1] 司机端还车时间修复
|
2023-03-08 16:18:05 +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 |
|
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 |
|
wangmingjun
|
fffe9d4187
|
[M2] 1、注释定位频率设定 2、倒计时问题 3、M2 走马灯
|
2023-03-08 00:32:11 +08:00 |
|
yangyakun
|
29ae93e933
|
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-07 23:11:39 +08:00 |
|
yangyakun
|
84cb01a957
|
[m1]
[1.1.2]
[乘客屏可以单独修改站点]
|
2023-03-07 23:11:33 +08:00 |
|
aibingbing
|
997de6254e
|
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-07 23:01:09 +08:00 |
|
yangyakun
|
370544391e
|
[m1]
[1.1.2]
[tts 删除线程切换]
|
2023-03-07 23:00:24 +08:00 |
|
aibingbing
|
390eec6ec9
|
refactor: 金旅星辰乘客屏 修改成双屏，并播放宣传视频；
|
2023-03-07 22:59:36 +08:00 |
|
yangyakun
|
33966e4e76
|
[m1]
[1.1.2]
[sn 抽取]
|
2023-03-07 22:44:41 +08:00 |
|
yangyakun
|
6929663286
|
[m1]
[1.1.2]
[去掉bus 开沃车型]
|
2023-03-07 22:31:35 +08:00 |
|
yangyakun
|
8322522c0d
|
[m1]
[1.1.2]
[添加车型 金旅 判断]
|
2023-03-07 22:21:14 +08:00 |
|
yangyakun
|
27d40c6a0b
|
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-07 21:58:42 +08:00 |
|
yangyakun
|
a0154bdcee
|
[m1]
[1.1.2]
[tts 引用]
|
2023-03-07 21:58:36 +08:00 |
|
chenfufeng
|
fca708154c
|
[Opt3.0]优化自车是否走过轨迹点的逻辑
|
2023-03-07 20:30:48 +08:00 |
|
chenfufeng
|
a044812042
|
[Opt3.0]优化自车是否走过轨迹点的逻辑
|
2023-03-07 20:30:21 +08:00 |
|
lixiaopeng
|
0dd42173a4
|
Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0
|
2023-03-07 19:07:46 +08:00 |
|
lixiaopeng
|
a6d82645f5
|
[dev_arch_opt_3.0] 去掉下载通知栏提示，调试面板添加车信息数据展示
|
2023-03-07 19:07:37 +08:00 |
|
zhongchao
|
d1cd2a0c3f
|
[2.13.0-arch-opt] Volatile
|
2023-03-07 19:03:32 +08:00 |
|
xuxinchao
|
c6cf58f77a
|
[opt3.0]HttpDNS接口扩列
|
2023-03-07 17:38:16 +08:00 |
|
lixiaopeng
|
591c3c2339
|
[dev_arch_opt_3.0] 优化运营面板
|
2023-03-07 16:25:58 +08:00 |
|
yangyakun
|
5284216e8a
|
[m1]
[1.1.2]
[接驳烟台打包过滤条件]
|
2023-03-07 15:15:52 +08:00 |
|
yangyakun
|
9cd0e54a78
|
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-07 15:11:56 +08:00 |
|
yangyakun
|
d1179c0ca6
|
[m1]
[1.1.2]
[接驳烟台打包]
|
2023-03-07 15:11:30 +08:00 |
|
xuxinchao
|
84eb439850
|
[m1]消息盒子增加停车预告运营消息
|
2023-03-07 14:45:18 +08:00 |
|
yangyakun
|
5be067403f
|
[m1]
[1.1.2]
[延时任务误判]
|
2023-03-07 13:51:14 +08:00 |
|
yangyakun
|
df05b9d321
|
[m1]
[1.1.2]
[版本命名修改]
|
2023-03-07 12:04:41 +08:00 |
|
yangyakun
|
f5b4110904
|
[m1]
[1.1.2]
[下载轨迹查询登录状态、补偿5分钟语音播报]
|
2023-03-07 10:51:04 +08:00 |
|