diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 1b82ce8c86..31ebc2b2a2 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -2,6 +2,7 @@ package com.mogo.launcher; import android.content.Context; import android.content.Intent; +import android.os.Process; import android.text.TextUtils; import android.util.Log; @@ -27,6 +28,7 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.test.crashreport.ITestCrashReportProvider; +import com.mogo.utils.ProcessUtils; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; @@ -90,7 +92,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor" ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_GLOBAL_UNWAKE,"GlobalUnwake")); + MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_GLOBAL_UNWAKE, "GlobalUnwake" ) ); if ( !DebugConfig.isLauncher() ) { PersistentManager.getInstance().initManager( this ); @@ -109,13 +111,11 @@ public class MogoApplication extends AbsMogoApplication { @Override protected boolean shouldInit() { - return !LeakCanary.isInAnalyzerProcess( this ); + Logger.w( TAG, "evaluate shouldInit() with: %s", ProcessUtils.getProcessName( Process.myPid() ) ); + return ProcessUtils.isMainProcess( this ); } private void initDebugConfig() { - if ( !shouldInit() ) { - return; - } DebugConfig.setNetMode( BuildConfig.NET_ENV ); DebugConfig.setDebug( BuildConfig.DEBUG ); DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); @@ -186,10 +186,12 @@ public class MogoApplication extends AbsMogoApplication { private void prepareSocketAndLocationServices( IMogoServiceApis apis ) { apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() ); - apis.getLocationInfoApi().start(); - apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> { - apis.getLocationInfoApi().provideLocation( location ); - } ); + if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { + apis.getLocationInfoApi().start(); + apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> { + apis.getLocationInfoApi().provideLocation( location ); + } ); + } } @Override diff --git a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java index 22e6fb427c..f49e36068e 100644 --- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java +++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java @@ -144,7 +144,6 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac if ( listener != null ) { listener.onAck( msgId ); } - Logger.d( TAG, "send message success: msgType = %d, appId = %s, productLine = %d", msgType, appId, productLine ); } catch ( InvalidProtocolBufferException e ) { e.printStackTrace(); } diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java index 3b9d54eaae..90e57647b1 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java @@ -67,7 +67,7 @@ public class ProcessUtils { * @param pid 进程号 * @return 进程名 */ - private static String getProcessName( int pid ) { + public static String getProcessName( int pid ) { BufferedReader reader = null; try { reader = new BufferedReader( new FileReader( "/proc/" + pid + "/cmdline" ) ); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index f2b1e6815d..0d2d7e1117 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -874,7 +874,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } else { if ( ( int ) location.getBearing() == 0 && mLastDriveLocationShadow != null ) { - if ( mMyLocationMarker == null ) { + if ( mMyLocationMarker == null || mMyLocationMarker.isRemoved() ) { initMyLocationMarker(); } if ( mMyLocationMarker != null ) { diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java index c100707450..bc6d302e76 100644 --- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java +++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java @@ -58,7 +58,6 @@ public class AutoNaviReceiver extends BroadcastReceiver { } int keyType = intent.getIntExtra( "KEY_TYPE", 0 ); - Logger.d( TAG, "receive: keyType = %d", keyType ); switch ( keyType ) { case 10001: handleAutoNaviInfo( context, intent ); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java index b59987f50e..94703ac3a5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java @@ -14,8 +14,16 @@ import java.lang.reflect.Method; */ public class CarSeries { - public static boolean isF8xxSeries(){ - return DebugConfig.getProductFlavor().startsWith( "f8" ); + private static boolean invokeFlag = false; + private static boolean isF8xxSeries = false; + + public static boolean isF8xxSeries() { + if ( invokeFlag ) { + return isF8xxSeries; + } + isF8xxSeries = DebugConfig.getProductFlavor().startsWith( "f8" ); + invokeFlag = true; + return isF8xxSeries; } @Deprecated @@ -46,6 +54,12 @@ public class CarSeries { @Deprecated public static int CAR_SERIES = 0; + /** + * Deprecated. + * Use {@link DebugConfig#getProductFlavor()} instead. + * + * @return + */ @Deprecated public static int getSeries() { if ( CAR_SERIES != 0 ) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index 192cdfe588..d96ea854c6 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -34,27 +34,27 @@ public abstract class BaseNaviInfoView { protected void fillNextCrossDistance( TextView target, TextView unit, int distance ) { if ( distance >= 1000 ) { target.setText( String.format( "%.1f", distance / 1000f ) ); - unit.setText( "km" ); + unit.setText( "公里" ); } else { target.setText( distance + "" ); - unit.setText( "m" ); + unit.setText( "米" ); } } protected void fillFormatSurplusDistance( int m, StringBuilder builder ) { if ( m >= 1000 ) { - builder.append( String.format( "%.1fkm", m / 1000f ) ); + builder.append( String.format( "%.1f公里", m / 1000f ) ); } else { - builder.append( m ).append( "m" ); + builder.append( m ).append( "米" ); } } protected String getFormatSurplusDistance( int m ) { if ( m >= 1000 ) { - mFormatSurplusDistanceUnit = "km"; + mFormatSurplusDistanceUnit = "公里"; return String.format( "%.1f", m / 1000f ); } else { - mFormatSurplusDistanceUnit = "m"; + mFormatSurplusDistanceUnit = "米"; return String.format( "%d", m ); } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index 1b7de74777..fd51a216fa 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -432,7 +432,6 @@ public class EventDispatchCenter implements @Override public void onLocationChanged( MogoLocation location ) { - final long start = System.currentTimeMillis(); Iterator< IMogoLocationListener > iterator = MogoRegisterCenterHandler.getInstance().getLocationListeners(); if ( iterator == null ) { return; @@ -447,7 +446,6 @@ public class EventDispatchCenter implements } } } - Logger.i( TAG, "onLocationChanged event cost " + ( System.currentTimeMillis() - start ) + "ms" ); } @Override diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java index bc1fa9ac87..e4257b5efc 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java @@ -52,8 +52,6 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { int type = intent.getIntExtra( "EXTRA_TYPE", -1 ); int operaType = intent.getIntExtra( "EXTRA_OPERA", -1 ); - Logger.d( TAG, "action = %s, keyType=%s, type=%s, operType=%s", action, keyType, type, operaType ); - if ( !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_RECV ) && !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_SEND ) ) { return; 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 cf8436d75e..aec4e89506 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 @@ -271,7 +271,6 @@ public class MogoServices implements IMogoMapListener, public void onSuccess( MarkerResponse o ) { MapMarkerManager.getInstance().onSyncMarkerResponse( o ); mLoopRequest = false; - Logger.d( TAG, "request Success." ); invokeAutoRefreshStrategy(); } @@ -472,7 +471,6 @@ public class MogoServices implements IMogoMapListener, @Override public void handleMessage( Message msg ) { super.handleMessage( msg ); - Logger.d( TAG, "current thread: %s, msg = %s", Thread.currentThread(), msg.what ); if ( msg.what == ServiceConst.MSG_MAP_CHANGED ) { if ( msg.obj instanceof RefreshObject ) { RefreshObject ro = ( ( RefreshObject ) msg.obj ); @@ -608,10 +606,8 @@ public class MogoServices implements IMogoMapListener, } private void stopAutoRefreshStrategy( boolean stopOnlineCarRefresh ) { - Logger.d( TAG, "stop auto refresh strategy" ); mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE ); if ( stopOnlineCarRefresh ) { - Logger.d( TAG, "stop online car auto refresh" ); MapMarkerManager.getInstance().stopAutoRefresh(); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java index 270dcf35d3..51e40bf2b9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java @@ -17,6 +17,5 @@ public class EmptyIntentHandler implements IntentHandler { @Override public void handle( Context context, Intent intent ) { - Logger.w( TAG, "空实现. %s", intent.getAction() ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index ef33efad2a..973f050324 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -288,7 +288,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } // 解析不同的Marker类型，然后对应的进行绘制 - Logger.d( TAG, "draw marker" ); mLastDataResult = response.getResult(); UiThreadHandler.post( () -> { @@ -419,7 +418,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, String sn = getPrimaryKeyFromEntity( markerExploreWay ); IMogoMarker mogoMarker = existCarMap.get( sn ); if ( mogoMarker == null || mogoMarker.isDestroyed() ) { - Logger.d( TAG, "draw road condition, sn = %s", sn ); try { if ( DebugConfig.isRoadEventAnimated() ) { post2AddAndStartAnimation( markerShowEntity, i * 100L ); @@ -472,7 +470,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, */ private Map< String, IMogoMarker > purgeMarkerData( List newList, String markerType ) { - final long start = System.currentTimeMillis(); Map< String, IMogoMarker > existMap = new HashMap<>(); List< IMogoMarker > allCarsList = MarkerServiceHandler.getMarkerManager().getMarkers( markerType ); if ( allCarsList == null || allCarsList.isEmpty() ) { @@ -501,7 +498,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } } allMap.clear(); - Logger.i( "timer", "purge data cost " + ( System.currentTimeMillis() - start ) + "ms" ); return existMap; } @@ -742,7 +738,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( ignoreDrawRequest() ) { return; } - Logger.d( TAG, "接收到了地图大而全数据" ); runOnTargetThread( () -> { drawMapMarker( response ); } ); @@ -776,7 +771,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, private Runnable runnable = new Runnable() { @Override public void run() { - Logger.d( TAG, "内部 - 自动刷新在线车辆" ); getOnlineCarDataImpl( mCarLatLng, false, false, ServiceConst.ONLINE_SEARCH_LIMIT, ServiceConst.ONLINE_SEARCH_RADIUS, false ); } }; @@ -813,20 +807,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mCarLatLng = latLng; } - Logger.d( TAG, "内部 - 请求执行" ); - if ( latLng == null ) { - Logger.d( TAG, "内部 - 定位为空" ); return; } if ( ignoreOnlineCarRequest() ) { - Logger.d( TAG, "内部 - 忽略请求" ); removeCarMarkers(); return; } - Logger.d( TAG, "内部 - 请求开始" ); mRefreshModel.queryOnLineCarWithRoute( latLng, onlyFocus, onlySameCity, radius, limit, false, new RefreshCallback() { @Override public void onSuccess( Object o ) { @@ -851,9 +840,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, ); } - Logger.d( TAG, "内部 - 请求完毕" ); runOnTargetThread( () -> { - Logger.d( TAG, "内部 - 请求完毕开始处理" ); trackData( size ); drawOnlineCarMarkers( onlineCarList, Integer.MAX_VALUE, fitBounds, fitBounds, mMarkerDisplayBounds, latLng ); UiThreadHandler.postDelayed( runnable, SMOOTH_DURATION * 1000 ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index 55da33b57a..9e0681abdf 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -107,9 +107,9 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter< OnlineCarPanelAdapter. } float distance = Utils.calculateLineDistance( location.getLon(), location.getLat(), lon, lat ); if ( distance >= 1000 ) { - return String.format( "%.1fKM", distance / 1000 ); + return String.format( "%.1f千米", distance / 1000 ); } else { - return String.format( "%.1fM", distance ); + return String.format( "%.1f米", distance ); } } } diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 04abbaae72..2b4ceea7d2 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -74,7 +74,7 @@ android:textColor="@color/module_services_empty_tip_textColor" android:textSize="@dimen/module_services_empty_tip_textSize" android:textStyle="bold" - tools:text="很抱歉，目的地10km内未找到车友" /> + tools:text="很抱歉，目的地10公里内未找到车友" /> 你的周围有%d个%s，请点击查看，你也可以对我说打开蘑菇出行 周围有%d个%s 亲，建议您使用蘑菇出行 - 扩大到20KM半径 - 扩大到40KM半径 + 扩大到20公里半径 + 扩大到40公里半径 距离导航目的地 查看车友信息 - 很抱歉，目的地%dKM内未找到车友 + 很抱歉，目的地%d公里内未找到车友 目的地车友 加载失败，请点击重试 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index f3d5c12454..2da020805c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -99,7 +99,7 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { SpanUtils.with(mTvAddressDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("m") + .append("米") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 97910f7114..18aeb96303 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -181,14 +181,14 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance() / 1000) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("km") + .append("公里") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } else { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) - .append("m") + .append("米") .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 19376eb451..d9448a9c36 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -230,7 +230,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { tvEventTypeTitle.setBackgroundResource(EventTypeUtils.getPoiTypeBg(mNoveltyInfo.getPoiType())); } tvEventAddress.setText(mNoveltyInfo.getAddr()); - tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "M"); + tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "米"); Calendar c = Calendar.getInstance(); c.setTimeInMillis(mNoveltyInfo.getGenerateTime()); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index a8189bcc72..15c5cae0c4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -90,14 +90,14 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder