Commit Graph

5014 Commits

Author SHA1 Message Date
wangcongtao
e7d4c19d8f 修改在线车辆刷新 2020-12-22 19:22:38 +08:00
unknown
f2ef82eba9 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-22 16:32:29 +08:00
unknown
44fddaad12 my bad 2020-12-22 16:31:47 +08:00
董宏宇
8549b53be4 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 15:53:58 +08:00
董宏宇
ea9c13702e 首次家在样式的时候调整地图的高度 2020-12-22 15:53:54 +08:00
董宏宇
fb8bc7a0b0 替换高德小地图自定义样式 2020-12-22 15:52:50 +08:00
liujing
273f4b5e6f Merge branch 'nm' into dev_merge_shunyi_vr_map 2020-12-22 15:27:08 +08:00
liujing
8f949bd4c3 禁止停车icon-vr 2020-12-22 15:26:58 +08:00
liujing
f6fa8812b5 Merge branch 'nm' into dev_merge_shunyi_vr_map 2020-12-22 14:35:41 +08:00
liujing
044d8d5fb6 poi连线绘制-存在问题:自研地图崩溃 2020-12-22 14:35:12 +08:00
董宏宇
5aeb73a39d Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 13:02:30 +08:00
董宏宇
0b8c5205ef 修复了小地图自定义样式没有生效的bug,原因是高德地图的问题,解决方案如下
aMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {

            @Override
            public void onMapLoaded() {
                //Log.w("onMapLoaded", "===onMapLoaded====");
                // 高德地图有bug,所以需要多次调用设置皮肤才能成功
                if (options != null) {
                    options.setCustomMapStylePath(styleFilePath);
                    mAMapNaviView.setViewOptions(options);
                }

                //设置希望展示的地图缩放级别
                CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(12);
                aMap.moveCamera(cameraUpdate);
            }
        });
2020-12-22 13:00:48 +08:00
tongchenfei
14f53b3277 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 12:38:54 +08:00
tongchenfei
3267979270 替换TrafficPanel背景图 2020-12-22 12:38:48 +08:00
wangcongtao
bd6ae30a2f Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 11:51:35 +08:00
wangcongtao
29dbf33da3 修改自车图标设置时机 2020-12-22 11:51:29 +08:00
unknown
bdcdf00e74 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-22 11:32:16 +08:00
unknown
edc577080d update callchat 2020-12-22 11:31:24 +08:00
lixiaopeng
8d10c3f08b opt 2020-12-22 11:25:18 +08:00
lixiaopeng
b3bdaace50 opt 2020-12-22 11:25:18 +08:00
wangcongtao
a2b88b87cf Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 11:22:00 +08:00
wangcongtao
ea3518b676 opt 2020-12-22 11:21:53 +08:00
unknown
f3e872d692 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-22 10:24:39 +08:00
unknown
5b4c5b5af5 code style changed and fix bug of aspectJ 2020-12-22 10:24:21 +08:00
董宏宇
eff36419b4 增加了测试VR的入口,调整小地图为默认的夜间模式 2020-12-21 20:10:27 +08:00
tongchenfei
aa4710c58a 合并策略上报 2020-12-21 17:56:36 +08:00
董宏宇
b83738ed57 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-21 17:22:16 +08:00
董宏宇
7f1de2a090 没能修复设置自定义样式的高德渲染问题 2020-12-21 17:22:11 +08:00
lixiaopeng
a5d6a2c240 opt 2020-12-21 17:17:15 +08:00
liujing
474c650b9e Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 17:00:10 +08:00
liujing
28d4d2e755 违章停车背景图替换 2020-12-21 17:00:02 +08:00
liujing
a24666cd93 Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 16:29:38 +08:00
liujing
6ee94a0f75 故障求助弹框背景替换 2020-12-21 16:29:30 +08:00
liujing
96daf959cb Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-21 15:45:45 +08:00
liujing
4534b61cf1 Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 15:45:36 +08:00
liujing
28506234ad [add] 事件弹框替换背景图 2020-12-21 15:45:34 +08:00
lixiaopeng
74e3359197 opt 2020-12-21 15:44:55 +08:00
liujing
181ab87807 Merge branch 'ml' into dev_merge_shunyi_vr_map 2020-12-21 14:27:37 +08:00
liujing
51ce9cfc60 弹框top调整 2020-12-21 14:27:28 +08:00
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
unknown
e807277736 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-21 11:49:29 +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