diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 39639885f5..4f23611286 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -4,12 +4,13 @@ import android.os.Handler; import android.os.Looper; import android.view.LayoutInflater; import android.view.View; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.FragmentTransaction; import com.mogo.commons.AbsMogoApplication; @@ -50,6 +51,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml new file mode 100644 index 0000000000..9444da0304 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index f77be70e9f..93a1f6eb06 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -5,9 +5,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/taxi_p_arrive_end_panel_bg" + android:id="@+id/cl_content" tools:ignore="MissingDefaultResource"> @dimen/dp_56 + + \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/OverlayViewUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/OverlayViewUtils.java index e65a5b3c52..01636086ac 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/OverlayViewUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/OverlayViewUtils.java @@ -23,10 +23,14 @@ public class OverlayViewUtils { */ private static View lastOverlayView; + public static void showOverlayView(Activity context, View overlayView){ + showOverlayView(context,overlayView,-1); + } + /** * 添加覆盖View在Activity上面 */ - public static void showOverlayView(Activity context, View overlayView) { + public static void showOverlayView(Activity context, View overlayView,int ani) { if (applicationContext == null) { applicationContext = context.getApplicationContext(); } @@ -50,7 +54,9 @@ public class OverlayViewUtils { params.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; // 没有边界限制,允许窗口扩展到屏幕外 params.flags = WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS; - + if(ani!=-1){ + params.windowAnimations = ani; + } // 如果正在展示中,并且lastOverlayView不为null,先做移除操作,保证覆盖在最上面的View只有一个,防止叠加导致无法移除 if (lastOverlayView != null) {