Commit Graph

1562 Commits

Author SHA1 Message Date
董宏宇
421a4bde57 Merge branch 'dev' into qa_1.1 2020-07-28 18:43:55 +08:00
董宏宇
c5fd368986 Merge branch 'qa_byd' into dev 2020-07-28 18:43:40 +08:00
董宏宇
203b37c39c 修改了字体 2020-07-28 18:10:21 +08:00
董宏宇
3511f44ff8 Merge branch 'dev' into qa_1.1 2020-07-28 17:16:55 +08:00
董宏宇
9fee24af60 Merge branch 'qa_byd' into dev 2020-07-28 17:16:37 +08:00
董宏宇
26d975c39e 修复launcher未启动的时候道路数据统计问题 2020-07-28 17:15:21 +08:00
董宏宇
7c488c28ef Merge branch 'dev' into qa_1.1 2020-07-28 16:48:30 +08:00
董宏宇
4743f3ecae Merge branch 'qa_byd' into dev 2020-07-28 16:47:34 +08:00
董宏宇
96bc3ba8a4 修复部分UI样式 2020-07-28 16:38:59 +08:00
董宏宇
22a5f53fe3 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-28 15:51:55 +08:00
董宏宇
fa7a01e1d7 修复部分UI样式 2020-07-28 15:51:51 +08:00
unknown
b17b2b2019 replace the illegal parking png 2020-07-28 15:28:46 +08:00
unknown
76e79095b2 replace png 2020-07-28 15:08:48 +08:00
tongchenfei
ddbfe0ce9c Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-28 14:04:13 +08:00
wangcongtao
b3f55b9128 Merge branch 'qa_byd' into dev 2020-07-28 12:29:44 +08:00
wangcongtao
4afaeb7407 疲劳驾驶导航监听。 2020-07-28 12:29:19 +08:00
tongchenfei
77fff248a4 ui fix 2020-07-28 11:49:58 +08:00
董宏宇
6f80ae883b 只有自研车机才有疲劳驾驶功能 2020-07-28 10:24:05 +08:00
unknown
ef4efc3f32 fix bug of UI 2020-07-28 09:50:09 +08:00
unknown
a689060eb7 fix bug of UI 2020-07-28 09:43:18 +08:00
tongchenfei
53a49ec003 ui fix 2020-07-27 19:03:24 +08:00
tongchenfei
b01bd168c8 ui fix 2020-07-27 19:00:39 +08:00
tongchenfei
fe80c294a1 ui fix 2020-07-27 17:27:18 +08:00
wangcongtao
2c46318d22 Merge branch 'qa_byd' into dev 2020-07-27 17:22:24 +08:00
unknown
ac3c627348 fix bug of dialog dimiss 2020-07-27 14:57:56 +08:00
董宏宇
6511ed6df5 Merge branch 'dev' into dev_1.1 2020-07-27 14:40:16 +08:00
wangcongtao
972f2a83eb Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-27 14:34:58 +08:00
wangcongtao
b30f7f0bb3 适配地图设置在E系列上的显示问题 2020-07-27 14:34:19 +08:00
董宏宇
c03943a72f 关闭了V2X测试页面 2020-07-27 14:22:35 +08:00
董宏宇
922200d7e1 Merge branch 'dev' into dev_1.1 2020-07-27 12:34:42 +08:00
unknown
006c8137df Merge branch 'qa_byd' into dev 2020-07-27 11:28:03 +08:00
董宏宇
a6399aa4a6 优化ADAS的tts播报,以及道路事件下发的存储 2020-07-27 11:09:43 +08:00
董宏宇
5cc0fb86a4 Merge branch 'dev' into dev_1.1 2020-07-27 10:35:34 +08:00
董宏宇
773e3c3bfe 调整顺序 2020-07-27 10:34:50 +08:00
unknown
390698af84 Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-24 18:43:42 +08:00
unknown
bd2d25d105 Merge branch 'qa_byd_res' into qa_byd 2020-07-24 18:43:24 +08:00
unknown
ffe41f8bc4 replace res 2020-07-24 18:43:12 +08:00
wangcongtao
87b3a73f71 Merge branch 'qa_byd' into dev 2020-07-24 16:49:46 +08:00
wangcongtao
84be8d1edd Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-24 16:49:11 +08:00
wangcongtao
3aeb4a6d92 bugfix: UI-867 2020-07-24 16:45:08 +08:00
unknown
52a08c99d7 Merge branch 'qa_byd_res' into qa_byd 2020-07-24 15:01:14 +08:00
unknown
94b4730666 res grand 2020-07-24 14:59:57 +08:00
董宏宇
9355bb1989 Merge branch 'dev' into dev_1.1
# Conflicts:
#	gradle.properties
2020-07-24 14:54:38 +08:00
董宏宇
a28cab1e68 Merge branch 'qa_byd' into dev 2020-07-24 14:31:50 +08:00
董宏宇
3117b023ea 升级直播sdk版本 2020-07-24 14:24:05 +08:00
unknown
6c38eb8372 Merge branch 'qa_byd' into qa_byd_res 2020-07-24 14:17:36 +08:00
wangcongtao
ee2c3b92fc Merge branch 'qa_byd' into dev 2020-07-24 11:43:42 +08:00
wangcongtao
25f8b86bc0 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-24 11:40:03 +08:00
wangcongtao
70074c5f87 更新passport版本,分发onMapLoaded事件 2020-07-24 11:39:44 +08:00
董宏宇
5ede6e4266 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-24 11:39:02 +08:00