Commit Graph

12226 Commits

Author SHA1 Message Date
wangmingjun
be622a01ac [M2] 视频下载网络中断问题处理 2023-03-09 21:58:49 +08:00
wangmingjun
4513f98220 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 21:11:23 +08:00
wangmingjun
9142eacbe6 [M2] 乘客屏行程信息UI再次调整 2023-03-09 21:11:10 +08:00
yangyakun
b2d6f32357 [m1]
[1.1.2]
[倒计时、结束订单tts]
2023-03-09 19:19:06 +08:00
chenfufeng
eec59ece65 [Opt3.0]解决下新的订单导致轨迹画线的问题 2023-03-09 16:37:47 +08:00
zhongchao
78e10248a8 [m1-p-1.1.0] change the color of jiangshiche 2023-03-09 16:03:43 +08:00
wangmingjun
0a53c05d67 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 14:33:05 +08:00
wangmingjun
decf6e4ba3 [M2] 司机端转发运营消息,乘客屏展示 2023-03-09 14:32:54 +08:00
xuxinchao
be4bae2023 [m1]调整运营消息显示Logo 2023-03-09 14:11:40 +08:00
wangmingjun
bc7720e7f0 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 14:06:19 +08:00
wangmingjun
641060c649 [M2] 1、图片在网络不好加载黑屏问题 2、尝试解决跳转视频一瞬黑屏 2023-03-09 13:53:24 +08:00
yangyakun
0988df2ef6 [m1]
[1.1.2]
[ui调整]
2023-03-09 12:11:31 +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
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