From 49e0ce026cfbc4fc51c25922fcd12e4663468b5b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 6 Jan 2022 19:45:14 +0800 Subject: [PATCH 01/15] adjust the vip to avoid push twice notice --- .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index a1605c85ca..50527a245e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -128,13 +128,13 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe if (!turnLightFirst) { // 首次判断，变灯 turnLightFirst = true - val controlTime = if (currentResult!!.isGreen()) 45 - currentResult.remain else 45 + val controlTime = if (currentResult!!.isGreen()) 30 - currentResult.remain else 30 Logger.d(TAG, "触发变灯 , controlTime : $controlTime") turnLight(controlTime) } lastResult?.let { //如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗 - if (abs(currentResult!!.remain - it.remain) > 5) { + if (abs(currentResult!!.remain - it.remain) > 5 && currentResult.isGreen()) { Logger.d(TAG, "调用showWarningV2X to show") CallerHmiManager.showWarningV2X(EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType.toInt(), EventTypeEnum.TYPE_VIP_IDENTIFICATION.content, From 64afbb04cb78b450baf57547d1392019160922c5 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 6 Jan 2022 19:45:14 +0800 Subject: [PATCH 02/15] adjust the vip to avoid push twice notice --- .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index a1605c85ca..50527a245e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -128,13 +128,13 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe if (!turnLightFirst) { // 首次判断，变灯 turnLightFirst = true - val controlTime = if (currentResult!!.isGreen()) 45 - currentResult.remain else 45 + val controlTime = if (currentResult!!.isGreen()) 30 - currentResult.remain else 30 Logger.d(TAG, "触发变灯 , controlTime : $controlTime") turnLight(controlTime) } lastResult?.let { //如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗 - if (abs(currentResult!!.remain - it.remain) > 5) { + if (abs(currentResult!!.remain - it.remain) > 5 && currentResult.isGreen()) { Logger.d(TAG, "调用showWarningV2X to show") CallerHmiManager.showWarningV2X(EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType.toInt(), EventTypeEnum.TYPE_VIP_IDENTIFICATION.content, From 542391e225ce4ad3a85f61cb38d5a3c0a41ed23d Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 30 Dec 2021 16:49:47 +0800 Subject: [PATCH 03/15] =?UTF-8?q?8.0.15=20=20=E8=BE=93=E5=87=BA=E8=BD=A6?= =?UTF-8?q?=E5=89=8D=E5=BC=95=E5=AF=BC=E7=BA=BFlog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routeoverlay/MogoRouteOverlayManager.java | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) 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 7c04820b4d..dca1c2fa19 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 @@ -1,6 +1,8 @@ package com.mogo.module.service.routeoverlay; import android.content.Context; +import android.location.Location; +import android.os.SystemClock; import android.util.Log; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; @@ -9,10 +11,14 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; +import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; +import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; +import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import org.jetbrains.annotations.NotNull; @@ -21,13 +27,14 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener{ +public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener, IMoGoMapLocationListener { private static volatile MogoRouteOverlayManager sInstance; private Context mContext; private String TAG = "MogoRouteOverlayManager"; private String TAG2 = "MogoRouteOverlayManager routes"; private int STATUS_AUTOPILOT = 0;//0 非自动驾驶 ; 1 自动驾驶 private MogoLatLng mEnding; + private MogoLocation mLocation; private MogoRouteOverlayManager(Context context) { mContext = context; } @@ -35,6 +42,7 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, public void init() { CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this); CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); + CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this); } public static MogoRouteOverlayManager getInstance(Context context) { @@ -53,19 +61,33 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, if (trajectoryInfos == null || trajectoryInfos.size() == 0) { return; } - ADASTrajectoryInfo adasTrajectoryInfo = trajectoryInfos.get(0); - double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); - double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); - Log.d(TAG, "size:" + trajectoryInfos.size()); - Log.d(TAG, "trajectoryInfos:" + adasTrajectoryInfo.getLat()+":"+adasTrajectoryInfo.getLon()); - Log.d(TAG, "location:" + lat+":"+lon); +// double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); +// double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); + StringBuilder builder = new StringBuilder(); + builder.append("{"); + builder.append(System.currentTimeMillis()).append(";"); + builder.append(mLocation.getLongitude()).append(";"); + builder.append(mLocation.getLatitude()).append(";"); + builder.append(mLocation.getAltitude()).append(";"); + builder.append(mLocation.getBearing()).append(";"); + builder.append(mLocation.getSpeed()).append(";"); +// ADASTrajectoryInfo adasTrajectoryInfo = trajectoryInfos.get(0); +// long temp = SystemClock.currentThreadTimeMillis(); +// Log.d(TAG, "temp:"+temp+" size:" + trajectoryInfos.size()); +// Log.d(TAG, "trajectoryInfos:" + adasTrajectoryInfo.getLat()+":"+adasTrajectoryInfo.getLon()); +// Log.d(TAG, "temp:"+temp+" location:" + lat+":"+lon); List mogoLatLngs = new ArrayList<>(); for (ADASTrajectoryInfo a : trajectoryInfos) { +// Log.d(TAG, "temp:"+temp+" trajectoryInfos:" + a.getLat()+":"+a.getLon()); + builder.append(a.getLon()).append(","); + builder.append(a.getLat()).append(","); mogoLatLngs.add(new MogoLatLng(a.getLat(), a.getLon())); } if (STATUS_AUTOPILOT == 1) { RouteOverlayDrawer.getInstance(mContext).drawTrajectoryList(mogoLatLngs); } + builder.append("}"); + Log.d(TAG,builder.toString()); } @Override @@ -108,4 +130,9 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, public void onAutopilotSNRequest() { } + + @Override + public void onLocationChanged(@Nullable MogoLocation location) { + mLocation = location; + } } From 64d9da5115c29d8e8939f34c7fc9b83c784ae47a Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 6 Jan 2022 15:06:37 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=BD=A6=E5=89=8D=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=BA=BF=20=E6=9C=AC=E5=9C=B0=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 ++--- build.gradle | 2 +- .../routeoverlay/MogoRouteOverlayManager.java | 5 +++ .../routeoverlay/RouteOverlayDrawer.java | 40 ++++++++++++++++++- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c090a7d221..f7ddead376 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 8d71cf9739..52c82a353d 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/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 dca1c2fa19..ad34f90e06 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,6 +43,7 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this); CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this); + intiDrawer(); } public static MogoRouteOverlayManager getInstance(Context context) { @@ -56,6 +57,10 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, return sInstance; } + private void intiDrawer(){ + RouteOverlayDrawer.getInstance(mContext).initdraw(); + } + @Override public void onAutopilotTrajectory(ArrayList trajectoryInfos) { if (trajectoryInfos == null || trajectoryInfos.size() == 0) { 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 f1044fe84c..448199980a 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 @@ -3,6 +3,7 @@ package com.mogo.module.service.routeoverlay; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import android.util.Log; import com.mogo.commons.debug.DebugConfig; @@ -48,7 +49,6 @@ public class RouteOverlayDrawer { mogoOverlayManager = MogoApisHandler.getInstance().getApis().getMapServiceApi().getOverlayManager(mContext); endingBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon_route_ending); - } public static RouteOverlayDrawer getInstance(Context context) { @@ -112,6 +112,8 @@ public class RouteOverlayDrawer { public void drawTrajectoryList(List routeList) { // clearMogoRouteOverlay(); + long drawstart = System.currentTimeMillis(); + mPolylinePointList.clear(); if (routeList != null) { for (MogoLatLng latLng : routeList) { @@ -119,7 +121,17 @@ public class RouteOverlayDrawer { } mPolylineColors.clear(); // mPolylineColors.addAll(ColorUtils.gradientAlpha_("#FF2AAFFD", "#7b2965ED", "#002965ED", mPolylinePointList.size())); - mPolylineColors.addAll(ColorUtils.gradientAlpha("#FF2AAFFD", "#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])); + long end = System.currentTimeMillis(); + Log.d("lianglihui","get color cost : "+ (end-start)); + + mPolylineColors.addAll(list); // 线条粗细，渐变，渐变色值 mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors); if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){ @@ -130,5 +142,29 @@ public class RouteOverlayDrawer { mMoGoPolyline.setOption(mPolylineOptions); } } + long drawend = System.currentTimeMillis(); + Log.d("lianglihui","drawTrajectoryList cost : "+ (drawend-drawstart)); + } + + public void initdraw() { + mPolylinePointList.clear(); + MogoLatLng latLng = new MogoLatLng(MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(),MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon()); + mPolylinePointList.add(latLng); + mPolylinePointList.add(latLng); + mPolylineColors.clear(); + long start = System.currentTimeMillis(); + List list = new ArrayList<>(); + list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size()); + + mPolylineColors.addAll(list); + // 线条粗细，渐变，渐变色值 + mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors); + if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){ + mPolylineOptions.points(mPolylinePointList); + mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions); + }else { + mPolylineOptions.points(mPolylinePointList); + mMoGoPolyline.setOption(mPolylineOptions); + } } } From f5316e1c248b592c9a5340cd85bf0415bb020e2f Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 7 Jan 2022 14:24:08 +0800 Subject: [PATCH 05/15] 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() { From 960358019eafa457d8ed49146038fa6de848c548 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 7 Jan 2022 15:59:51 +0800 Subject: [PATCH 06/15] 8.0.15 hdmap version update --- .../mogo/module/service/routeoverlay/RouteOverlayDrawer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b3145020ed..bb0d483774 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 @@ -39,7 +39,7 @@ public class RouteOverlayDrawer { private static final String markerType = "route_ending"; private RouteOverlayDrawer(Context context) { mPolylineOptions = new MogoPolylineOptions(); - mPolylineOptions.zIndex(20000f); + mPolylineOptions.zIndex(30000f); mPolylineOptions.setGps(true); // 绘制路径集合 mPolylinePointList = new ArrayList<>(); @@ -139,7 +139,7 @@ public class RouteOverlayDrawer { mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions); }else { mPolylineOptions.points(mPolylinePointList); -// mMoGoPolyline.setOption(mPolylineOptions); + mMoGoPolyline.setOption(mPolylineOptions); } } long drawend = System.currentTimeMillis(); From 01448cb810f48b01b143d17ebc58eda2c727fa12 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 7 Jan 2022 18:07:21 +0800 Subject: [PATCH 07/15] =?UTF-8?q?[Change]=20=E8=BF=87=E6=BB=A4=E6=9C=AA?= =?UTF-8?q?=E7=9F=A5=E7=B1=BB=E5=9E=8B=E6=84=9F=E7=9F=A5=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../com/mogo/module/common/drawer/IdentifyDataDrawer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java index a383454f72..42a45e51c1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java @@ -10,6 +10,7 @@ import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.constants.AdasRecognizedType; import com.mogo.module.common.constants.DataTypes; import com.mogo.utils.logger.Logger; @@ -82,6 +83,9 @@ public class IdentifyDataDrawer extends BaseDrawer { if (isUselessValue(recognizedListResult)) { continue; } + if (AdasRecognizedType.valueFrom(recognizedListResult.getType().getType()) == AdasRecognizedType.classIdUnKnow) { + continue; + } // 复用之前存在的 marker String uniqueKey = recognizedListResult.getUuid(); IMogoMarker marker = mMarkersCaches.remove(uniqueKey); @@ -102,6 +106,9 @@ public class IdentifyDataDrawer extends BaseDrawer { if (newDiffSetSize > 0) { for (int i = 0; i < newDiffSetSize; i++) { TrafficData recognizedListResult = newDiffSet.get(i); + if (AdasRecognizedType.valueFrom(recognizedListResult.getType().getType()) == AdasRecognizedType.classIdUnKnow) { + continue; + } String uniqueKey = recognizedListResult.getUuid(); IMogoMarker marker = drawAdasRecognizedDataMarker(recognizedListResult); if (marker == null) { From de45685aaa4e4563ab4e7f6722e6d3a01dbb10f2 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Sun, 9 Jan 2022 18:09:33 +0800 Subject: [PATCH 08/15] =?UTF-8?q?[Update]=E6=8F=90=E9=AB=98=E4=B8=8B?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=8F=A3id=E7=9A=84=E9=A2=91?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/v2x/trafficlight/core/TrafficLightThreadHandler.kt | 2 +- .../java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightThreadHandler.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightThreadHandler.kt index afe63fb592..9d6fec2980 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightThreadHandler.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightThreadHandler.kt @@ -38,7 +38,7 @@ class TrafficLightThreadHandler : Handler { when (msg.what) { MSG_WHAT_LOOP_SEARCH_CROSS_ROAD -> { //handler轮询，后续从地图处获取到车道线(前提获取车道线没有异步调用)，来优化轮询时长 - sendEmptyMessageDelayed(MSG_WHAT_LOOP_SEARCH_CROSS_ROAD,1_000L) + sendEmptyMessageDelayed(MSG_WHAT_LOOP_SEARCH_CROSS_ROAD,300L) loopSearchCrossRoad?.invoke() } MSG_WHAT_STOP_SEARCH_CROSS_ROAD -> { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index 50527a245e..67af3591b6 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -128,7 +128,7 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe if (!turnLightFirst) { // 首次判断，变灯 turnLightFirst = true - val controlTime = if (currentResult!!.isGreen()) 30 - currentResult.remain else 30 + val controlTime = if (currentResult!!.isGreen()) 45 - currentResult.remain else 45 Logger.d(TAG, "触发变灯 , controlTime : $controlTime") turnLight(controlTime) } From d342784146b76442d46e3b5f9e181163d6dd2cae Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 10 Jan 2022 14:28:18 +0800 Subject: [PATCH 09/15] =?UTF-8?q?[Add]=20DebugView=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=8D=E7=A7=B0=E5=92=8CHASH=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=B7=9F=E8=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 28 +++++++++++++++ .../com/mogo/launcher/MogoApplication.java | 5 +++ .../hmi/ui/setting/DebugSettingView.kt | 35 +++++++++---------- .../mogo/eagle/core/data/app/AppConfigInfo.kt | 30 +++++++++++++++- 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c090a7d221..9a7c3373f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,6 +106,8 @@ android { // 是否作为 launcher 运行 buildConfigField 'boolean', 'IS_LAUNCHER', 'true' buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"' + buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName() + buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash() // 是否支持目的地导航策略 buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'false' } @@ -296,3 +298,29 @@ android.applicationVariants.all { variant -> } apply from: "./regroup.gradle" + +/** + * @return 获取当前分支名称 + */ +def getWorkingBranchName() { + def workingBranchName = "" + def proc = "git rev-parse --abbrev-ref HEAD".execute() + proc.in.eachLine { line -> workingBranchName = line } + proc.err.eachLine { line -> println line } + proc.waitFor() + workingBranchName = "\"${workingBranchName}\"" + println "Working branch name: " + workingBranchName + return workingBranchName +} +/** + * @return 获取当前分支hash + */ +def getWorkingBranchHash() { + def workingBranchHash = "" + def proc = "git log -n1 --format=format:\"%h\"".execute() + proc.in.eachLine { line -> workingBranchHash = line } + proc.err.eachLine { line -> println line } + proc.waitFor() + println "Working branch hash: " + workingBranchHash + return workingBranchHash +} diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 8f6f7d701a..21f685837a 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -9,6 +9,7 @@ import com.bytedance.apm.insight.ApmInsight; import com.bytedance.apm.insight.ApmInsightInitConfig; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.main.MainMoGoApplication; import com.mogo.module.v2x.utils.ObuConfig; @@ -156,6 +157,10 @@ public class MogoApplication extends MainMoGoApplication { DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME); DebugConfig.setObuType(SharedPrefsMgr.getInstance(this).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI)); + // 初始化构建APP的时候的分支及提交HASH，用于辅助定位问题 + AppConfigInfo.INSTANCE.setWorkingBranchName(BuildConfig.WORKING_BRANCH_NAME); + AppConfigInfo.INSTANCE.setWorkingBranchHash(BuildConfig.WORKING_BRANCH_HASH); + ObuConfig.useObuLocation = false; // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 7e113ceeea..41e64f7ef2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -58,8 +58,6 @@ class DebugSettingView @JvmOverloads constructor( IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener, IMoGoMapLocationListener { private val TAG = "DebugSettingView" - // 初始化App 配置信息 - val mAppConfigInfo = AppConfigInfo() init { LayoutInflater.from(context).inflate(R.layout.view_debug_setting, this, true) @@ -283,20 +281,21 @@ class DebugSettingView @JvmOverloads constructor( * 绘制应用基本 */ private fun drawAppInfo() { - - mAppConfigInfo.appName = AppUtils.getAppName() - mAppConfigInfo.appVersionCode = AppUtils.getAppVersionCode() - mAppConfigInfo.appVersionName = AppUtils.getAppVersionName() - mAppConfigInfo.appPackageName = AppUtils.getAppPackageName() - mAppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()) - mAppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn - mAppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token - mAppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion - mAppConfigInfo.isConnectNet = NetworkUtils.isConnected(context) - mAppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot() + AppConfigInfo.appName = AppUtils.getAppName() + AppConfigInfo.appName = AppUtils.getAppName() + AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode() + AppConfigInfo.appVersionName = AppUtils.getAppVersionName() + AppConfigInfo.appPackageName = AppUtils.getAppPackageName() + AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()) + AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token + AppConfigInfo.netMode = DebugConfig.getNetMode() + AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion + AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context) + AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot() // 将数据绘制 - tvAppInfo.text = mAppConfigInfo.toString() + tvAppInfo.text = AppConfigInfo.toString() } /** @@ -306,8 +305,8 @@ class DebugSettingView @JvmOverloads constructor( UiThreadHandler.post { tvObuInfo.text = GsonUtils.toJson(obuStatusInfo) - mAppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion - mAppConfigInfo.isConnectObu = obuStatusInfo.obuStatus + AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion + AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus drawAppInfo() } } @@ -320,8 +319,8 @@ class DebugSettingView @JvmOverloads constructor( tvAutopilotInfo.post { tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo) - mAppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version - mAppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus + AppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version + AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus drawAppInfo() } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index dd63a99845..a786bdad16 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt @@ -5,7 +5,10 @@ package com.mogo.eagle.core.data.app * @date 2021/10/12 2:46 下午 * 当前应用的配置信息 */ -class AppConfigInfo { +object AppConfigInfo { + /*应用构建基本信息*/ + var workingBranchName: String? = null + var workingBranchHash: String? = null /*应用基本信息*/ var appName: String? = null @@ -22,6 +25,13 @@ class AppConfigInfo { var mogoToken: String? = null var mogoSN: String? = null + /** + * debug 测试环境--2 + * release 生产环境--3 + * demo 演示环境--4 + */ + var netMode: Int = 3 + // 是否可以网络连接 var isConnectNet: Boolean = false @@ -55,6 +65,8 @@ class AppConfigInfo { return "应用名称：${appName}\n" + "应用版本：${appVersionCode}\n" + "应用版本名称：${appVersionName}\n" + + "Git分支名称：${workingBranchName}\n" + + "Git分支HASH：${workingBranchHash}\n" + "HD-MAP-SDK版本：${mapSdkVersion}\n" + "ADAS-SDK版本：${adasSdkVersion}\n" + "OBU-SDK版本：${obuSdkVersion}\n" + @@ -62,6 +74,22 @@ class AppConfigInfo { //"mogoToken：${mogoToken}\n"+ "中台分配的SN：${mogoSN}\n" + "网络是否正常：${isConnectNet}\n" + + "当前网络服务连接：${netMode} -- ${ + (when (netMode) { + 2 -> { + "测试环境" + } + 3 -> { + "生产环境" + } + 4 -> { + "演示环境" + } + else -> { + "未知环境" + } + }) + }\n" + "Socket是否正常：${isConnectSocket}\n" + "ADAS连接是否正常：${isConnectAutopilot}\n" + "OBU连接是否正常：${isConnectObu}\n" From f24702a8ccc87e46b4d43e8d965330e85df2319e Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 7 Jan 2022 18:59:36 +0800 Subject: [PATCH 10/15] =?UTF-8?q?[Update]=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E9=97=AF=E7=BA=A2=E7=81=AF=E9=A2=84=E8=AD=A6=E5=92=8C=E7=BB=BF?= =?UTF-8?q?=E7=81=AF=E9=80=9A=E8=A1=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/function/v2x/V2XProvider.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt index 07ad9dc633..b6c59bb260 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt @@ -5,7 +5,6 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_V2X_MODULE import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightManager -import com.mogo.eagle.core.function.v2x.redlightwarning.RedLightWarningManager import com.mogo.eagle.core.function.v2x.speedlimit.SpeedLimitDataManager import com.mogo.eagle.core.function.v2x.vip.VipCarManager @@ -19,11 +18,11 @@ class V2XProvider : IMoGoFunctionServerProvider { CallTrafficLightManager.getTrafficLightProvider().initTrafficLightServer(context) VipCarManager.INSTANCE.initServer(context) SpeedLimitDataManager.getInstance().start(); - RedLightWarningManager.INSTANCE.listenTrafficLight() +// RedLightWarningManager.INSTANCE.listenTrafficLight() } override fun onDestroy() { VipCarManager.INSTANCE.destroy() - RedLightWarningManager.INSTANCE.onDestroy() +// RedLightWarningManager.INSTANCE.onDestroy() } } \ No newline at end of file From a6241e10f73b6b22933c2ff41be5da13ed990907 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 10 Jan 2022 16:10:25 +0800 Subject: [PATCH 11/15] =?UTF-8?q?[Add]=20=E5=8F=91=E5=B8=83220=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202=E3=80=81DebugView=E6=94=B9=E7=89=88?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0git=E4=BF=A1=E6=81=AF=203=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC=E7=BA=BF=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=204=E3=80=81=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF=E7=81=AF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../main/res/layout/view_debug_setting.xml | 21 +++ gradle.properties | 156 +++++++++--------- .../routeoverlay/RouteOverlayDrawer.java | 2 +- 3 files changed, 100 insertions(+), 79 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 8f7d748a0e..4251cc7a23 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -31,6 +31,27 @@ android:textSize="@dimen/dp_34" android:textStyle="bold" /> + + + + + + + (); From 61df49c301fc112a8f81b5f07c56b1d3fbb087b5 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 10 Jan 2022 16:17:51 +0800 Subject: [PATCH 12/15] =?UTF-8?q?[Fix]=20=E4=BD=BF=E7=94=A8=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 383d0bf192..31fc993e00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=true +USE_MAVEN_PACKAGE=false ##plugin 插件 android.enableR8.libraries=false android.enableR8=false From 421b1d6ea268e61d279ae27df131d59456c9442f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 10 Jan 2022 16:28:13 +0800 Subject: [PATCH 13/15] according to product manager to said, note the traffic light showing logic --- .../function/v2x/trafficlight/core/MogoTrafficLightManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index a64045e0fc..a5b6790efa 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -78,7 +78,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { trafficLightNetWorkModel.requestTrafficLight( it.latitude, it.longitude, it.bearing.toDouble(), road, { result -> trafficLightResult = result - TrafficLightHMIManager.INSTANCE.updateTrafficLight(result) +// TrafficLightHMIManager.INSTANCE.updateTrafficLight(result) CallTrafficLightListenerManager.invokeTrafficLightStatus(result) }, { errorMsg -> From b40d73f6aeb3456b7d5130e02cafe391e2666652 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 10 Jan 2022 17:57:47 +0800 Subject: [PATCH 14/15] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A0=B7=E5=BC=8F=E5=81=B6=E7=8E=B0=E4=B8=8D?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../function/smp/SmallMapDirectionView.java | 39 +++-- gradle.properties | 154 +++++++++--------- .../mogo/map/impl/custom/AMapViewWrapper.java | 21 +-- 3 files changed, 103 insertions(+), 111 deletions(-) diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 0f9493c9f1..876927e100 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -125,24 +125,15 @@ public class SmallMapDirectionView .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_start))); mEndMarker = mAMap.addMarker(new MarkerOptions() .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_end))); - - new Thread(() -> { - try { - Thread.sleep(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - mAMap.setCustomMapStyle( - new CustomMapStyleOptions() - .setEnable(true) - .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext())) - .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext())) - ); - - //设置希望展示的地图缩放级别 - mAMap.moveCamera(mCameraUpdate); - }).start(); - + // 加载自定义样式 + CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() + .setEnable(true) + .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext())) + .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext())); + // 设置自定义样式 + mAMap.setCustomMapStyle(customMapStyleOptions); + //设置希望展示的地图缩放级别 + mAMap.moveCamera(mCameraUpdate); // 设置地图的样式 UiSettings uiSettings = mAMap.getUiSettings(); uiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮 @@ -152,6 +143,14 @@ public class SmallMapDirectionView mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() { @Override public void onMapLoaded() { + Logger.d(TAG, "smp---onMapLoaded"); + // 加载自定义样式 + CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() + .setEnable(true) + .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext())) + .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext())); + // 设置自定义样式 + mAMap.setCustomMapStyle(customMapStyleOptions); mAMapNaviView.getMap().setPointToCenter(mAMapNaviView.getWidth() / 2, mAMapNaviView.getHeight() / 2); } }); @@ -202,10 +201,10 @@ public class SmallMapDirectionView clearPolyline(); mCoordinatesLatLng.clear(); } - cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); + cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); } else { //设置希望展示的地图缩放级别 - cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); + cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); // mAMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLng, zoomLevel)); } mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition)); diff --git a/gradle.properties b/gradle.properties index 31fc993e00..f9e6f7b18a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.1.15.4.aar +android.jetifier.blacklist=module-service-2.1.15.7.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -89,102 +89,102 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.15 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.4 -MOGO_CORE_DATA_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_API_VERSION=0.0.57.4 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.4 -MOGO_CORE_RES_VERSION=0.0.57.4 -MOGO_CORE_UTILS_VERSION=0.0.57.4 -MOGO_CORE_NETWORK_VERSION=0.0.57.4 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.7 +MOGO_CORE_DATA_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_API_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.7 +MOGO_CORE_RES_VERSION=0.0.57.7 +MOGO_CORE_UTILS_VERSION=0.0.57.7 +MOGO_CORE_NETWORK_VERSION=0.0.57.7 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.15.4 -MOGO_UTILS_VERSION=2.1.15.4 -MAP_AMAP_VERSION=2.1.15.4 -MAP_AUTONAVI_VERSION=2.1.15.4 -MOGO_MAP_VERSION=2.1.15.4 -MOGO_MAP_API_VERSION=2.1.15.4 -MOGO_SERVICE_VERSION=2.1.15.4 -MOGO_SERVICE_API_VERSION=2.1.15.4 -MOGO_CONNECTION_VERSION=2.1.15.4 -MOGO_MODULE_APPS_VERSION=2.1.15.4 -MOGO_MODULE_NAVI_VERSION=2.1.15.4 -MOGO_MODULE_SHARE_VERSION=2.1.15.4 -MOGO_MODULE_COMMON_VERSION=2.1.15.4 -MOGO_MODULE_MAIN_VERSION=2.1.15.4 -MOGO_MODULE_MAP_VERSION=2.1.15.4 -MOGO_MODULE_SERVICE_VERSION=2.1.15.4 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.4 -MOGO_MODULE_SEARCH_VERSION=2.1.15.4 -MOGO_MODULE_BACK_VERSION=2.1.15.4 -MOGO_MODULE_V2X_VERSION=2.1.15.4 +MOGO_COMMONS_VERSION=2.1.15.7 +MOGO_UTILS_VERSION=2.1.15.7 +MAP_AMAP_VERSION=2.1.15.7 +MAP_AUTONAVI_VERSION=2.1.15.7 +MOGO_MAP_VERSION=2.1.15.7 +MOGO_MAP_API_VERSION=2.1.15.7 +MOGO_SERVICE_VERSION=2.1.15.7 +MOGO_SERVICE_API_VERSION=2.1.15.7 +MOGO_CONNECTION_VERSION=2.1.15.7 +MOGO_MODULE_APPS_VERSION=2.1.15.7 +MOGO_MODULE_NAVI_VERSION=2.1.15.7 +MOGO_MODULE_SHARE_VERSION=2.1.15.7 +MOGO_MODULE_COMMON_VERSION=2.1.15.7 +MOGO_MODULE_MAIN_VERSION=2.1.15.7 +MOGO_MODULE_MAP_VERSION=2.1.15.7 +MOGO_MODULE_SERVICE_VERSION=2.1.15.7 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.7 +MOGO_MODULE_SEARCH_VERSION=2.1.15.7 +MOGO_MODULE_BACK_VERSION=2.1.15.7 +MOGO_MODULE_V2X_VERSION=2.1.15.7 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.15.4 +MOGO_MODULE_TANLU_VERSION=2.1.15.7 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.15.4 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.4 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.4 +MOGO_MODULE_PUSH_VERSION=2.1.15.7 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.7 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.7 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.15.4 -MOGO_TANLU_API_VERSION=2.1.15.4 +TANLULIB_VERSION=2.1.15.7 +MOGO_TANLU_API_VERSION=2.1.15.7 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.4 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.4 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.7 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.7 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.15.4 +MOGO_MODULE_WIDGETS_VERSION=2.1.15.7 # obu -MOGO_MODULE_OBU_VERSION=2.1.15.4 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.4 +MOGO_MODULE_OBU_VERSION=2.1.15.7 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.7 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.15.4 +MOGO_MODULE_MONITOR_VERSION=2.1.15.7 # bugly -CRASHREPORT_VERSION=2.1.15.4 -CRASHREPORT_BUGLY_VERSION=2.1.15.4 -CRASHREPORT_NOOP_VERSION=2.1.15.4 -CRASHREPORT_UPGRADE_VERSION=2.1.15.4 +CRASHREPORT_VERSION=2.1.15.7 +CRASHREPORT_BUGLY_VERSION=2.1.15.7 +CRASHREPORT_NOOP_VERSION=2.1.15.7 +CRASHREPORT_UPGRADE_VERSION=2.1.15.7 ## tts -TTS_BASE_VERSION=2.1.15.4 -TTS_DI_VERSION=2.1.15.4 -TTS_ZHI_VERSION=2.1.15.4 -TTS_PAD_VERSION=2.1.15.4 -TTS_NOOP_VERSION=2.1.15.4 +TTS_BASE_VERSION=2.1.15.7 +TTS_DI_VERSION=2.1.15.7 +TTS_ZHI_VERSION=2.1.15.7 +TTS_PAD_VERSION=2.1.15.7 +TTS_NOOP_VERSION=2.1.15.7 # 自研地图 -MAP_CUSTOM_VERSION=2.1.15.4 -MOGO_MODULE_ADAS_VERSION=2.1.15.4 +MAP_CUSTOM_VERSION=2.1.15.7 +MOGO_MODULE_ADAS_VERSION=2.1.15.7 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.4 -MOGO_BASE_SERVICES_APK_VERSION=2.1.15.4 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.4 -MOGO_MODULE_CHAT_VERSION=2.1.15.4 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.7 +MOGO_BASE_SERVICES_APK_VERSION=2.1.15.7 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.7 +MOGO_MODULE_CHAT_VERSION=2.1.15.7 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.15.4 +MOGO_MODULE_CARCHATTING_VERSION=2.1.15.7 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.4 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.7 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.15.4 -MOGO_SKIN_LIGHT_VERSION=2.1.15.4 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.4 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.4 -SKIN_SUPPORT_VERSION=2.1.15.4 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.4 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.4 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.4 -SKIN_SUPPORT_DESIGN_VERSION=2.1.15.4 +MOGO_SKIN_SUPPORT_VERSION=2.1.15.7 +MOGO_SKIN_LIGHT_VERSION=2.1.15.7 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.7 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.7 +SKIN_SUPPORT_VERSION=2.1.15.7 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.7 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.7 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.7 +SKIN_SUPPORT_DESIGN_VERSION=2.1.15.7 # OCH -MOGO_OCH_VERSION=2.1.15.4-test +MOGO_OCH_VERSION=2.1.15.7-test MOGO_OCH_BUS_VERSION=2.0.66 MOGO_OCH_NOOP_VERSION=2.0.66 MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.4 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.7 ################# 旧版本架构模块版本 ################# 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 c232f274e4..0dc6ae716e 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 @@ -743,8 +743,6 @@ public class AMapViewWrapper implements IMogoMapView, return MapDataApi.INSTANCE.getLimitSpeed(lon, lat, angle); } - private boolean isShowWarn; - @Override public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { // Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged：location"); @@ -802,20 +800,18 @@ public class AMapViewWrapper implements IMogoMapView, } -// @Override -// public void onMapInit() { -// Logger.i(TAG, "autoop--onMapInit: "); -// HdMapBuildConfig.isMapLoaded = true; -// MogoMapListenerHandler.getInstance().onMapLoaded(); -// } + @Override + public void onMapInit() { + Logger.i(TAG, "autoop--onMapInit: "); + MogoMapListenerHandler.getInstance().onMapLoaded(); + } @Override public void onMapLoaded() { - Logger.i(TAG, "autoop--onMapLoaded: "); MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型，未来需区分车的类型 //mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率 - MogoMapListenerHandler.getInstance().onMapLoaded(); + //MogoMapListenerHandler.getInstance().onMapLoaded(); mMapLoaded = true; CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); Trace.beginSection("timer.onCameraChangeFinish"); @@ -841,6 +837,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onRoadLoaded(@Nullable String s) { + Logger.i(TAG, "autoop--onMapLoaded: "); } @@ -1144,8 +1141,4 @@ public class AMapViewWrapper implements IMogoMapView, ResIdCache.putVal(speedVal, val); } - @Override - public void onMapInit() { - - } } From 60bbb915294cd88e7a6ce085591446f838e241ed Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 10 Jan 2022 18:44:06 +0800 Subject: [PATCH 15/15] =?UTF-8?q?[Fix]=20=E7=BB=99220=E4=BD=BF=E7=94=A8=20?= =?UTF-8?q?0.0.57.9=202.1.15.9=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=202=E3=80=81DebugView=E6=94=B9?= =?UTF-8?q?=E7=89=88=EF=BC=8C=E5=A2=9E=E5=8A=A0git=E4=BF=A1=E6=81=AF=203?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC=E7=BA=BF=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=204=E3=80=81=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E7=81=AF=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 154 +++++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/gradle.properties b/gradle.properties index f9e6f7b18a..40a5d453c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.1.15.7.aar +android.jetifier.blacklist=module-service-2.1.15.9.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -89,102 +89,102 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.15 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.7 -MOGO_CORE_DATA_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_API_VERSION=0.0.57.7 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.7 -MOGO_CORE_RES_VERSION=0.0.57.7 -MOGO_CORE_UTILS_VERSION=0.0.57.7 -MOGO_CORE_NETWORK_VERSION=0.0.57.7 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.9 +MOGO_CORE_DATA_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_API_VERSION=0.0.57.9 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.9 +MOGO_CORE_RES_VERSION=0.0.57.9 +MOGO_CORE_UTILS_VERSION=0.0.57.9 +MOGO_CORE_NETWORK_VERSION=0.0.57.9 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.15.7 -MOGO_UTILS_VERSION=2.1.15.7 -MAP_AMAP_VERSION=2.1.15.7 -MAP_AUTONAVI_VERSION=2.1.15.7 -MOGO_MAP_VERSION=2.1.15.7 -MOGO_MAP_API_VERSION=2.1.15.7 -MOGO_SERVICE_VERSION=2.1.15.7 -MOGO_SERVICE_API_VERSION=2.1.15.7 -MOGO_CONNECTION_VERSION=2.1.15.7 -MOGO_MODULE_APPS_VERSION=2.1.15.7 -MOGO_MODULE_NAVI_VERSION=2.1.15.7 -MOGO_MODULE_SHARE_VERSION=2.1.15.7 -MOGO_MODULE_COMMON_VERSION=2.1.15.7 -MOGO_MODULE_MAIN_VERSION=2.1.15.7 -MOGO_MODULE_MAP_VERSION=2.1.15.7 -MOGO_MODULE_SERVICE_VERSION=2.1.15.7 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.7 -MOGO_MODULE_SEARCH_VERSION=2.1.15.7 -MOGO_MODULE_BACK_VERSION=2.1.15.7 -MOGO_MODULE_V2X_VERSION=2.1.15.7 +MOGO_COMMONS_VERSION=2.1.15.9 +MOGO_UTILS_VERSION=2.1.15.9 +MAP_AMAP_VERSION=2.1.15.9 +MAP_AUTONAVI_VERSION=2.1.15.9 +MOGO_MAP_VERSION=2.1.15.9 +MOGO_MAP_API_VERSION=2.1.15.9 +MOGO_SERVICE_VERSION=2.1.15.9 +MOGO_SERVICE_API_VERSION=2.1.15.9 +MOGO_CONNECTION_VERSION=2.1.15.9 +MOGO_MODULE_APPS_VERSION=2.1.15.9 +MOGO_MODULE_NAVI_VERSION=2.1.15.9 +MOGO_MODULE_SHARE_VERSION=2.1.15.9 +MOGO_MODULE_COMMON_VERSION=2.1.15.9 +MOGO_MODULE_MAIN_VERSION=2.1.15.9 +MOGO_MODULE_MAP_VERSION=2.1.15.9 +MOGO_MODULE_SERVICE_VERSION=2.1.15.9 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.9 +MOGO_MODULE_SEARCH_VERSION=2.1.15.9 +MOGO_MODULE_BACK_VERSION=2.1.15.9 +MOGO_MODULE_V2X_VERSION=2.1.15.9 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.15.7 +MOGO_MODULE_TANLU_VERSION=2.1.15.9 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.15.7 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.7 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.7 +MOGO_MODULE_PUSH_VERSION=2.1.15.9 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.9 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.9 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.15.7 -MOGO_TANLU_API_VERSION=2.1.15.7 +TANLULIB_VERSION=2.1.15.9 +MOGO_TANLU_API_VERSION=2.1.15.9 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.7 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.7 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.9 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.9 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.15.7 +MOGO_MODULE_WIDGETS_VERSION=2.1.15.9 # obu -MOGO_MODULE_OBU_VERSION=2.1.15.7 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.7 +MOGO_MODULE_OBU_VERSION=2.1.15.9 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.9 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.15.7 +MOGO_MODULE_MONITOR_VERSION=2.1.15.9 # bugly -CRASHREPORT_VERSION=2.1.15.7 -CRASHREPORT_BUGLY_VERSION=2.1.15.7 -CRASHREPORT_NOOP_VERSION=2.1.15.7 -CRASHREPORT_UPGRADE_VERSION=2.1.15.7 +CRASHREPORT_VERSION=2.1.15.9 +CRASHREPORT_BUGLY_VERSION=2.1.15.9 +CRASHREPORT_NOOP_VERSION=2.1.15.9 +CRASHREPORT_UPGRADE_VERSION=2.1.15.9 ## tts -TTS_BASE_VERSION=2.1.15.7 -TTS_DI_VERSION=2.1.15.7 -TTS_ZHI_VERSION=2.1.15.7 -TTS_PAD_VERSION=2.1.15.7 -TTS_NOOP_VERSION=2.1.15.7 +TTS_BASE_VERSION=2.1.15.9 +TTS_DI_VERSION=2.1.15.9 +TTS_ZHI_VERSION=2.1.15.9 +TTS_PAD_VERSION=2.1.15.9 +TTS_NOOP_VERSION=2.1.15.9 # 自研地图 -MAP_CUSTOM_VERSION=2.1.15.7 -MOGO_MODULE_ADAS_VERSION=2.1.15.7 +MAP_CUSTOM_VERSION=2.1.15.9 +MOGO_MODULE_ADAS_VERSION=2.1.15.9 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.7 -MOGO_BASE_SERVICES_APK_VERSION=2.1.15.7 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.7 -MOGO_MODULE_CHAT_VERSION=2.1.15.7 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.9 +MOGO_BASE_SERVICES_APK_VERSION=2.1.15.9 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.9 +MOGO_MODULE_CHAT_VERSION=2.1.15.9 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.15.7 +MOGO_MODULE_CARCHATTING_VERSION=2.1.15.9 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.7 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.9 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.15.7 -MOGO_SKIN_LIGHT_VERSION=2.1.15.7 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.7 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.7 -SKIN_SUPPORT_VERSION=2.1.15.7 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.7 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.7 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.7 -SKIN_SUPPORT_DESIGN_VERSION=2.1.15.7 +MOGO_SKIN_SUPPORT_VERSION=2.1.15.9 +MOGO_SKIN_LIGHT_VERSION=2.1.15.9 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.9 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.9 +SKIN_SUPPORT_VERSION=2.1.15.9 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.9 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.9 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.9 +SKIN_SUPPORT_DESIGN_VERSION=2.1.15.9 # OCH -MOGO_OCH_VERSION=2.1.15.7-test +MOGO_OCH_VERSION=2.1.15.9-test MOGO_OCH_BUS_VERSION=2.0.66 MOGO_OCH_NOOP_VERSION=2.0.66 MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.7 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.9 ################# 旧版本架构模块版本 #################