Commit Graph

628 Commits

Author SHA1 Message Date
wangcongtao
233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2
# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-26 09:26:48 +08:00
wangcongtao
0d0c39af67 opt 2021-01-25 18:42:18 +08:00
wangcongtao
5b8faf8af0 升级地图sdk版本 2021-01-22 21:00:14 +08:00
wangcongtao
87607058cb ui opt 2021-01-22 16:48:02 +08:00
wangcongtao
996da7802a opt 2021-01-21 16:57:44 +08:00
wangcongtao
c40126aaf2 接入基础UI 2021-01-21 16:44:04 +08:00
wangcongtao
425ddf1489 opt 2021-01-21 15:01:05 +08:00
wangcongtao
bab8426bca opt 2021-01-20 21:04:34 +08:00
wangcongtao
948a487ffc opt 2021-01-20 17:56:06 +08:00
wangcongtao
3f161fc48d upgrade map sdk version 2021-01-20 16:03:09 +08:00
wangcongtao
27d568a328 opt 2021-01-20 14:08:00 +08:00
wangcongtao
386e882133 opt 2021-01-19 20:26:53 +08:00
tongchenfei
f63579bd11 Merge dev_mogo_httpdns
there are some conflicts:
 both modified:   foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
        both modified:   gradle.properties
        both modified:   modules/mogo-module-share/consumer-rules.pro
        both modified:   modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
2021-01-14 14:45:53 +08:00
wangcongtao
a3a22b6bf1 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-01-14 14:17:59 +08:00
wangcongtao
1b2f72092a 内存泄漏问题优化 2021-01-11 18:55:38 +08:00
wangcongtao
d97d791d23 内存泄漏问题优化 2021-01-11 11:33:03 +08:00
wangcongtao
564c82be86 bugfix 2021-01-11 11:32:47 +08:00
wangcongtao
49ab4e52de 内存泄漏问题优化 2021-01-11 11:31:40 +08:00
wangcongtao
9273942a42 bugfix 2021-01-11 10:51:27 +08:00
wangcongtao
17545b09bb opt 2021-01-10 10:38:54 +08:00
wangcongtao
96610e886e 解决内存泄漏2
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2021-01-08 15:09:47 +08:00
wangcongtao
59f095e295 解决内存泄漏2 2021-01-08 14:57:25 +08:00
wangcongtao
953ee21b8c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-08 11:28:53 +08:00
wangcongtao
5a13775ccd 添加xhdpi资源 2021-01-08 11:27:57 +08:00
tongchenfei
8acdfbbe2e merge branch 2021-01-07 19:33:30 +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
wangcongtao
610d599d43 优化已知问题 2021-01-07 18:13:54 +08:00
wangcongtao
88def61796 bugfix: #132,更新地图版本 2021-01-06 18:52:56 +08:00
wangcongtao
f6de91ba96 代码优化 2021-01-06 17:13:22 +08:00
wangcongtao
5130eac507 bugfix: #116 2021-01-06 17:11:06 +08:00
wangcongtao
e3a8e56337 修复M3无法启动问题 2021-01-06 16:59:49 +08:00
wangcongtao
bccfd46b97 修复M3无法启动问题 2021-01-06 16:55:08 +08:00
lixiaopeng
b3b445c9ec modify host 2021-01-06 16:51:23 +08:00
unknown
1f5b8413c2 update vr-map version 2021-01-06 16:39:55 +08:00
wangcongtao
b2c8c35efb Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-06 14:57:16 +08:00
wangcongtao
3e26011821 更新地图版本 2021-01-06 11:29:09 +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
a1f3842985 升级地图sdk 2021-01-05 18:03:31 +08:00
wangcongtao
e94036f85e 更新切换道路匹配测试逻辑调用方法 2021-01-05 11:14:30 +08:00
wangcongtao
5cbb771469 添加切换道路匹配测试逻辑 2021-01-05 11:04:49 +08:00
wangcongtao
62c8dc6e87 更新地图sdk 2021-01-05 10:41:02 +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
wangcongtao
198f3ec4ee 更新地图sdk 2021-01-04 20:07:31 +08:00
unknown
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
wangcongtao
6661db0e83 opt 2021-01-04 14:37:39 +08:00
董宏宇
cefd72e712 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 16:43:41 +08:00
董宏宇
d582bc3c41 将hook单独作为库引入 2020-12-31 16:43:05 +08:00
wangcongtao
90c95f6324 优化地图加载时机 2020-12-31 10:59:19 +08:00
董宏宇
9557606c03 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 10:08:36 +08:00
wangcongtao
a588c7f22b 更新自研地图版本为1.0.0-vr-7.5.7 2020-12-30 18:04:55 +08:00