Commit Graph

5228 Commits

Author SHA1 Message Date
wangcongtao
e6600df3a3 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
2021-01-05 19:27:13 +08:00
wangcongtao
40afbccfcc 合并分支 2021-01-05 19:24:19 +08:00
unknown
8be440d6b2 proguard 2021-01-05 19:18:12 +08:00
wangcongtao
804fd1a7cf 更新车聊聊版本 2021-01-05 19:08:52 +08:00
wangcongtao
a1f3842985 升级地图sdk 2021-01-05 18:03:31 +08:00
wangcongtao
5d97189f2f 修改模块include 2021-01-05 17:52:31 +08:00
lixiaopeng
a8d6d0df81 opt 2021-01-05 11:34:43 +08:00
wangcongtao
e94036f85e 更新切换道路匹配测试逻辑调用方法 2021-01-05 11:14:30 +08:00
wangcongtao
1b061c938a Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 11:04:55 +08:00
wangcongtao
5cbb771469 添加切换道路匹配测试逻辑 2021-01-05 11:04:49 +08:00
unknown
50b7f00cdf .. 2021-01-05 10:51:49 +08:00
tongchenfei
6a9e2392ec Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 10:46:59 +08:00
unknown
100c40c325 add new proguard rules in smp 2021-01-05 10:46:16 +08:00
tongchenfei
52827bbfbb bugfix: #103 红绿灯不消失,修改成无数据后1s,红绿灯数据隐藏 2021-01-05 10:45:59 +08:00
wangcongtao
62c8dc6e87 更新地图sdk 2021-01-05 10:41:02 +08:00
unknown
ee9ff0c457 Merge branch 'dev_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.9 2021-01-05 10:11:49 +08:00
unknown
becc8b2ff5 add proguard 2021-01-05 10:11:00 +08:00
wangcongtao
198f3ec4ee 更新地图sdk 2021-01-04 20:07:31 +08:00
unknown
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
wangcongtao
be42e43529 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-04 14:37:56 +08:00
wangcongtao
6661db0e83 opt 2021-01-04 14:37:39 +08:00
liujing
16c9f41a4c Merge branch 'mu' into dev_1.1.9 2021-01-04 14:18:58 +08:00
liujing
2c30d98311 +目的地停车场推荐数据 2021-01-04 14:18:41 +08:00
liujing
b9d0578b75 Merge branch 'jk' into qa_merge_shunyi_vr_map 2020-12-31 19:11:03 +08:00
liujing
5c005e6db9 删除测试数据 2020-12-31 19:10:23 +08:00
wujifei
c16ad2bce4 new#修改编译错误 2020-12-31 18:55:58 +08:00
tongchenfei
19870759c3 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-31 18:22:40 +08:00
tongchenfei
4fc4f39c41 opt topview in vr mode 2020-12-31 18:22:33 +08:00
董宏宇
52c96e6873 降低了小地图视角高度 2020-12-31 18:17:48 +08:00
wujifei
796a69aa1f Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-31 18:08:13 +08:00
wujifei
50e87ec043 new#优化代码 2020-12-31 18:07:57 +08:00
董宏宇
b84c1c1c06 降低了小地图视角高度 2020-12-31 17:50:52 +08:00
董宏宇
606a8663c2 降低了小地图视角高度 2020-12-31 17:48:46 +08:00
wujifei
4f8f94f46f Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-31 17:24:24 +08:00
wujifei
67eff81529 new#优化代码 2020-12-31 17:24:03 +08:00
tongchenfei
1835c5070b Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-31 17:13:33 +08:00
tongchenfei
e270366602 1. opt ui
2. opt MapMarkerBaseView
2020-12-31 17:13:24 +08:00
董宏宇
cefd72e712 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 16:43:41 +08:00
董宏宇
d582bc3c41 将hook单独作为库引入 2020-12-31 16:43:05 +08:00
liujing
f9180a0785 Merge branch 'kk' into dev_1.1.9 2020-12-31 15:01:33 +08:00
liujing
868705abc2 +目的地推荐停车场类型 2020-12-31 15:01:12 +08:00
wujifei
2224f51f44 new#解决空指针 2020-12-31 14:48:20 +08:00
wujifei
56ea4b7d98 new#增加tts播报 2020-12-31 14:41:38 +08:00
董宏宇
789d983021 整理hook的注释 2020-12-31 11:41:19 +08:00
wangcongtao
90c95f6324 优化地图加载时机 2020-12-31 10:59:19 +08:00
董宏宇
9557606c03 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 10:08:36 +08:00
wujifei
b4deae290e new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 19:32:22 +08:00
wujifei
402002bc7f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 19:19:04 +08:00
wangcongtao
a588c7f22b 更新自研地图版本为1.0.0-vr-7.5.7 2020-12-30 18:04:55 +08:00
wangcongtao
eb3fd2eea8 将自动进入鹰眼模式的时间进行延时,避免和初始化的设置冲突 2020-12-30 17:59:03 +08:00