Commit Graph

3348 Commits

Author SHA1 Message Date
wangcongtao
5dc2bafac6 1. 目的地车友白天模式2 2020-09-24 20:01:20 +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
wangcongtao
09a6360ab2 Merge remote-tracking branch 'origin/dev' into dev 2020-09-23 15:07:43 +08:00
liujing
e7f943ef6c Merge branch 'cc' into dev 2020-09-23 15:04:10 +08:00
liujing
7bc5ac558c 删除无用引用 2020-09-23 15:03:45 +08:00
liujing
cc72ef0ca5 Merge branch 'cc' into dev 2020-09-23 14:55:30 +08:00
liujing
e2b7a082fa [add] v2x引用字段复制迁移 2020-09-23 14:55:15 +08:00
wangcongtao
9b8695b96f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
2020-09-23 14:06:55 +08:00
wangcongtao
a5b450f765 导航按钮 2020-09-23 14:05:13 +08:00
liujing
45bda30e06 删除无用资源 2020-09-23 12:57:13 +08:00
liujing
2cff7b38f1 ratingbar->commons 2020-09-23 11:44:16 +08:00
liujing
9976ecb8b1 添加弹框取消时间(默认0s) 2020-09-23 11:42:51 +08:00
liujing
7a0ba9e2c4 事件只展示不播报设置 2020-09-23 11:39:48 +08:00
liujing
48e2eafe8d 探路事件弹框迁移到v2x 2020-09-23 11:36:55 +08:00
liujing
083da0a7c1 ratingbar->commons 2020-09-23 11:35:37 +08:00
liujing
8dbc6b8b07 探路事件,取消本机与事件连线 2020-09-23 11:35:26 +08:00