From b228c39f87881ef31a1bc94e3dc21548fac0a602 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 22 Dec 2021 19:31:26 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=85=B3=E9=97=AD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 2 +- .../core/function/smp/SmallMapDirectionView.java | 2 +- .../v2x/trafficlight/core/MogoTrafficLightManager.kt | 2 +- .../trafficlight/network/TrafficLightNetWorkModel.kt | 2 +- gradle.properties | 2 +- .../mogo/map/impl/custom/CustomMapApiBuilder.java | 2 +- .../com/mogo/module/adas/OnAdasListenerAdapter.java | 2 +- .../java/com/mogo/module/service/MogoServices.java | 12 +++++------- .../routeoverlay/MogoRouteOverlayManager.java | 2 +- .../service/routeoverlay/RouteOverlayDrawer.java | 4 ++-- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0380eea58..c090a7d221 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -212,7 +212,7 @@ dependencies { implementation rootProject.ext.dependencies.callchatprovider implementation rootProject.ext.dependencies.mapcustom implementation rootProject.ext.dependencies.crashreportupgrade - implementation rootProject.ext.dependencies.crashreportbugly +// implementation rootProject.ext.dependencies.crashreportbugly implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_main 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 62a2521940..cf8c67d41f 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 @@ -181,7 +181,7 @@ public class SmallMapDirectionView @Override public void onLocationChanged(@Nullable MogoLocation location) { - Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude()); + //Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude()); LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude()); //更新车辆位置 if (mCarMarker != null) { 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 49ddedb289..a64045e0fc 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 @@ -62,7 +62,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { roadIDResult = it }, { - Logger.e(TAG, "request road id error : $it") + Logger.w(TAG, "request road id error : $it") }) } }, { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index fad8661639..107e3104a8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -40,7 +40,7 @@ class TrafficLightNetWorkModel { } } onSuccess { - if (it.result != null) { + if (it?.result != null) { if (it.result.rsCrossId.isNotEmpty() && !it.result.rectLatLngs.isNullOrEmpty()) { onSuccess.invoke(it.result) } else { diff --git a/gradle.properties b/gradle.properties index e76c400042..f86512241a 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 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 577f0595fb..026800b517 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 @@ -74,7 +74,7 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { Log.d(TAG, "setDebugMode==true"); MapParams mapParams = MapParams.Companion.init(); - mapParams.setDebugMode(true) + mapParams.setDebugMode(false) //.setDataFileSource(1) //todo 1-使用本地地图数据，0-使用在线地图数据 .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_2D) diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java index ed4b80d9b0..18ff9d0f7e 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java @@ -60,7 +60,7 @@ public class OnAdasListenerAdapter implements OnAdasListener { if (bean != null) { int turn_light = bean.getTurn_light(); //转向灯状态 0是正常 1是左转 2是右转 - Logger.d(TAG, "onCarStateData ---- turn_light = " + turn_light); + //Logger.d(TAG, "onCarStateData ---- turn_light = " + turn_light); AmiClientManager.getInstance().setTurnLightState(turn_light); } else { Logger.e(TAG, "bean == null "); 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 f679671435..0e2aad5737 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 @@ -1,6 +1,5 @@ package com.mogo.module.service; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -17,11 +16,13 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.storage.SpStorage; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; -import com.mogo.map.IDestroyable; +import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler; +import com.mogo.map.IDestroyable; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNavi; @@ -32,10 +33,10 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; +import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.service.autopilot.AutoPilotRemoteController; import com.mogo.module.service.handler.MainLooperHandler; import com.mogo.module.service.handler.RefreshWorkThreadHandler; @@ -53,7 +54,6 @@ import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.adas.IMogoAdasCarDataCallback; -import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.intent.IMogoIntentListener; @@ -66,9 +66,7 @@ import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.NetworkUtils; -import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler; import com.mogo.utils.logger.Logger; -import com.zhidao.locupload.service.UploadDataService; import org.json.JSONObject; 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 0bfae02dc8..7c04820b4d 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 @@ -85,7 +85,7 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) { this.STATUS_AUTOPILOT = autoPilotStatusInfo.getControl_pilotmode(); - Log.d("lianglihui","onAutopilotStatusResponse:"+STATUS_AUTOPILOT); + //Log.d("lianglihui","onAutopilotStatusResponse:"+STATUS_AUTOPILOT); if (STATUS_AUTOPILOT == 1 && mEnding != null){ RouteOverlayDrawer.getInstance(mContext).addEndingMarker(mEnding.lat,mEnding.lon); }else { 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 3dbb5beefb..f1044fe84c 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 @@ -87,7 +87,7 @@ public class RouteOverlayDrawer { // .object(markerShowEntity) } markderOptions.latitude(lat).longitude(lon); - Log.d("lianglihui","addEndingMarker-"+lat+":"+lon); + //Log.d("lianglihui","addEndingMarker-"+lat+":"+lon); endMarker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerType, markderOptions); if (DebugConfig.isDebug()){ ToastUtils.showLong("绘制终点marker,"+lat+":"+lon); @@ -104,7 +104,7 @@ public class RouteOverlayDrawer { } public void clearEndingMarker(){ - Log.d("lianglihui","clearEndingMarker"); + //Log.d("lianglihui","clearEndingMarker"); endMarker = null; MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).removeMarkers(markerType); }