From 6f6c2858c92ab070dd9ce22198a982ab6c10f7a2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 25 Feb 2021 15:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sdk=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96gradle=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/launcher/MogoApplication.java | 2 +- build.gradle | 36 ++++++++----------- config.gradle | 2 +- libraries/map-custom/build.gradle | 2 +- .../map/impl/custom/CustomMapApiBuilder.java | 2 +- .../com/mogo/module/service/MogoServices.java | 3 +- .../service/impl/adas/MogoADASController.java | 12 ++----- 7 files changed, 23 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 15bc7463e8..9be9abc849 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -223,7 +223,7 @@ public class MogoApplication extends AbsMogoApplication { // 设置循环检测间隔时间 clientConfig.setLoopCheckDelay(15 * 1000); // 设置是否使用MoGoAiCloud SDK内部定位进行实时数据上报 - clientConfig.setIsUseExternalLocation(false); + clientConfig.setIsUseExternalLocation(true); // 设置DNS经纬度位置 clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() { diff --git a/build.gradle b/build.gradle index 704b9467e2..eae2a8b0ee 100644 --- a/build.gradle +++ b/build.gradle @@ -4,17 +4,14 @@ apply from: "javadoc.gradle" buildscript { repositories { - maven { - url 'http://maven.aliyun.com/nexus/content/groups/public/' - } - maven { - url 'http://nexus.zhidaoauto.com/repository/maven-releases/' - } - maven { - url 'http://nexus.zhidaoauto.com/repository/maven-public/' - } + maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } + maven { url 'http://nexus.zhidaoauto.com/repository/maven-public/' } google() - jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.5.2' @@ -30,17 +27,14 @@ buildscript { allprojects { repositories { - maven { - url 'http://maven.aliyun.com/nexus/content/groups/public/' - } - maven { - url 'http://nexus.zhidaoauto.com/repository/maven-releases/' - } - maven { - url 'http://nexus.zhidaoauto.com/repository/maven-public/' - } + maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } + maven { url 'http://nexus.zhidaoauto.com/repository/maven-public/' } google() - jcenter() // flatDir { // 由于Library module中引用了 youkuplayer 库的 aar，在多 module 的情况下， // 其他的module编译会报错，所以需要在所有工程的repositories @@ -55,7 +49,7 @@ task clean(type: Delete) { delete rootProject.buildDir } -task cleanAll(type: Delete){ +task cleanAll(type: Delete) { group = "custom" rootProject.allprojects { println "delete ${it.buildDir}" diff --git a/config.gradle b/config.gradle index 8d642a97c0..4fca06b628 100644 --- a/config.gradle +++ b/config.gradle @@ -157,7 +157,7 @@ ext { gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", - adasapi : "com.zhidao.autopilot.support:adas:1.0.6.12", + adasapi : "com.zhidao.autopilot.support:adas:1.0.6.13", adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5.2", // 个人中心的SDK diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 86ef2f6a4e..1bf145e0c2 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.1.1' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.1.7' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index b3b64de650..96a7bc6ef7 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -93,7 +93,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView( Context context ) { NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() - .setDebugMode( DebugConfig.isDebug() ) + .setDebugMode( false ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 20 ) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index d8ef1cb730..874ea57b09 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -433,7 +433,8 @@ public class MogoServices implements IMogoMapListener, return; } mRefreshModel.refreshExplorerWayData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); - if ( !DebugConfig.isNeedUploadCoordinatesDurationInTime() ) { + if ( !DebugConfig. + isNeedUploadCoordinatesDurationInTime() ) { MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat ); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 7dbeb7f816..41ee764f58 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -111,10 +111,6 @@ public class MogoADASController implements IMogoADASController { private final OnAdasListener mOnAdasListener = new OnAdasListenerAdapter() { - @Override - public void onRectData( RectInfo rectInfo ) { - } - @Override public void onWarnMessage( WarnMessageInfo warnMessageInfo ) { if ( warnMessageInfo == null ) { @@ -142,9 +138,7 @@ public class MogoADASController implements IMogoADASController { private IMogoAdasOCHCallback mAdasOCHCallback; /** - * 处理数据，将识别到的物体分组，然后每1s进行一次回调 - * 时间:系统时间 - * + * 处理数据 * @param models */ private void handleAdasRecognizedData( List< AdasAIDLOwnerCarRectModel > models ) { @@ -334,7 +328,6 @@ public class MogoADASController implements IMogoADASController { @Override public void notifyOwnerCarRect( List< AdasAIDLOwnerCarRectModel > ownerCarStateRectList ) { // 物体识别返回 - Logger.d( TAG, "onRectData = %s", ownerCarStateRectList.toString() ); Logger.d( TAG, "ADAS-REC-received data: size = %s", ownerCarStateRectList==null?0:ownerCarStateRectList.size() ); final long start = System.currentTimeMillis(); if ( mLastFrameData == null ) { @@ -556,8 +549,7 @@ public class MogoADASController implements IMogoADASController { Logger.d( TAG, "请求车模列表成功: " + o ); // 保存到sp中 String value = GsonUtil.jsonFromObject( o.getResult() ); - SharedPrefsMgr.getInstance( context ).putString( "CAR_MODEL_LIST", - value ); + SharedPrefsMgr.getInstance( context ).putString( "CAR_MODEL_LIST", value ); if ( value != null && !value.isEmpty() ) { AutopilotServiceManage.getInstance().settingCarModelListInfo( value ); }