Commit Graph

16867 Commits

Author SHA1 Message Date
董宏宇
40923afb16 「修复」
合并冲突
2020-08-04 15:12:19 +08:00
董宏宇
da3f3b3fd4 Merge branch 'dev' into dev_1.1.2
# Conflicts:
#	app/functions/eventpanel.gradle
2020-08-04 15:08:23 +08:00
董宏宇
7805ababac Merge remote-tracking branch 'origin/dev' into dev 2020-08-04 15:04:10 +08:00
董宏宇
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
wangcongtao
4bab2f4728 按home悬浮窗无法关闭历史消息的问题。 2020-08-04 14:49:25 +08:00
董宏宇
0b2e3ee690 「修复」
其它车主求助的tts播报下沉到了广播给ADAS的模块中
2020-08-04 14:33:18 +08:00
jiaguofeng
4a3df20539 fix drawline 2020-08-04 14:32:24 +08:00
wangcongtao
5294a6447b opt 2020-08-04 14:00:33 +08:00
wangcongtao
44ba910d97 过滤部分无效的地理编码和逆地理编码 2020-08-04 13:55:19 +08:00
wangcongtao
686480cf49 过滤部分无效的地理编码和逆地理编码 2020-08-04 13:54:30 +08:00
jiaguofeng
0b9af75838 fix drawline 2020-08-04 10:09:59 +08:00
wangcongtao
f0b38e9f2e 过滤部分无效的地理编码和逆地理编码 2020-08-04 09:58:47 +08:00
wangcongtao
16c659f87b Merge branch 'qa_1.1' into dev 2020-08-03 21:26:03 +08:00
wangcongtao
8d2d6f95f4 修改独立app页面销毁后部分监听没有注销的问题 2020-08-03 21:20:49 +08:00
wangcongtao
7f93590d8c 修改独立app页面销毁后部分监听没有注销的问题 2020-08-03 21:12:59 +08:00
董宏宇
013a3444a8 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
2020-08-03 20:07:19 +08:00
董宏宇
ff3ad48fc2 「优化」
优化了数据库存储
2020-08-03 20:06:51 +08:00
wangcongtao
4ce946dd8f Merge branch 'master' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher
# Conflicts:
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
2020-08-03 17:54:28 +08:00
lixiaopeng
b8f336a858 opt 2020-08-03 17:49:25 +08:00
lixiaopeng
c1b82b5427 upgrade tanlu lib version 2020-08-03 17:49:25 +08:00
wangcongtao
acab99693d Merge branch 'qa' 2020-08-03 17:27:28 +08:00
jiaguofeng
1dd4a74e67 build com.zhidaoauto.machine:map:1.0.0-j5 2020-08-03 17:16:34 +08:00
董宏宇
156f5f21a2 「修改」
替换了道路事件纠错的调用,不再使用小鹏的广播,而是直接调用API接口
/deva/poiInfoFabulous/car/poi/no/addPoiInfoFabulous/v1
2020-08-03 17:07:04 +08:00
jiaguofeng
21fde45ee7 Merge remote-tracking branch 'origin/dev_custom_map' into dev_custom_map
# Conflicts:
#	.idea/misc.xml
2020-08-03 16:09:25 +08:00
jiaguofeng
ea7c13c883 修改bug 2020-08-03 16:09:00 +08:00
董宏宇
71e653d444 统一Toast样式 2020-08-03 16:08:24 +08:00
董宏宇
9af784400d 优化历史V2X的展示列表 2020-08-03 16:03:17 +08:00
董宏宇
d6613dea7b 增加了事件面板provider 2020-08-03 15:46:21 +08:00
wangcongtao
c0ecce6a4e bugfix: E84XCD-140 2020-08-03 15:04:29 +08:00
董宏宇
8f0cdfa096 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-03 14:57:49 +08:00
董宏宇
06f097bd43 优化了V2X事件展示,以及历史列表中的展示样式 2020-08-03 14:57:45 +08:00
liujing
91077b5176 Merge branch 'local' into dev_1.1.2 2020-08-03 14:54:36 +08:00
liujing
9688ccac87 [add] 我的分享接口类 2020-08-03 14:54:22 +08:00
wangcongtao
3bd8213ac2 Merge branch 'dev' into dev_custom_map 2020-08-03 14:23:02 +08:00
wangcongtao
f53337164c opt 2020-08-03 14:22:59 +08:00
liujing
68fdcfb544 Merge branch 'local' into dev_1.1.2 2020-08-03 11:43:51 +08:00
liujing
75c87c81a9 删除测试sn 2020-08-03 11:43:34 +08:00
wangcongtao
c5386dffed rm build dir 2020-08-03 11:32:51 +08:00
wangcongtao
4d4e3fb9ec opt 2020-08-03 11:32:22 +08:00
董宏宇
003443e41c Merge branch 'dev' into dev_1.1.2 2020-08-03 11:28:29 +08:00
董宏宇
a85078dd6e 删除了
mogo-module-event-panel
mogo-module-event-panel-noop
2020-08-03 11:28:04 +08:00
董宏宇
a33a46746a Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-03 11:13:25 +08:00
董宏宇
9c6d8d1165 增加 日志 2020-08-03 11:13:02 +08:00
wangcongtao
2f208636c8 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-03 11:10:44 +08:00
wangcongtao
b67c443818 merge 2020-08-03 11:09:09 +08:00
liujing
e0942c72ed Merge branch 'local' into dev_1.1.2 2020-08-03 11:07:35 +08:00
liujing
6f0c69fc3c rename,动画隐藏 2020-08-03 11:06:58 +08:00
tongchenfei
49fbbe905a 解决机器上未装酷我音乐导致的崩溃问题 2020-08-03 10:49:40 +08:00
wangcongtao
d31873526f Merge branch 'qa' into feature/qa_f 2020-08-03 10:02:30 +08:00