From bbe4691c4dcbf825ce8e6ff3b0afbb92a905bd9a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 31 Mar 2020 10:44:30 +0800 Subject: [PATCH] opt --- .../com/mogo/utils/logger/LoggerPrinter.java | 2 +- .../com/mogo/module/apps/AppsPresenter.java | 22 ++++++++++++++----- .../com/mogo/module/service/MogoServices.java | 4 +++- .../service/marker/MapMarkerInfoView.java | 7 +++--- .../module/service/marker/MapMarkerView.java | 4 ++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java index d4b65ba28c..0c5fc3a233 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java @@ -56,7 +56,7 @@ final class LoggerPrinter implements Printer { public void e( String tag, Throwable throwable, String message, Object... args) { if (throwable != null && message != null) { - message = message + " : " + throwable.toString(); + message = message + " : " + Log.getStackTraceString( throwable); } if (throwable != null && message == null) { diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java index 3f2da676e7..f722a9418e 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java @@ -20,9 +20,11 @@ import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** @@ -82,13 +84,21 @@ public class AppsPresenter extends Presenter { } private Map> addGuideAppEntrance(Map> appInfoMap) { - Map> result; - if (appInfoMap == null) { - result = new HashMap<>(); - } else { - result = new HashMap<>(); - result.putAll(appInfoMap); + Map> result = new HashMap<>(); + + if ( appInfoMap != null && !appInfoMap.isEmpty() ) { + // val deep copy + Set keys = appInfoMap.keySet(); + for ( Integer key : keys ) { + List val = appInfoMap.get( key ); + try { + result.put( key, new ArrayList<>( val ) ); + } catch ( Exception e ) { + result.put( key, new ArrayList<>() ); + } + } } + if (result.isEmpty()) { result.put(0, new ArrayList<>()); } else if (result.get(result.size() - 1) == 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 99bed15dfd..ec0eb11b62 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 @@ -202,6 +202,9 @@ public class MogoServices implements IMogoMapListener, * 自动刷新：锁车、缩放比例：16、半径 2KM */ private void invokeAutoRefresh() { + if ( mStatusManager.isSearchUIShow() || mStatusManager.isADASShow() ) { + return; + } mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false ); mUiController.changeZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL ); mUiController.setLockZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL ); @@ -987,7 +990,6 @@ public class MogoServices implements IMogoMapListener, AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_BACK ); // 控制SearchUIShow 打点逻辑 setMarkerStatus(false); - } else { mUiController.showMyLocation( false ); AIAssist.getInstance( mContext ) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 9aaa8a4801..3210ed50e7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -171,10 +171,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView { clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); case MarkerPoiTypeEnum.FOURS_NEALY: - // TODO: 2020-03-30 - ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2); - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); + ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 3db36ba9a3..8ea5d8c389 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -143,8 +143,8 @@ public class MapMarkerView extends MapMarkerBaseView { ivBg.setImageResource(R.drawable.module_service_ic_rc_accident); break; case MarkerPoiTypeEnum.FOURS_NEALY: - // TODO: 2020-03-30 - ivBg.setImageResource(R.drawable.module_service_ic_rc_accident); + ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); + ivBg.setImageResource(R.drawable.bg_map_marker_blue); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);