Commit Graph

3389 Commits

Author SHA1 Message Date
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
董宏宇
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
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
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
84c9e50550 事件弹框margin_top 2020-12-14 15:06:41 +08:00
liujing
dbf76f50b6 [add] 违章停车 踩动画 2020-12-14 14:45:48 +08:00
wangcongtao
9db6d9e821 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-14 14:36:09 +08:00
wangcongtao
ce28a42ae7 opt 2020-12-14 14:35:04 +08:00
董宏宇
29cf9abc3c 完成小地图的容器绘制,地图还无法添加上去 2020-12-13 18:18:34 +08:00
lixiaopeng
f767acf274 opt 2020-12-13 16:02:03 +08:00
lixiaopeng
25dcae01cd add camera live 2020-12-13 15:26:29 +08:00
liujing
832ed39fcd [add] 直播框VR适配 2020-12-13 13:42:13 +08:00
董宏宇
bc861c6d68 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-13 11:43:55 +08:00
董宏宇
3f3dfdb1ac 解决
java.lang.NullPointerException: Attempt to invoke virtual method 'com.mogo.map.search.geo.MogoRegeocodeAddress com.mogo.map.search.geo.MogoRegeocodeResult.getRegeocodeAddress()' on a null object reference
2020-12-13 11:43:45 +08:00
liujing
98d4719dc8 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-13 11:22:38 +08:00
liujing
4f402328d3 [add] 点赞+踩 vr下禁用动画 2020-12-13 11:22:16 +08:00
wangcongtao
c6e06132f8 继承问题 2020-12-13 11:21:31 +08:00
wangcongtao
43a046b719 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	libraries/map-custom/build.gradle
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
2020-12-13 11:06:21 +08:00
wangcongtao
564b1356a1 地图依赖重构 2020-12-13 11:04:44 +08:00
liujing
5a20d8636a 动画结束后图片替换 2020-12-11 21:49:13 +08:00
董宏宇
4f39d46fe4 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-11 20:57:47 +08:00
董宏宇
21e93d5d52 修复他人发起求助的window没有定时关闭 2020-12-11 20:54:30 +08:00
tongchenfei
71bc422683 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-11 20:39:55 +08:00
tongchenfei
8cbd35bb0c opt traffic light panel 2020-12-11 20:39:47 +08:00
董宏宇
e20f401dc9 合并解决冲突 2020-12-11 20:39:42 +08:00
董宏宇
e246a48bb7 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
2020-12-11 20:37:59 +08:00
liujing
c88ba91711 [add] 事件弹框点赞/踩 点击替换图片 2020-12-11 20:35:41 +08:00
董宏宇
25ce5ea5af 修复了VR模式切换导致window展示异常的bug 2020-12-11 20:35:23 +08:00
tongchenfei
7d37178948 优化vr模式导航面板 2020-12-10 21:03:11 +08:00
tongchenfei
56a66b50f7 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shuyi_vr_map
# Conflicts:
#	gradle.properties
2020-12-10 18:00:34 +08:00
tongchenfei
9f7cd7eb6b 增加了红绿灯面板界面实现 2020-12-10 17:59:08 +08:00
lixiaopeng
0cc76358f0 modify music 2020-12-10 17:35:00 +08:00
董宏宇
bd28bd1016 增加了小地图代码 2020-12-10 16:21:17 +08:00