Commit Graph

5174 Commits

Author SHA1 Message Date
wujifei
402002bc7f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 19:19:04 +08:00
wujifei
842aaf41d0 new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 17:58:00 +08:00
wujifei
7d0562ecd7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
2020-12-30 17:52:00 +08:00
wujifei
f80af8c3cf new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 17:47:33 +08:00
lixiaopeng
3d223d1fd8 add voice control 2020-12-30 17:40:02 +08:00
lixiaopeng
2e8a0ec17f opt 2020-12-30 17:20:55 +08:00
tongchenfei
b83bfb0436 Merge branch 'dev_1.1.9' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.9 2020-12-30 17:12:17 +08:00
tongchenfei
11fb2d54e5 http dns noop 直接返回传入的host 2020-12-30 17:12:09 +08:00
董宏宇
c6933e9560 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 16:39:26 +08:00
董宏宇
0af53e2bb4 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 16:38:42 +08:00
董宏宇
386b903378 准备开始编写
基于目的地违章高发情况的停车推荐
2020-12-30 16:38:37 +08:00
tongchenfei
be237dd323 将http dns替换成noop实现 2020-12-30 16:36:28 +08:00
liujing
8c63ef9725 Merge branch 'lk' into qa_merge_shunyi_vr_map 2020-12-30 16:30:45 +08:00
liujing
c34291d4cf vr模式隐藏ugc 2020-12-30 16:30:26 +08:00
tongchenfei
5d5a4be8bf Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 16:27:29 +08:00
tongchenfei
e721fe426e 1. 修复其他机型上因vr模式导致界面异常
2. 将http dns替换成noop实现
2020-12-30 16:25:26 +08:00
liujing
bf9da4aa1c Merge branch 'vr' into qa_merge_shunyi_vr_map 2020-12-30 16:24:10 +08:00
liujing
e5c88cce3f no message 2020-12-30 16:23:46 +08:00
liujing
e845f0fa97 Merge branch 'vr' into qa_merge_shunyi_vr_map 2020-12-30 16:21:32 +08:00
liujing
61bc847596 vr模式隐藏ugc功能 2020-12-30 16:21:05 +08:00
董宏宇
3adee83a90 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 16:12:26 +08:00
董宏宇
3f1871cbeb Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 16:12:07 +08:00
wangcongtao
5ed38ad254 opt 2020-12-30 16:08:33 +08:00
wangcongtao
d159c8c276 地图初始化完成后在尝试修改地图样式 2020-12-30 15:28:24 +08:00
wangcongtao
0f4c9fd7a2 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 15:25:39 +08:00
wangcongtao
52684abcb9 地图初始化完成后在尝试修改地图样式 2020-12-30 15:25:32 +08:00
wangcongtao
c7b9d48d9a Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:54:01 +08:00
wangcongtao
a329707c08 vr模式下拦截某些操作 2020-12-30 14:51:08 +08:00
董宏宇
1030ee644b Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:45:28 +08:00
董宏宇
fd1f539d03 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 14:45:18 +08:00
wangcongtao
6f16239630 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:43:37 +08:00
董宏宇
d67f723d30 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-30 14:43:31 +08:00
董宏宇
b5e2ee25a4 opt 2020-12-30 14:43:23 +08:00
wangcongtao
1dd0758192 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-30 14:38:14 +08:00
wangcongtao
f5941daf94 bugfix 2020-12-30 14:37:14 +08:00
liujing
eff01b24fb [add] 贝塞尔曲线动画window层添加 2020-12-30 14:30:52 +08:00
董宏宇
9b898e9497 opt 2020-12-30 14:21:33 +08:00
wangcongtao
7f540a14d8 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-30 14:12:36 +08:00
wangcongtao
a7181b0598 bugfix 2020-12-30 14:12:28 +08:00
liujing
c57e234aa9 Merge branch 'fi' into qa_merge_shunyi_vr_map 2020-12-30 13:07:15 +08:00
liujing
6ac489f561 [fix] UI 2020-12-30 13:06:55 +08:00
wangcongtao
fb91d54621 vr切换到2d时保存地图的样式状态 2020-12-30 10:36:07 +08:00
wangcongtao
93cbb89ce8 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-30 10:35:24 +08:00
wangcongtao
437e99827c vr切换到2d时保存地图的样式状态 2020-12-30 10:35:17 +08:00
wujifei
cac40cbaa7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-29 21:00:11 +08:00
wujifei
d352e5ee1f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-29 20:59:49 +08:00
董宏宇
4148a2e158 Merge branch 'dev_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-29 20:02:48 +08:00
董宏宇
01afc151d9 增加了api说明 2020-12-29 19:50:33 +08:00
lixiaopeng
1111e61f2f opt 2020-12-29 19:27:21 +08:00
unknown
ce9d50a16b Merge branch 'qa_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_merge_shunyi_vr_map 2020-12-29 19:21:14 +08:00