diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file 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 0451406652..75c6725940 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 @@ -33,6 +33,9 @@ public class CarSeries { CAR_SERIES = CAR_SERIES_C80X; } else if ( "D801-802".equals( device ) ) { CAR_SERIES = CAR_SERIES_D80X; + } else if( "D801B-802B".equals( device )){ + // 2+16G + CAR_SERIES = CAR_SERIES_D80X; } else if ( "D811-812".equals( device ) ) { CAR_SERIES = CAR_SERIES_D81X; } else if ( "D821-822".equals( device ) ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java index 538999bbea..6883d00204 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java @@ -186,31 +186,43 @@ public class CarIconDisplayStrategy { } private void playAnim() { - for ( int i : sFrame ) { - mBitmapFrames.add( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), i ) ); + try { + for ( int i : sFrame ) { + mBitmapFrames.add( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), i ) ); + } + mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( TAG, new MogoMarkerOptions() + .icons( mBitmapFrames ) + .period( 1 ) + .zIndex( 1000 ) + .autoManager( false ) + .anchor( 0.5f, 0.5f ) + .position( MarkerServiceHandler.getMapService().getNavi( AbsMogoApplication.getApp() ).getCarLocation2() ) ); + } catch ( Exception e ) { + MarkerServiceHandler.getMapUIController().setCarCursorOption( new CarCursorOption.Builder().carCursorRes( R.drawable.module_service_ic_seek_helping_00036 ).build() ); } - mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( TAG, new MogoMarkerOptions() - .icons( mBitmapFrames ) - .period( 1 ) - .zIndex( 1000 ) - .autoManager( false ) - .anchor( 0.5f, 0.5f ) - .position( MarkerServiceHandler.getMapService().getNavi( AbsMogoApplication.getApp() ).getCarLocation2() ) ); MarkerServiceHandler.getMapUIController().showMyLocation( false ); } private void stopAnim() { - if ( mSeekHelpingMarker != null ) { - mSeekHelpingMarker.destroy(); - mSeekHelpingMarker = null; - } - if ( !mBitmapFrames.isEmpty() ) { - for ( Bitmap bitmapFrame : mBitmapFrames ) { - if ( bitmapFrame != null && !bitmapFrame.isRecycled() ) { - bitmapFrame.recycle(); - } + try { + if ( mSeekHelpingMarker != null ) { + mSeekHelpingMarker.destroy(); + mSeekHelpingMarker = null; } - mBitmapFrames.clear(); + } catch ( Exception e ) { + + } + try { + if ( !mBitmapFrames.isEmpty() ) { + for ( Bitmap bitmapFrame : mBitmapFrames ) { + if ( bitmapFrame != null && !bitmapFrame.isRecycled() ) { + bitmapFrame.recycle(); + } + } + mBitmapFrames.clear(); + } + } catch ( Exception e ) { + } MarkerServiceHandler.getMapUIController().showMyLocation( true ); }