Commit Graph

4258 Commits

Author SHA1 Message Date
wangcongtao
7ff66bf9f9 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 15:33:48 +08:00
wangcongtao
15c92b9226 解决车聊聊卸载后,语音唤醒导致的问题 2020-12-01 15:33:39 +08:00
董宏宇
dae7cc8c1d Merge branch 'dev' into qa_1.1.8 2020-12-01 15:19:30 +08:00
wangcongtao
5917993249 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 15:15:44 +08:00
wangcongtao
676cd58852 解决语音sdk注销时的异常 2020-12-01 15:15:13 +08:00
liujing
f2b6e920a4 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:14:22 +08:00
liujing
e1f4d353ec Merge branch 'hh' into qa_1.1.8 2020-12-01 15:13:54 +08:00
liujing
add563af69 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:13:30 +08:00
董宏宇
17478da011 Merge branch 'qa_1.1.8' into dev
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
2020-12-01 14:53:19 +08:00
董宏宇
e7d84bdc5d Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 14:45:22 +08:00
董宏宇
daaf2fe35c 修复了周边道路事件数量播报错误问题 2020-12-01 14:45:14 +08:00
wujifei
55703f36df Merge remote-tracking branch 'origin/dev' into dev 2020-12-01 14:44:42 +08:00
wujifei
6c38bae9fb new#适配车队相关页面白天模式 2020-12-01 14:44:23 +08:00
liujing
c440b444db [fix]d m-出行动态导航图片资源替换 2020-12-01 14:35:54 +08:00
liujing
baeea67314 [fix]d m-出行动态导航图片资源替换 2020-12-01 14:35:35 +08:00
unknown
71a2242ee4 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-01 14:27:38 +08:00
unknown
61c897fd90 fix UI and update callchat 2020-12-01 14:27:14 +08:00
wangcongtao
b2c2c0ba05 opt2 2020-12-01 11:22:27 +08:00
unknown
13497c819f Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-01 11:10:08 +08:00
unknown
bb85b86bdd update callchat 2020-12-01 11:09:55 +08:00
wangcongtao
a4ee99ffef Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 11:09:31 +08:00
wangcongtao
f1bb54ad5c opt 2020-12-01 11:09:24 +08:00
liujing
6fc2cd81aa [add] D 下添加事件面板more按钮 2020-12-01 10:50:14 +08:00
liujing
d30211aa1c [add] D 下添加事件面板more按钮 2020-12-01 10:49:51 +08:00
liujing
29ce6687a0 no message 2020-12-01 10:40:07 +08:00
liujing
95cff9dced no message 2020-12-01 10:39:48 +08:00
liujing
690706fa2d ui-去分享 2020-12-01 10:38:01 +08:00
liujing
56d42dd6a8 Merge branch 'bn' into qa_1.1.8 2020-12-01 10:37:44 +08:00
liujing
bd9b13a5b9 ui-去分享 2020-12-01 10:37:21 +08:00
wangcongtao
4ca8e4e053 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 10:04:27 +08:00
wangcongtao
2b84ca6b36 解决对象重复创建的问题 2020-12-01 10:04:21 +08:00
unknown
5abf15ccb0 update callchat 2020-12-01 10:00:04 +08:00
unknown
7a48592b0c Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-11-30 21:59:19 +08:00
unknown
b455954976 fix bug 2020-11-30 21:57:33 +08:00
liujing
884586ce35 ui-分享列表 2020-11-30 21:14:12 +08:00
liujing
57376bce28 no message 2020-11-30 21:13:26 +08:00
liujing
87af922ac8 Merge branch 'mm' into qa_1.1.8 2020-11-30 21:11:51 +08:00
liujing
0f9fc1adbd ui-分享列表 2020-11-30 21:11:31 +08:00
liujing
d293b21d2d UI 2020-11-30 20:21:13 +08:00
liujing
d66b0e86b7 Merge branch 'bb' into qa_1.1.8 2020-11-30 20:20:32 +08:00
liujing
0a9040ea4d UI 2020-11-30 20:20:13 +08:00
unknown
a98eb4aecd Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-11-30 20:14:07 +08:00
unknown
91cb2891cb fix bug 2020-11-30 20:13:49 +08:00
董宏宇
c94894729d Merge branch 'qa_1.1.8' into dev
# Conflicts:
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
2020-11-30 20:11:19 +08:00
董宏宇
18c31db124 修复bug 2020-11-30 20:10:14 +08:00
wangcongtao
b472860888 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-30 18:12:08 +08:00
wangcongtao
19e646415e bugfix 2020-11-30 18:12:00 +08:00
董宏宇
6b58a86040 去掉限制 2020-11-30 18:02:43 +08:00
liujing
c232935eb5 分享按钮点击色值 2020-11-30 18:01:32 +08:00
liujing
5323d63652 分享按钮点击色值 2020-11-30 18:01:11 +08:00