Commit Graph

4969 Commits

Author SHA1 Message Date
liujing
563dfbb0b7 Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 13:22:48 +08:00
liujing
9c528128e8 违章停车自研地图违章停车图标-2d 还存在问题:图标特别小,以肉眼可见速度扩大为正常尺寸图标 2020-12-21 13:22:37 +08:00
liujing
9cc4abbfe8 Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 12:34:05 +08:00
liujing
a4e323b943 自研 地图 道路事件图标(2d) 2020-12-21 12:33:38 +08:00
董宏宇
119df9e489 修改测试数据 2020-12-21 11:57:03 +08:00
tongchenfei
9f8dff8d4b opt vr mode change in amap 2020-12-21 11:52:34 +08:00
董宏宇
ff993d113c 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/live/PushCameraLiveWindow.java
2020-12-21 10:16:12 +08:00
董宏宇
44b04063f2 解决监听重写问题 2020-12-21 10:15:31 +08:00
lixiaopeng
2fdedef33c opt 2020-12-21 10:12:16 +08:00
lixiaopeng
b4498eb5c3 opt 2020-12-20 17:18:28 +08:00
lixiaopeng
b1e7582531 opt 2020-12-20 17:08:38 +08:00
liujing
62af5e1978 Merge branch 'mk' into dev_merge_shunyi_vr_map 2020-12-20 15:16:01 +08:00
liujing
0b52672f33 违章停车自研打点[图标小,vr切换到非vr模式,图标正常显示] 2020-12-20 15:15:52 +08:00
wangcongtao
54879e57f0 Merge branch 'dev_merge_shunyi_vr_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-20 15:08:53 +08:00
liujing
9774f03383 Merge branch 'mk' into dev_merge_shunyi_vr_map 2020-12-20 15:05:57 +08:00
liujing
fd8fd17cdf 自研地图正常模式,触发道路事件打点 2020-12-20 15:05:48 +08:00
wangcongtao
b62dd84431 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
2020-12-20 14:48:48 +08:00
wangcongtao
81caafc863 opt 2020-12-20 14:46:42 +08:00
lixiaopeng
c5584d0a54 opt 2020-12-20 14:16:34 +08:00
lixiaopeng
a0721705cf opt 2020-12-20 12:21:38 +08:00
tongchenfei
039143bd87 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-20 12:00:46 +08:00
tongchenfei
6e551a0203 opt cityCode 2020-12-20 12:00:39 +08:00
liujing
61a2ccc271 Merge branch 'mk' into dev_merge_shunyi_vr_map 2020-12-20 11:39:40 +08:00
liujing
f406171026 违章停车vr模式添加打点,自研2d模式图片显示太小 2020-12-20 11:39:19 +08:00
wangcongtao
91b743ad6b Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-20 11:34:51 +08:00
tongchenfei
760e9ff4c3 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-20 11:23:00 +08:00
tongchenfei
3188d585d5 500ms上报数据增加cityCode 2020-12-20 11:22:50 +08:00
liujing
4556af80cd Merge branch 'mm' into dev_merge_shunyi_vr_map 2020-12-18 19:22:08 +08:00
liujing
85aa9e3b80 贝塞尔曲线动画类 2020-12-18 19:21:49 +08:00
董宏宇
b22505ddbb 修改测试数据 2020-12-18 19:13:38 +08:00
董宏宇
2e909c3d5a Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-18 19:03:23 +08:00
董宏宇
5d6e8fd673 修改小地图的描边儿
修改测试数据
2020-12-18 19:03:18 +08:00
wangcongtao
8fcf7931ca Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-18 18:34:19 +08:00
lixiaopeng
9d05b0e027 opt 2020-12-18 18:33:58 +08:00
董宏宇
0346adfa3b Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-18 17:53:57 +08:00
董宏宇
64a156657e 使用导航地图完成了圆形小地图的功能开发 2020-12-18 17:53:54 +08:00
wangcongtao
5304c04dbf Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-18 16:12:19 +08:00
tongchenfei
47b81cc7e1 调整资源 2020-12-18 16:12:00 +08:00
董宏宇
ce15133f21 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-18 11:27:45 +08:00
wangcongtao
548af4227a Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
2020-12-18 10:55:59 +08:00
wangcongtao
036d85df1e opt 2020-12-18 10:55:17 +08:00
tongchenfei
0e8e17e098 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-17 20:04:08 +08:00
tongchenfei
7848be8ea6 opt traffic light panel 2020-12-17 20:04:00 +08:00
lixiaopeng
6673da5adf opt 2020-12-17 17:28:52 +08:00
lixiaopeng
9b4607b37a opt 2020-12-17 17:28:52 +08:00
liujing
7e84442845 Merge branch 'mr' into dev_merge_shunyi_vr_map 2020-12-17 17:04:18 +08:00
liujing
627544a2a2 [v2x] vr下添加marker 2020-12-17 17:03:53 +08:00
liujing
acc0359944 Merge branch 'ber' into dev_merge_shunyi_vr_map 2020-12-17 16:46:40 +08:00
liujing
b4cd08c766 [add] 贝塞尔动画类 2020-12-17 16:46:23 +08:00
董宏宇
f6acddfc21 更改了高德地图的自定义样式 2020-12-17 16:29:42 +08:00