Commit Graph

3981 Commits

Author SHA1 Message Date
lixiaopeng
b34f0cf907 opt 2020-11-23 17:11:33 +08:00
董宏宇
3c5b3bf21b Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 17:10:31 +08:00
董宏宇
673abf4fc8 修复语音小智也走主页面的生命周期,导致会关闭EventPanel的问题 2020-11-23 17:10:21 +08:00
liujing
979b5c2805 Merge branch 'like_' into dev 2020-11-23 17:05:56 +08:00
liujing
9d5fc0f33e 分享色值-点击状态修改 2020-11-23 17:05:39 +08:00
liujing
8aa6d9236a 分享按钮色值修改 2020-11-23 16:46:02 +08:00
liujing
beb429d3af [add] 心形资源替换-事件面板适配新UI 2020-11-23 16:42:00 +08:00
liujing
6eb97f55e7 Merge branch 'gh' into dev 2020-11-23 15:46:20 +08:00
liujing
b0491943cb tts-打开事件面板联调 2020-11-23 15:46:07 +08:00
tongchenfei
f37439aefc 优化1.1.8自车图标尺寸 2020-11-23 14:06:08 +08:00
tongchenfei
d833025bd8 优化1.1.8自车图标ui 2020-11-23 11:48:29 +08:00
liujing
2356a760ad Merge branch 'gh' into dev 2020-11-23 10:28:59 +08:00
liujing
35b6feb349 tts播报-唤醒查询事件面板内容 2020-11-23 10:28:50 +08:00
zhuangyan
f6d83c7f11 Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 18:52:43 +08:00
zhuangyan
24b67af057 移动light图片位置到skin modle 2020-11-20 18:52:36 +08:00
wangcongtao
cd37051d1d 优化模块依赖 2020-11-20 17:42:37 +08:00
wangcongtao
832d87ec4b Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 16:25:34 +08:00
wangcongtao
dbf6a6a95a 1. 小智动画切换逻辑修改
2. 独立app卡片刷新次数限制
3. 其他优化
2020-11-20 16:25:21 +08:00
lixiaopeng
9fc4cd3cba opt 2020-11-20 16:02:57 +08:00
liujing
06a54758ab Revert "[add] 爱心图片替换-差红桃心"
This reverts commit a512b5977d.
2020-11-20 16:01:17 +08:00
liujing
e63534210c Merge branch 'kj' into dev 2020-11-20 16:00:29 +08:00
liujing
69eca19bc0 [add] 白天模式图片资源 2020-11-20 16:00:09 +08:00
tongchenfei
f5a5dc4f03 Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 15:33:45 +08:00
tongchenfei
20e57bb118 opt ui 2020-11-20 15:33:33 +08:00
wangcongtao
f40f4fba9a Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 15:25:19 +08:00
董宏宇
8783d55a1b 修复关闭车聊聊时候异常,
carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, null);
需要钟超修改下
2020-11-20 15:19:34 +08:00
liujing
94d34957ee Merge branch 'kj' into dev 2020-11-20 14:21:20 +08:00
liujing
e7061f54dd 1.disttance 间距
2.打电话按钮先隐藏,避免出现闪现
2020-11-20 14:21:16 +08:00
liujing
0ebc2f5d42 Merge branch 'kj' into dev 2020-11-20 14:09:44 +08:00
liujing
a512b5977d [add] 爱心图片替换-差红桃心 2020-11-20 14:09:25 +08:00
lixiaopeng
32ff2cf6b3 merger 2020-11-20 12:28:23 +08:00
lixiaopeng
81ca0b9467 opt 2020-11-20 12:18:50 +08:00
tongchenfei
532402147c Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 11:59:49 +08:00
tongchenfei
c7a8a72180 opt 1+16 浮层布局层级 2020-11-20 11:59:35 +08:00
zhuangyan
a3cd9f3292 Merge remote-tracking branch 'origin/dev' into dev 2020-11-20 11:29:17 +08:00
zhuangyan
764c400d0f 修改疲劳驾驶的停车场推荐图片显示 2020-11-20 11:28:57 +08:00
董宏宇
2470596a35 对M1低配车机增加了限制
// 不展示打电话按钮
// 不能查看用户详情
// 不展示UGC问答
2020-11-20 11:28:03 +08:00
wangcongtao
bebcf9faf9 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
2020-11-20 09:53:42 +08:00
tongchenfei
86eba35ebf 1. 分享按钮适配1+16
2. topView蒙层适配
2020-11-19 21:00:34 +08:00
tongchenfei
68a8492495 Merge remote-tracking branch 'origin/dev' into dev 2020-11-19 18:11:44 +08:00
tongchenfei
92bc1bbebe 1. 与adas联调自车图标配置;
2. 修改自车动画实现位置;
2020-11-19 18:11:23 +08:00
liujing
1fc393e2a5 Merge branch 'jo' into dev 2020-11-19 18:08:46 +08:00
liujing
c4497b2d97 [add] 出行动态-导航+电话selector替换 2020-11-19 18:08:38 +08:00
liujing
9718c1b4a7 Merge branch 'jo' into dev 2020-11-19 17:50:08 +08:00
liujing
a49550b847 出行动态UI 2020-11-19 17:49:58 +08:00
zhuangyan
6a65e87be0 修改f/m 导航 周边事件 目的车友UI 2020-11-19 17:13:09 +08:00
unknown
3019fcd7e4 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-19 15:24:33 +08:00
unknown
d0a0c75a23 resolve conflict 2020-11-19 15:22:58 +08:00
董宏宇
249fc6b29c 删除了方向角比对 2020-11-19 14:56:52 +08:00
liujing
a2d93d3b71 Merge branch 'jo' into dev 2020-11-19 13:56:43 +08:00