diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt index a613475f6e..d900f69979 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt @@ -180,7 +180,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { tvFeel.text = "" rvCommentList.visibility = View.INVISIBLE btnSubmit.visibility = View.INVISIBLE - + svpFrame.onVideoReset() clCommentContain.getLayoutParams().height = 657 clCommentContain.requestLayout() super.onDetachedFromWindow() diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java index 85bb814973..a7c868aa85 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.mogo.eagle.core.widget.glide.SkinAbleBitmapTarget; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.taxi.passenger.R; import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay; @@ -22,6 +22,15 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter itemDataList = null; private Context context = null; + private OnThumbImageClilckListener onThumbImageClilckListener; + + public OnThumbImageClilckListener getOnThumbImageClilckListener() { + return onThumbImageClilckListener; + } + + public void setOnThumbImageClilckListener(OnThumbImageClilckListener onThumbImageClilckListener) { + this.onThumbImageClilckListener = onThumbImageClilckListener; + } public RecyclerVideoAdapter(Context context, List itemDataList) { this.itemDataList = itemDataList; @@ -61,6 +70,14 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter + GSYVideoView.CURRENT_STATE_PLAYING ->{ start.setImageResource(R.drawable.notice_video_pause) - GSYVideoView.CURRENT_STATE_ERROR -> + aivStartPlay.visibility = View.GONE + } + GSYVideoView.CURRENT_STATE_ERROR ->{ start.setImageResource(R.drawable.notice_video_pause) - else -> start.setImageResource(R.drawable.notice_video_after_pause) + aivStartPlay.visibility = View.GONE + } + else -> { + start.setImageResource(R.drawable.notice_video_after_pause) + aivStartPlay.visibility = View.VISIBLE + } } } @@ -120,9 +131,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { clearFullscreenLayout(it) } fullVideoPlayer?.onVideoReset() - if (thumbImageView is ImageView) { - (thumbImageView as ImageView).setImageResource(R.drawable.taxi_p_video_holder) - } + thumbImageViewLayout.visibility = View.VISIBLE }else{ onVideoReset() } @@ -134,6 +143,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { R.id.fullscreen -> { startWindowFullscreenOwn(context, false, false) } + R.id.aiv_start_play -> { + if(currentState==GSYVideoView.CURRENT_STATE_PAUSE){ + onVideoResume(false) + }else{ + startPlayLogic() + } + } else -> {} } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png new file mode 100755 index 0000000000..7b247d6780 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png new file mode 100755 index 0000000000..7b247d6780 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml index a4ab570b9f..fcd4159d92 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml @@ -24,6 +24,16 @@ android:layout_centerInParent="true" /> + +