diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 51324f5adc..13038d606d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -50,6 +50,7 @@ import com.mogo.module.extensions.R; import com.mogo.module.extensions.navi.NaviInfoView; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.utils.EntranceViewHolder; +import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; import com.mogo.module.share.manager.ServiceApisManager; @@ -205,6 +206,8 @@ public class EntranceFragment extends MvpFragment()); - if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) { - mOnlineCarEntrance.setVisibility( View.VISIBLE ); - } else { - mOnlineCarEntrance.setVisibility( View.GONE ); - } + // 目的地车友的显示隐藏控制准备迁移到TopViewAnimHelper中 +// if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) { +// mOnlineCarEntrance.setVisibility( View.VISIBLE ); +// } else { +// mOnlineCarEntrance.setVisibility( View.GONE ); +// } } @Override @@ -708,7 +713,7 @@ public class EntranceFragment extends MvpFragment { topContainerNoLinkage.setChildAddedListener(null); + + NoMapTopViewShaderHelper.getInstance().showShader(); + constraintSet.clone(topMotionLayout); constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage, @@ -375,9 +374,6 @@ public class TopViewNoLinkageAnimHelper { R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP); TransitionManager.beginDelayedTransition(topMotionLayout, transition); checkCameraModePosition(false); - if (DebugConfig.isMapBased()) { - shader.setVisibility(View.VISIBLE); - } constraintSet.applyTo(topMotionLayout); int scene = Scene.AIMLESS_WITH_ROAD_EVENT; @@ -412,6 +408,7 @@ public class TopViewNoLinkageAnimHelper { statusListenerMap.get(view).beforeViewRemoveAnim(view); } isTopViewOut = true; + NoMapTopViewShaderHelper.getInstance().hideShader(); constraintSet.clone(topMotionLayout); constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage, ConstraintSet.TOP); diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 7e1bb606da..74e08b7cc3 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -132,6 +132,7 @@ 30px 120px 120px + 80px 10px 22px 28px