Commit Graph

4918 Commits

Author SHA1 Message Date
董宏宇
e2abb2fba4 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 19:25:29 +08:00
董宏宇
1c4c7faa81 完成了小地图 2020-12-16 19:25:17 +08:00
tongchenfei
886ba900cc Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 18:27:09 +08:00
tongchenfei
4231f006c1 合并大唐高鸿obu,增加debug入口,去掉了vrMode按钮入口 2020-12-16 18:27:02 +08:00
董宏宇
aed0063417 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 17:41:16 +08:00
lixiaopeng
577d24d767 opt 2020-12-16 17:26:13 +08:00
lixiaopeng
789f157f22 opt 2020-12-16 17:06:11 +08:00
董宏宇
aa24622709 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 16:03:48 +08:00
lixiaopeng
5817c62a2e opt 2020-12-16 15:57:15 +08:00
董宏宇
d410b10869 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 15:15:38 +08:00
tongchenfei
111ac63e38 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 15:10:05 +08:00
tongchenfei
bf9cf9fb33 调整左上角红绿灯展示,暂无车道数据 2020-12-16 15:09:55 +08:00
wangcongtao
bb85ba8cd1 marker infowindow的点击实现 2020-12-16 14:53:41 +08:00
wangcongtao
22d1f8f214 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 14:44:20 +08:00
wangcongtao
0442cc436a marker在vr模式下的立体效果实现 2020-12-16 14:44:01 +08:00
董宏宇
0ab1e7fa25 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-16 14:06:10 +08:00
lixiaopeng
70e9e155b0 opg 2020-12-16 11:23:31 +08:00
wangcongtao
47056c97a1 opt 2020-12-15 21:18:08 +08:00
董宏宇
157deeaa32 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-15 20:58:40 +08:00
董宏宇
c9768ebebc 尝试使用
http://blog.yeyanxiang.cn/Android/notes/android/surfaceview-corner/
解决地图圆形问题,但是失败
2020-12-15 20:58:35 +08:00
lixiaopeng
a5c9e76a88 opt 2020-12-15 20:24:14 +08:00
董宏宇
dd8584494f 解决了模拟环境推送tts Bug
http://h5service.zhidaohulian.com/v2x_remoteControl/#/
2020-12-15 20:23:47 +08:00
董宏宇
38196aa667 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-15 20:16:52 +08:00
wangcongtao
96f8ce7be2 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-15 19:45:40 +08:00
wangcongtao
356a060ca7 opt 2020-12-15 19:45:35 +08:00
董宏宇
f26b8df838 高德地图的小地图无法加载问题 2020-12-15 10:24:31 +08:00
董宏宇
7da4d64630 增加了自研地图填充小地图,但是圆形失效 2020-12-14 21:06:25 +08:00
董宏宇
a37be1a64a Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-14 20:16:28 +08:00
董宏宇
6d2d0275fb 增加了罗盘的旋转动画 2020-12-14 20:16:24 +08:00
wangcongtao
8a9a92987d Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-14 20:09:26 +08:00
wangcongtao
9489ec6dbd opt 2020-12-14 20:08:53 +08:00
liujing
fa79a43712 Merge branch 'nb' into dev_merge_shunyi_vr_map 2020-12-14 19:39:46 +08:00
liujing
cc034645d0 [add] 动画图片+渐变背景图 2020-12-14 19:39:29 +08:00
wangcongtao
63daee6eb0 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-12-14 19:19:21 +08:00
wangcongtao
578a5fc383 opt 2020-12-14 19:16:40 +08:00
lixiaopeng
fa15365229 opt 2020-12-14 18:41:40 +08:00
董宏宇
d03280c1d2 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-14 18:35:54 +08:00
董宏宇
0aed6c0301 完成基础的角度修改 2020-12-14 18:35:49 +08:00
tongchenfei
5b95fed42f 优化视频播放弹窗 2020-12-14 18:35:36 +08:00
tongchenfei
7f7be0f182 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-14 17:48:35 +08:00
tongchenfei
dc503f7f4d 导航界面普通模式和vr模式兼容 2020-12-14 17:48:28 +08:00
liujing
96f484da42 Merge branch 'lk' into dev_merge_shunyi_vr_map 2020-12-14 17:42:09 +08:00
liujing
333e93e54a [fix]偶现崩溃 2020-12-14 17:41:48 +08:00
tongchenfei
41fc698cc6 opt 2020-12-14 16:27:08 +08:00
tongchenfei
854e2523bb Merge branch 'dev_merge_shunyi_vr_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-14 16:11:38 +08:00
tongchenfei
fb36b33215 解决topView内存泄漏问题 2020-12-14 16:04:55 +08:00
lixiaopeng
1bbf312f1b opt 2020-12-14 15:37:06 +08:00
lixiaopeng
feac7a579d opt 2020-12-14 15:37:06 +08:00
liujing
63292f65df Merge branch 'hj' into dev_merge_shunyi_vr_map 2020-12-14 15:06:53 +08:00
liujing
84c9e50550 事件弹框margin_top 2020-12-14 15:06:41 +08:00