Commit Graph

3362 Commits

Author SHA1 Message Date
tongchenfei
3929d4e00a 优化m4音乐框样式 2020-09-25 11:57:08 +08:00
lixiaopeng
2e11b2e568 fixed conflict 2020-09-25 11:55:01 +08:00
wangcongtao
865d53a421 1. 音乐浮窗和车聊聊浮窗优化
2. 点击地图车辆显示车聊聊用户信息
2020-09-25 11:36:05 +08:00
wangcongtao
d723ade861 Merge remote-tracking branch 'origin/dev' into dev 2020-09-25 11:16:18 +08:00
wangcongtao
3c8745ad8a 1. 高德导航引导按钮白天模式
2. 解决后台被杀后无法操作地图的问题
2020-09-25 11:15:35 +08:00
unknown
cea83f6f67 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-25 11:13:27 +08:00
unknown
b12416edd8 changed the sp_guide to module_common 2020-09-25 11:13:16 +08:00
liujing
985b191898 Merge branch 'vo' into dev 2020-09-25 10:39:30 +08:00
liujing
89f715d6f4 反注册语音 2020-09-25 10:39:15 +08:00
unknown
f9183115cb remove deviceUtil 2020-09-24 20:04:28 +08:00
unknown
b61e5903aa fix bug 2020-09-24 20:03:54 +08:00
unknown
084dc4a674 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-24 20:02:04 +08:00
unknown
7803709366 merge 2020-09-24 20:01:51 +08:00
wangcongtao
5dc2bafac6 1. 目的地车友白天模式2 2020-09-24 20:01:20 +08:00
unknown
94fab70704 fix bug 2020-09-24 19:58:22 +08:00
wangcongtao
cb1c4461f9 Merge remote-tracking branch 'origin/dev' into dev 2020-09-24 19:30:55 +08:00
wangcongtao
bb38606c13 1. 目的地车友白天模式 2020-09-24 19:30:49 +08:00
liujing
3ff803316a Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-24 18:04:42 +08:00
liujing
86948f0174 Merge branch 'hea' into dev 2020-09-24 18:04:16 +08:00
lixiaopeng
3fbcfde8f4 opt 2020-09-24 18:04:16 +08:00
liujing
94c1db755b 接收求助消息弹框-查看车辆信息 2020-09-24 18:04:02 +08:00
liujing
4ffd233d74 Merge branch 'hea' into dev 2020-09-24 17:40:54 +08:00
liujing
d511259efd 道路事件弹框-语音唤起车辆信息 2020-09-24 17:40:50 +08:00
liujing
220612e72a Merge branch 'hea' into dev 2020-09-24 17:22:42 +08:00
liujing
b780400cd6 道路事件弹框头像点击事件 2020-09-24 17:22:22 +08:00
wangcongtao
bc8899574d 1. 更新依赖passportapk 服务的sdk,主要解决anr问题 2020-09-24 17:14:52 +08:00
wangcongtao
d33741db28 1. 车聊聊电话和音乐浮窗的互斥
2. 添加模块资源释放回调
2020-09-24 16:59:17 +08:00
wangcongtao
87bc02aeda Merge remote-tracking branch 'origin/dev' into dev 2020-09-24 15:10:48 +08:00
wangcongtao
b993d77be1 目的地车友白天模式及其他 2020-09-24 15:10:41 +08:00
unknown
7d2c709d35 fix bug 2020-09-24 14:57:26 +08:00
unknown
4fd18e7644 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-24 14:54:26 +08:00
unknown
a8a415bae6 update mogo-common to 2.0.2 2020-09-24 14:54:03 +08:00
unknown
a6e1824258 add context Holder and remove guide condition 2020-09-24 14:29:13 +08:00
liujing
da75a24287 Merge branch 'cv' into dev 2020-09-24 11:48:16 +08:00
liujing
dc5f8019b6 透明值修改70% 2020-09-24 11:47:55 +08:00
董宏宇
99f646a8e1 增加了面板间的互斥 2020-09-24 11:19:28 +08:00
unknown
5cb983ce8e Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-23 21:22:34 +08:00
unknown
47140a098d update callchat 2020-09-23 21:22:12 +08:00
liujing
cddb3f8e43 Merge branch 'lo' into dev 2020-09-23 19:28:52 +08:00
liujing
1989ea703c loading迁移common 2020-09-23 19:28:32 +08:00
unknown
b50a20c0ac Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-23 17:39:28 +08:00
unknown
ad9339ca5d update callchat 2020-09-23 17:39:13 +08:00
wangcongtao
044edc9e58 Merge remote-tracking branch 'origin/dev' into dev 2020-09-23 17:39:05 +08:00
wangcongtao
cdfa224fc2 整理项目模块依赖,并上传2.0.0版本到maven 2020-09-23 17:38:59 +08:00
lixiaopeng
6e3a4be99c opt upload 2020-09-23 16:39:25 +08:00
lixiaopeng
7d8abea1ea opt 2020-09-23 16:23:21 +08:00
wangcongtao
3b5c77494f Merge remote-tracking branch 'origin/dev' into dev 2020-09-23 16:19:39 +08:00
wangcongtao
78b9f54ca8 1.1.6需求 2020-09-23 16:19:34 +08:00
liujing
4e2f2761c4 Merge branch 'cc' into dev 2020-09-23 15:21:36 +08:00
liujing
513d90d905 删除无用代码 2020-09-23 15:21:27 +08:00