yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt

Browse Source
This commit is contained in:
wangcongtao
2020-03-31 10:44:30 +08:00
parent 54c6b3ef95
commit bbe4691c4d
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java
View File

@@ -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) {

22
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
View File

@@ -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<AppsView> {
}
private Map<Integer, List<AppInfo>> addGuideAppEntrance(Map<Integer, List<AppInfo>> appInfoMap) {
Map<Integer, List<AppInfo>> result;
if (appInfoMap == null) {
result = new HashMap<>();
} else {
result = new HashMap<>();
result.putAll(appInfoMap);
Map<Integer, List<AppInfo>> result = new HashMap<>();
if ( appInfoMap != null && !appInfoMap.isEmpty() ) {
// val deep copy
Set<Integer> keys = appInfoMap.keySet();
for ( Integer key : keys ) {
List<AppInfo> 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) {

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -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 )

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
View File

@@ -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);

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
View File

@@ -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);