From 18e3a96992d2dd34cf1b445e0a6adf259db8e9fc Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sun, 16 Feb 2020 20:59:36 +0800 Subject: [PATCH 1/2] bugfix: UI-318 --- .../module/service/marker/MapMarkerBaseView.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index e5d9ef4d58..881115a203 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -104,15 +104,13 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV } private Bitmap fromView( View view ) { - FrameLayout frameLayout = new FrameLayout( view.getContext() ); - frameLayout.addView( view ); - frameLayout.setDrawingCacheEnabled( true ); - processChildView( frameLayout ); - frameLayout.destroyDrawingCache(); - frameLayout.measure( View.MeasureSpec.makeMeasureSpec( 0, View.MeasureSpec.UNSPECIFIED ), View.MeasureSpec.makeMeasureSpec( 0, View.MeasureSpec.UNSPECIFIED ) ); - frameLayout.layout( 0, 0, frameLayout.getMeasuredWidth(), frameLayout.getMeasuredHeight() ); + view.setDrawingCacheEnabled( true ); + processChildView( view ); + view.destroyDrawingCache(); + view.measure( View.MeasureSpec.makeMeasureSpec( 0, View.MeasureSpec.UNSPECIFIED ), View.MeasureSpec.makeMeasureSpec( 0, View.MeasureSpec.UNSPECIFIED ) ); + view.layout( 0, 0, view.getMeasuredWidth(), view.getMeasuredHeight() ); Bitmap bitmap = null; - return ( bitmap = frameLayout.getDrawingCache() ) != null ? bitmap.copy( Bitmap.Config.ARGB_8888, false ) : null; + return ( bitmap = view.getDrawingCache() ) != null ? bitmap.copy( Bitmap.Config.ARGB_8888, false ) : null; } private void processChildView( View view ) { From 6696731725819b6ec0210f9afb77b4af600325c6 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sun, 16 Feb 2020 21:08:50 +0800 Subject: [PATCH 2/2] bugfix: UI-311 --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index d6e4faa63a..c5a642a7b5 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -256,6 +256,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mEntrance.setVisibility( View.GONE ); mFloatingLayout.setVisibility( View.GONE ); mLeftShadowFrame.setVisibility( View.GONE ); + mCardCoverUpBottomLayout.setVisibility( View.GONE ); } // 显示布局 @@ -266,6 +267,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mEntrance.setVisibility( View.VISIBLE ); mFloatingLayout.setVisibility( View.VISIBLE ); mLeftShadowFrame.setVisibility( View.VISIBLE ); + mCardCoverUpBottomLayout.setVisibility( View.VISIBLE ); } @Override