diff --git a/OCH/bus/passenger/src/main/assets/map_style.data b/OCH/bus/passenger/src/main/assets/map_style.data index d4d4bc8214..da9ae1d72d 100644 Binary files a/OCH/bus/passenger/src/main/assets/map_style.data and b/OCH/bus/passenger/src/main/assets/map_style.data differ diff --git a/OCH/bus/passenger/src/main/assets/map_style_extra.data b/OCH/bus/passenger/src/main/assets/map_style_extra.data index 88c4e33256..28fdb4818f 100644 Binary files a/OCH/bus/passenger/src/main/assets/map_style_extra.data and b/OCH/bus/passenger/src/main/assets/map_style_extra.data differ diff --git a/OCH/charter/passenger/src/main/assets/m1_style.data b/OCH/charter/passenger/src/main/assets/m1_style.data index 4e4bb6709d..da9ae1d72d 100644 Binary files a/OCH/charter/passenger/src/main/assets/m1_style.data and b/OCH/charter/passenger/src/main/assets/m1_style.data differ diff --git a/OCH/charter/passenger/src/main/assets/m1_style_extra.data b/OCH/charter/passenger/src/main/assets/m1_style_extra.data index 3ce2c92d11..4bed4023d5 100644 Binary files a/OCH/charter/passenger/src/main/assets/m1_style_extra.data and b/OCH/charter/passenger/src/main/assets/m1_style_extra.data differ diff --git a/OCH/shuttle/passenger/src/main/assets/m2_map_style.data b/OCH/shuttle/passenger/src/main/assets/m2_map_style.data old mode 100755 new mode 100644 index 8e06219090..da9ae1d72d Binary files a/OCH/shuttle/passenger/src/main/assets/m2_map_style.data and b/OCH/shuttle/passenger/src/main/assets/m2_map_style.data differ diff --git a/OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data b/OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data old mode 100755 new mode 100644 index e5a16d46be..28fdb4818f Binary files a/OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data and b/OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data differ diff --git a/OCH/sweeper/driver/src/main/assets/map_style.data b/OCH/sweeper/driver/src/main/assets/map_style.data index b200669659..fbd09768a2 100644 Binary files a/OCH/sweeper/driver/src/main/assets/map_style.data and b/OCH/sweeper/driver/src/main/assets/map_style.data differ diff --git a/OCH/sweeper/driver/src/main/assets/map_style_extra.data b/OCH/sweeper/driver/src/main/assets/map_style_extra.data index 7aa8fa7b45..2fc9d80818 100644 Binary files a/OCH/sweeper/driver/src/main/assets/map_style_extra.data and b/OCH/sweeper/driver/src/main/assets/map_style_extra.data differ diff --git a/OCH/taxi/driver/src/main/assets/map_style.data b/OCH/taxi/driver/src/main/assets/map_style.data index b200669659..fbd09768a2 100644 Binary files a/OCH/taxi/driver/src/main/assets/map_style.data and b/OCH/taxi/driver/src/main/assets/map_style.data differ diff --git a/OCH/taxi/driver/src/main/assets/map_style_extra.data b/OCH/taxi/driver/src/main/assets/map_style_extra.data index 7aa8fa7b45..2fc9d80818 100644 Binary files a/OCH/taxi/driver/src/main/assets/map_style_extra.data and b/OCH/taxi/driver/src/main/assets/map_style_extra.data differ diff --git a/OCH/taxi/passenger/src/main/assets/style.data b/OCH/taxi/passenger/src/main/assets/style.data index 81026ad8cf..b37e968cfd 100644 Binary files a/OCH/taxi/passenger/src/main/assets/style.data and b/OCH/taxi/passenger/src/main/assets/style.data differ diff --git a/OCH/taxi/passenger/src/main/assets/style_extra.data b/OCH/taxi/passenger/src/main/assets/style_extra.data index 16cb7f1e68..7b10fdd9c7 100644 Binary files a/OCH/taxi/passenger/src/main/assets/style_extra.data and b/OCH/taxi/passenger/src/main/assets/style_extra.data differ diff --git a/OCH/taxi/unmanned-driver/src/main/assets/map_style.data b/OCH/taxi/unmanned-driver/src/main/assets/map_style.data index b200669659..fbd09768a2 100644 Binary files a/OCH/taxi/unmanned-driver/src/main/assets/map_style.data and b/OCH/taxi/unmanned-driver/src/main/assets/map_style.data differ diff --git a/OCH/taxi/unmanned-driver/src/main/assets/map_style_extra.data b/OCH/taxi/unmanned-driver/src/main/assets/map_style_extra.data index 7aa8fa7b45..2fc9d80818 100644 Binary files a/OCH/taxi/unmanned-driver/src/main/assets/map_style_extra.data and b/OCH/taxi/unmanned-driver/src/main/assets/map_style_extra.data differ diff --git a/OCH/taxi/unmanned-passenger/src/main/assets/style.data b/OCH/taxi/unmanned-passenger/src/main/assets/style.data index 81026ad8cf..b37e968cfd 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/assets/style.data and b/OCH/taxi/unmanned-passenger/src/main/assets/style.data differ diff --git a/OCH/taxi/unmanned-passenger/src/main/assets/style_extra.data b/OCH/taxi/unmanned-passenger/src/main/assets/style_extra.data index 16cb7f1e68..7b10fdd9c7 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/assets/style_extra.data and b/OCH/taxi/unmanned-passenger/src/main/assets/style_extra.data differ diff --git a/config.gradle b/config.gradle index be1acb31f0..21bff923bf 100644 --- a/config.gradle +++ b/config.gradle @@ -26,7 +26,7 @@ ext { androidxjunit : "androidx.test.ext:junit:1.1.2", androidxespressocore : "androidx.test.espresso:espresso-core:3.3.0", // 地图 - amapnavi3dmap : "com.amap.api:navi-3dmap:9.8.3_3dmap9.8.3", + amapnavi3dmap : "com.amap.api:navi-3dmap:10.0.600_3dmap10.0.600", amapsearch : "com.amap.api:search:9.7.0", amaplocation : "com.amap.api:location:6.3.0", diff --git a/core/mogo-core-res/src/main/assets/over_view_style.data b/core/mogo-core-res/src/main/assets/over_view_style.data index 49eb4d9eb8..fbd09768a2 100644 Binary files a/core/mogo-core-res/src/main/assets/over_view_style.data and b/core/mogo-core-res/src/main/assets/over_view_style.data differ diff --git a/core/mogo-core-res/src/main/assets/over_view_style_extra.data b/core/mogo-core-res/src/main/assets/over_view_style_extra.data index 2f77f323d0..2fc9d80818 100644 Binary files a/core/mogo-core-res/src/main/assets/over_view_style_extra.data and b/core/mogo-core-res/src/main/assets/over_view_style_extra.data differ