Commit Graph

12251 Commits

Author SHA1 Message Date
wangmingjun
08d9d2c856 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] 升级线程库版本,移除对Dispatchers.Default与Dispatchers.IO的代理

See merge request zhjt/AndroidApp/MoGoEagleEye!660
2023-03-10 03:36:02 +00:00
wangmingjun
b75db28e72 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-10 11:34:55 +08:00
renwj
10afe08343 [dev_arch_opt_3.0] 升级线程库版本,移除对Dispatchers.Default与Dispatchers.IO的代理 2023-03-10 11:34:45 +08:00
wangmingjun
5fe5e0346a [M2] UI调整 2023-03-10 11:34:41 +08:00
chenfufeng
4d5598bd87 [Opt]替换新的中、英、韩发音人 2023-03-10 11:23:40 +08:00
wangmingjun
0023811c6d 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!659
2023-03-10 02:05:47 +00:00
wangmingjun
334b368d5e [M2] 视频封面消失时间设置成1s 2023-03-10 00:36:54 +08:00
wangmingjun
c7c47400a8 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-10 00:35:39 +08:00
wangmingjun
88b8be2962 [M1/shuttle] 加入平行驾驶 2023-03-10 00:35:25 +08:00
aibingbing
e73f141d59 refactor: 将明君优化的宣传视频播放优化复制到公共module; 2023-03-10 00:29:28 +08:00
aibingbing
fd83511f67 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-09 23:45:52 +08:00
aibingbing
9195fdf217 refactor: 将明君优化的宣传视频播放优化复制到公共module; 2023-03-09 23:45:32 +08:00
yangyakun
a264e0f4a4 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 23:13:47 +08:00
yangyakun
38c8a35556 [m1]
[1.1.2]
[选择线路和站点]
2023-03-09 23:13:36 +08:00
aibingbing
748a8be466 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-09 23:06:11 +08:00
aibingbing
2542086f97 refactor: OCH 宣传视频播放抽取到common; 2023-03-09 23:05:13 +08:00
wangmingjun
ccecb1948f [M2] 1、视频任务下载问题兼容 2、speed速度加log 2023-03-09 22:42:02 +08:00
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
donghongyu
d5467e260e [dev_arch_opt_3.0]
[Change]
[
1、高德地图定位增加子线程回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-09 21:03:02 +08:00
aibingbing
39e0d7514d refactor: 视频播放抽取公共; 2023-03-09 19:20:27 +08:00
yangyakun
b2d6f32357 [m1]
[1.1.2]
[倒计时、结束订单tts]
2023-03-09 19:19:06 +08:00
lixiaopeng
77cf5cf499 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-09 17:05:54 +08:00
lixiaopeng
101da8fb45 [dev_arch_opt_3.0] 优化显示 2023-03-09 17:05:46 +08:00
chenfufeng
eec59ece65 [Opt3.0]解决下新的订单导致轨迹画线的问题 2023-03-09 16:37:47 +08:00
chenfufeng
bebcddee31 [Opt3.0]内部封装TTS在主线程中调用 2023-03-09 16:27:28 +08:00
chenfufeng
0349a4925a [Opt3.0]解决下新的订单导致轨迹画线的问题 2023-03-09 16:27:28 +08:00
zhongchao
cda9ec32b5 [2.13.0-arch-opt] reset color of jiangshiche 2023-03-09 16:04:49 +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
06d64f5fe8 [m1]调整运营消息显示Logo 2023-03-09 14:13:49 +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