diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt index fc64285424..262849a027 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt @@ -82,6 +82,7 @@ object FullVideoUtils { it.setVideoAllCallBack(null) it.smalllPlayer?.clearFullscreenLayout(it) } + consultVideoPlayer.removeAllViews() } try { if (windowManager != null) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt index 2403760fbc..f41aedc586 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt @@ -146,11 +146,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { .load(taxiPassengerVideoPlay.imageUrl) .apply( RequestOptions().transform( - GlideBlurTransform( - context, - taxiPassengerVideoPlay.imageUrl, - 5 - ) + GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 5) ) ) .into(object : SimpleTarget() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java index eee5c0cfdc..06011c3833 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java @@ -24,7 +24,11 @@ public class GlideBlurTransform extends BitmapTransformation { @Override protected Bitmap transform( @NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight ) { - Bitmap bitmap = FastBlurUtil.doBlur( toTransform, 1, blurRadius ); + Bitmap lruBitmap = DiskLruCacheManager.getInstance(context).get(key); + if(lruBitmap!=null){ + return lruBitmap; + } + Bitmap bitmap = FastBlurUtil.doBlur( toTransform, 8, blurRadius ); // 缓存高斯模糊图片 DiskLruCacheManager.getInstance( context ).put( key, bitmap ); return bitmap; diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index e5d56e5114..a41b723ad6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -4,24 +4,29 @@ import android.app.Activity import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.view.* +import android.view.Gravity +import android.view.Surface +import android.view.View +import android.view.ViewGroup import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.marginTop +import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.TimeTransformUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.video.FullVideoUtils import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack -import com.shuyu.gsyvideoplayer.utils.Debuger import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView +import kotlinx.android.synthetic.main.taxi_p_video_show.view.* import java.lang.reflect.Constructor /** @@ -64,7 +69,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { ) { mThumbImageViewLayout.visibility = View.VISIBLE } - GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9) + GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL) } override fun getLayoutId(): Int { @@ -190,6 +195,15 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } } + fun fullMarainTop(){ + if(mIfCurrentIsFullscreen&&smalllPlayer!=null) { + if(mTopContainer.marginTop==0) { + val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams + layoutParams.setMargins(0, getStatusBarHeight(), 0, 0) + } + } + } + override fun setViewShowState(view: View?, visibility: Int) { if (view === mThumbImageViewLayout && visibility != View.VISIBLE) { return @@ -199,6 +213,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onSurfaceAvailable(surface: Surface) { super.onSurfaceAvailable(surface) + fullMarainTop() if (GSYVideoType.getRenderType() != GSYVideoType.TEXTURE) { if (mThumbImageViewLayout != null && mThumbImageViewLayout.visibility == View.VISIBLE) { mThumbImageViewLayout.visibility = View.INVISIBLE @@ -209,17 +224,17 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onAutoCompletion() { super.onAutoCompletion() if(mIfCurrentIsFullscreen){ - FullVideoUtils.dismissOverlayView(false) - fullVideoPlayer?.let { - clearFullscreenLayout(it) + if(smalllPlayer!=null){ + smalllPlayer?.clearFullscreenLayout(this) } + FullVideoUtils.dismissOverlayView(false) } } override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { super.onSizeChanged(w, h, oldw, oldh) if (!mIfCurrentIsFullscreen) { - this.outlineProvider = TextureVideoViewOutlineProvider(50F) + this.outlineProvider = TextureVideoViewOutlineProvider(40F) this.clipToOutline = true } } @@ -335,9 +350,9 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { frameLayout: FrameLayout) { val lp = gsyVideoPlayer.layoutParams as LayoutParams lp.setMargins(0, 0, 0, 0) - lp.height = ViewGroup.LayoutParams.MATCH_PARENT + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT lp.width = ViewGroup.LayoutParams.MATCH_PARENT - lp.gravity = Gravity.CENTER + lp.gravity = Gravity.BOTTOM gsyVideoPlayer.layoutParams = lp gsyVideoPlayer.isIfCurrentIsFullscreen = true val isVertical = isVerticalFullByVideoSize @@ -365,6 +380,12 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { checkAutoFullWithSizeAndAdaptation(gsyVideoPlayer) } + + + fun getStatusBarHeight(): Int{ + return Math.ceil((25 * context.resources.displayMetrics.density).toDouble()).toInt() + } + fun clearFullscreenLayout(gsyVideoPlayer:ConsultVideoPlayer) { mIfCurrentIsFullscreen = false val delay = 100 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png index 11d6bb65cd..3bb16d1a58 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml index db3705a9ec..af00303b21 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml index 58df86bd9c..990d3f197b 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml @@ -8,6 +8,11 @@ android:background="@color/cardview_dark_background" tools:ignore="MissingDefaultResource"> + +