Commit Graph

915 Commits

Author SHA1 Message Date
wangcongtao
59f095e295 解决内存泄漏2 2021-01-08 14:57:25 +08:00
wangcongtao
8e5767fd6c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
2021-01-07 18:59:09 +08:00
tongchenfei
21e11b4d41 bug fix: vip通行没有黑夜白天模式 2021-01-06 19:48:55 +08:00
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
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
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
liujing
2c30d98311 +目的地停车场推荐数据 2021-01-04 14:18:41 +08:00
liujing
5c005e6db9 删除测试数据 2020-12-31 19:10:23 +08:00
wujifei
50e87ec043 new#优化代码 2020-12-31 18:07:57 +08:00
wujifei
67eff81529 new#优化代码 2020-12-31 17:24:03 +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
wujifei
402002bc7f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 19:19:04 +08:00
wujifei
842aaf41d0 new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 17:58:00 +08:00
wujifei
7d0562ecd7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
2020-12-30 17:52:00 +08:00
wujifei
f80af8c3cf new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 17:47:33 +08:00
lixiaopeng
3d223d1fd8 add voice control 2020-12-30 17:40:02 +08:00
lixiaopeng
2e8a0ec17f opt 2020-12-30 17:20:55 +08:00
董宏宇
c6933e9560 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 16:39:26 +08:00
董宏宇
386b903378 准备开始编写
基于目的地违章高发情况的停车推荐
2020-12-30 16:38:37 +08:00
liujing
c34291d4cf vr模式隐藏ugc 2020-12-30 16:30:26 +08:00
liujing
e5c88cce3f no message 2020-12-30 16:23:46 +08:00
liujing
61bc847596 vr模式隐藏ugc功能 2020-12-30 16:21:05 +08:00
wangcongtao
6f16239630 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:43:37 +08:00
liujing
eff01b24fb [add] 贝塞尔曲线动画window层添加 2020-12-30 14:30:52 +08:00
liujing
6ac489f561 [fix] UI 2020-12-30 13:06:55 +08:00
wujifei
cac40cbaa7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-29 21:00:11 +08:00
wujifei
d352e5ee1f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-29 20:59:49 +08:00
wangcongtao
044e19961c Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-28 10:58:38 +08:00
liujing
a2c7380ea9 no message 2020-12-25 16:40:49 +08:00
wujifei
7acc8d3df8 new#基于目的地预判的道路事件提醒、路线推荐 2020-12-25 14:44:44 +08:00
liujing
61f6ff3a95 帧动画支持[方法传参被注,showinwindow方法替换] 2020-12-25 11:24:37 +08:00
liujing
14cd989b1a 事件弹框不区分白夜模式,文字显示白色 2020-12-25 10:39:16 +08:00
wujifei
bddb1b68e7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-24 17:42:11 +08:00
wujifei
f4cd26a6ce new#基于目的地预判的道路事件提醒、路线推荐 2020-12-24 17:41:51 +08:00
董宏宇
bb17572fea 关闭了调试日志 2020-12-24 17:34:20 +08:00
董宏宇
6f98b7d7ec Merge branch 'dev_merge_shunyi_vr_map' into dev_1.1.9 2020-12-24 17:23:38 +08:00
董宏宇
6c32317421 还原了多进程小地图方案,原因是LayoutInflater.from(this).cloneInContext(this)没有起到作用 2020-12-24 17:20:01 +08:00
liujing
83767817d6 no message 2020-12-23 16:57:20 +08:00
liujing
a9174b7f58 自研地图 道路事件连线 2020-12-23 16:29:50 +08:00
liujing
fb862aeb57 自研地图: v2x事件弹框图标大小修改,视频弹框关闭按钮替换,视频背景色修改 2020-12-23 16:04:03 +08:00
liujing
a01313ccdd [add] 道路事件弹框视频播放框高度调整 道路事件连线色值需要>1 2020-12-23 14:56:36 +08:00
董宏宇
4eb482d1f1 Merge branch 'dev_merge_shunyi_vr_map' into dev_1.1.9 2020-12-23 14:35:24 +08:00
董宏宇
7ecaaeda3c 修复自研地图的逆地理编码的bug 2020-12-23 14:31:18 +08:00
董宏宇
fcd1065769 增加占位文件 2020-12-23 10:25:31 +08:00
liujing
b1aafad479 清除连线 2020-12-22 19:38:27 +08:00
liujing
fce7b873a2 动画时间单位毫秒 2020-12-22 17:47:42 +08:00
tongchenfei
2559886687 修改vip变灯marker在vr模式下的显示问题 2020-12-22 17:46:12 +08:00