Commit Graph

89 Commits

Author SHA1 Message Date
董宏宇
17052d869c 「修复」
合并冲突
2020-08-04 15:03:07 +08:00
董宏宇
a0fac7cb75 Merge branch 'qa_1.1' into dev
# Conflicts:
#	app/functions/eventpanel.gradle
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
2020-08-04 14:57:25 +08:00
董宏宇
0b2e3ee690 「修复」
其它车主求助的tts播报下沉到了广播给ADAS的模块中
2020-08-04 14:33:18 +08:00
董宏宇
dce0487f35 Merge branch 'qa_1.1' into dev_1.1.2 2020-07-30 15:08:15 +08:00
董宏宇
fd9e96e510 增加了疲劳驾驶和道路求助的布局优化 2020-07-30 15:07:29 +08:00
董宏宇
2d731b6a99 Merge branch 'dev' into dev_1.1.2 2020-07-30 14:31:49 +08:00
董宏宇
08ca140c6f 完成了他人故障求助的展示逻辑统一 2020-07-30 14:31:12 +08:00
wangcongtao
b437e2d1fd Merge branch 'qa_byd' into dev 2020-07-30 11:05:04 +08:00
wangcongtao
0bfa7ea746 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-30 10:08:34 +08:00
董宏宇
35bcb452d9 先关闭了数据库存储 2020-07-29 20:37:53 +08:00
董宏宇
e7e5c8925d 重命名视图名称 2020-07-29 20:34:22 +08:00
董宏宇
d3418e8681 增加了测试数据 2020-07-29 19:53:32 +08:00
董宏宇
c8ff5e7d3e 完成了疲劳驾驶的展示移植 2020-07-29 19:49:26 +08:00
董宏宇
28ca04dcc6 Merge branch 'qa_byd' into dev 2020-07-29 17:18:36 +08:00
董宏宇
fd189e3373 关闭了V2X测试面板 2020-07-29 17:18:04 +08:00
wangcongtao
462b17c12b bugfix: UI-884 2020-07-29 16:41:10 +08:00
董宏宇
7e764274bd Merge branch 'dev_1.1.2' into dev 2020-07-29 12:00:01 +08:00
董宏宇
3bf56ce39d Merge branch 'qa_byd' into qa_1.1 2020-07-29 11:58:50 +08:00
董宏宇
3926e38c86 完成违章停车的展示方式修改,换成了V2XRoadEventAdapter.java加载的方式 2020-07-29 11:52:59 +08:00
wangcongtao
839eab0eaf 1. 修复导航中无法正确切换车头和正北标识的问题
2. v2x 疲劳驾驶场景无法导航问题。
2020-07-28 20:44:17 +08:00
董宏宇
34f1229637 修复展示头像bug 2020-07-28 20:27:34 +08:00
董宏宇
2c43807cf7 修复展示头像bug 2020-07-28 20:20:53 +08:00
董宏宇
3c360151ed 整合了推送消息的展示到统一的V2XRoadEventAdapter.java
修复了测试推送的展示
2020-07-28 20:19:47 +08:00
董宏宇
e6938e60ea Merge branch 'qa_1.1' into dev_1.1.2 2020-07-28 19:28:31 +08:00
董宏宇
3ab54e0c80 Merge branch 'dev' into qa_1.1 2020-07-28 19:28:18 +08:00
董宏宇
b8de235aa7 Merge branch 'qa_byd' into dev 2020-07-28 19:28:01 +08:00
董宏宇
d2f556e58f 修改疲劳驾驶以及故障求助的文字大小适配其它机型 2020-07-28 19:27:48 +08:00
董宏宇
99989ed299 Merge branch 'qa_1.1' into dev_1.1.2 2020-07-28 18:44:11 +08:00
董宏宇
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
董宏宇
79d9b0efa4 Merge branch 'qa_1.1' into dev_1.1.2 2020-07-28 17:18:03 +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
董宏宇
8c34cecf34 删除测试数据 2020-07-28 17:11:30 +08:00
董宏宇
9ba52ceac4 Merge branch 'dev' into dev_1.1.2 2020-07-28 16:48:47 +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
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
董宏宇
6f80ae883b 只有自研车机才有疲劳驾驶功能 2020-07-28 10:24:05 +08:00
董宏宇
1a40db415c 增加了事件处理时间 2020-07-28 10:20:42 +08:00
董宏宇
15de3329db 修改测试按钮样式 2020-07-27 16:41:31 +08:00
董宏宇
68a9eb22ae 增加了事件播报的清除功能 2020-07-27 16:22:15 +08:00