From f5316e1c248b592c9a5340cd85bf0415bb020e2f Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 7 Jan 2022 14:24:08 +0800 Subject: [PATCH] 8.0.15 hdmap version update --- app/build.gradle | 10 +++++----- build.gradle | 2 +- gradle.properties | 2 +- .../mogo/map/impl/custom/AMapViewWrapper.java | 4 ++++ .../routeoverlay/MogoRouteOverlayManager.java | 2 +- .../service/routeoverlay/RouteOverlayDrawer.java | 16 ++++++++-------- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f7ddead376..c090a7d221 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.alibaba.arouter' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'android-aspectjx' -//apply plugin: 'bugly' +apply plugin: 'bugly' apply plugin: 'apm-plugin' //apply ByteX宿主 @@ -18,10 +18,10 @@ ByteX { hooklog{ enableLoggerToServer true }*/ -//bugly { -// appId = 'ac71228f85' // 注册时分配的App ID -// appKey = '3c736249-d6be-4066-b577-b7a6dc975cf7' // 注册时分配的App Key -//} +bugly { + appId = 'ac71228f85' // 注册时分配的App ID + appKey = '3c736249-d6be-4066-b577-b7a6dc975cf7' // 注册时分配的App Key +} Properties properties = new Properties(); properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) diff --git a/build.gradle b/build.gradle index 52c82a353d..8d71cf9739 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31' classpath "com.alibaba:arouter-register:1.0.12-mogo" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' -// classpath 'com.tencent.bugly:symtabfileuploader:latest.release' + classpath 'com.tencent.bugly:symtabfileuploader:latest.release' classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' diff --git a/gradle.properties b/gradle.properties index 05d6b408b6..e01c49e2f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.15 MOGO_LOCATION_VERSION=1.3.15 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.0.0.18 +MAP_SDK_VERSION=2.0.0.20 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index c6027d1739..c232f274e4 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -1144,4 +1144,8 @@ public class AMapViewWrapper implements IMogoMapView, ResIdCache.putVal(speedVal, val); } + @Override + public void onMapInit() { + + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index ad34f90e06..ebf88fc8c5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -43,7 +43,7 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this); CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this); - intiDrawer(); +// intiDrawer(); } public static MogoRouteOverlayManager getInstance(Context context) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java index 448199980a..b3145020ed 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java @@ -123,13 +123,13 @@ public class RouteOverlayDrawer { // mPolylineColors.addAll(ColorUtils.gradientAlpha_("#FF2AAFFD", "#7b2965ED", "#002965ED", mPolylinePointList.size())); long start = System.currentTimeMillis(); List list = new ArrayList<>(); - list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size()); -// int[] startColor = ColorUtils.hexToArgb("#FF2AAFFD"); -// int[] endColor = ColorUtils.hexToArgb("#002965ED"); -// list.add(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3])); -// list.add(Color.argb(endColor[0],endColor[1],endColor[2],endColor[3])); +// list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size()); + int[] startColor = ColorUtils.hexToArgb("#FF2AAFFD"); + int[] endColor = ColorUtils.hexToArgb("#002965ED"); + list.add(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3])); + list.add(Color.argb(endColor[0],endColor[1],endColor[2],endColor[3])); long end = System.currentTimeMillis(); - Log.d("lianglihui","get color cost : "+ (end-start)); + Log.d("MogoRouteOverlayManager","get color cost : "+ (end-start)); mPolylineColors.addAll(list); // 线条粗细，渐变，渐变色值 @@ -139,11 +139,11 @@ public class RouteOverlayDrawer { mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions); }else { mPolylineOptions.points(mPolylinePointList); - mMoGoPolyline.setOption(mPolylineOptions); +// mMoGoPolyline.setOption(mPolylineOptions); } } long drawend = System.currentTimeMillis(); - Log.d("lianglihui","drawTrajectoryList cost : "+ (drawend-drawstart)); + Log.d("MogoRouteOverlayManager","drawTrajectoryList cost : "+ (drawend-drawstart)); } public void initdraw() {