Commit Graph

2317 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
wangcongtao
f0b38e9f2e 过滤部分无效的地理编码和逆地理编码 2020-08-04 09:58:47 +08:00
wangcongtao
7f93590d8c 修改独立app页面销毁后部分监听没有注销的问题 2020-08-03 21:12:59 +08:00
tongchenfei
49fbbe905a 解决机器上未装酷我音乐导致的崩溃问题 2020-08-03 10:49:40 +08:00
tongchenfei
d859b0b4a5 Merge remote-tracking branch 'origin/dev' into dev 2020-07-31 19:53:30 +08:00
tongchenfei
1134e79371 集成日志抓取sdk 2020-07-31 19:52:57 +08:00
wangcongtao
d349675ad9 bugfix 2020-07-31 18:06:15 +08:00
wangcongtao
090fa1ada3 Merge branch 'feature/qa_f' into dev 2020-07-31 18:01:48 +08:00
wangcongtao
68ab0c30ea 按虚拟home键无法销毁消息列表的问题。 2020-07-31 17:58:26 +08:00
tongchenfei
a77a8db0d8 opt 2020-07-31 15:13:58 +08:00
wangcongtao
6a369d17df 1. 定位按钮加入设置地图中心点的功能。 2020-07-31 15:08:04 +08:00
wangcongtao
e16fff638c 将推送代码接入主工程 2020-07-31 13:22:26 +08:00
wangcongtao
5a2d3183c2 opt 2020-07-31 12:37:07 +08:00
wangcongtao
433d1db7d0 Merge branch 'feature/qa_f' into dev 2020-07-31 12:35:10 +08:00
wangcongtao
1bf436d826 1. 解决push推送相关问题。 2020-07-31 12:29:53 +08:00
wangcongtao
8f99e04a87 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-31 11:10:05 +08:00
wangcongtao
1153813221 融合高德广播和语音指令控制地图的逻辑 2020-07-31 11:09:45 +08:00
unknown
ad1d86b2d7 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-07-30 19:24:21 +08:00
unknown
5785b80d47 Merge branch 'qa_byd' into dev 2020-07-30 19:24:07 +08:00
wangcongtao
45bcbaf979 升级passport相关sdk、修改地图"继续导航"指令问题 2020-07-30 17:44:37 +08:00
wangcongtao
1a6def7798 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-30 16:08:40 +08:00
wangcongtao
754a17a31d Merge branch 'feature/qa_f' into dev 2020-07-30 16:07:48 +08:00
wangcongtao
70db00b5b5 Merge branch 'qa' into feature/qa_f 2020-07-30 16:07:16 +08:00
wangcongtao
fc9b41b1f3 bugfix 2020-07-30 16:05:40 +08:00
unknown
8c24c0003e Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-30 16:03:28 +08:00
unknown
49fb4ce107 .. 2020-07-30 16:03:13 +08:00
lixiaopeng
6fd41b9958 opt 2020-07-30 15:50:55 +08:00
tongchenfei
15147461a8 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 15:49:32 +08:00
tongchenfei
68443c043f bug fix 2020-07-30 15:48:58 +08:00
lixiaopeng
aef7a4aa82 opt 2020-07-30 15:35:44 +08:00
tongchenfei
3ed51c3947 bug fix 2020-07-30 15:26:46 +08:00
董宏宇
83971d24a2 关闭了事件面板的展示 2020-07-30 15:21:00 +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
unknown
fc28c7bd93 Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-30 12:02:39 +08:00
unknown
11c0980d35 close the proguard for now ,because can't find netty log4j proguard class 2020-07-30 12:02:20 +08:00
wangcongtao
b437e2d1fd Merge branch 'qa_byd' into dev 2020-07-30 11:05:04 +08:00
wangcongtao
895ee4c1f2 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 10:47:51 +08:00
unknown
1b2d06e3f1 add netty proguard 2020-07-30 10:47:34 +08:00
wangcongtao
ff1b3997bc Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 10:40:19 +08:00
wangcongtao
fc60688215 替换自车图标 2020-07-30 10:40:11 +08:00
unknown
e2ecaf0168 add proguard rules 2020-07-30 10:38:50 +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
董宏宇
16d1e5140a Merge branch 'dev' into dev_1.1.2 2020-07-29 20:34:50 +08:00
董宏宇
e7e5c8925d 重命名视图名称 2020-07-29 20:34:22 +08:00