yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

到达目的地样式修改

Browse Source
This commit is contained in:
yangyakun
2022-06-28 13:33:58 +08:00
committed by liujing
parent 2394d58f5d
commit 09f87d02e0
15 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
View File

@@ -124,7 +124,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
});
findViewById(R.id.iv_temp).setOnClickListener(view -> {
//OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity());
OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity());
//showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728");
//showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480");
//OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext());

8
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
View File

@@ -224,15 +224,15 @@ object OverlayLeftViewUtils {
if (!isShowing) {
return
}
FullVideoUtils.dismissOverlayView(true)
// 管理的要关闭都得关闭
closeConsult()
closeMovice()
subscribe?.let {
if (!it.isDisposed) {
it.dispose()
}
}
FullVideoUtils.dismissOverlayView(true)
// 管理的要关闭都得关闭
closeConsult()
closeMovice()
subscribe = null
try {
if (windowManager != null && overlayView != null) {

26
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
View File

@@ -77,8 +77,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
var prePlayerPosition = 0
override fun pageSelect(recyclerView: RecyclerView?, newState: Int) {
//播放视频
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
indicatorView.onPageSelected(centerItemPosition)
if(player is ConsultVideoPlayer){
if(prePlayerPosition!=centerItemPosition) {
@@ -86,8 +85,8 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
player.onVideoReset()
}else{
}
val prePlayer =
carouselLayoutManager.findViewByPosition(prePlayerPosition)
val playerHolder = carouselLayoutManager.findViewByPosition(prePlayerPosition)
val prePlayer = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
prePlayer?.let {
if(it is ConsultVideoPlayer){
it.onVideoReset()
@@ -105,8 +104,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
}
override fun pageStop() {
val centerItemPosition: Int = carouselLayoutManager.getCenterItemPosition()
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
if(player is ConsultVideoPlayer){
player.onVideoPause()
}
@@ -126,8 +124,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
indicatorView.onPageScrolled(currentIndex, fl, 0)
}
recyclerVideoAdapter.setOnThumbImageClilckListener {
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
if(player is ConsultVideoPlayer) {
player.onVideoReset()
player.thumbImageViewLayout.visibility = View.VISIBLE
@@ -200,8 +197,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
super.onWindowFocusChanged(hasWindowFocus)
val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
player?.let {
if (player is ConsultVideoPlayer) {
if(hasWindowFocus){// 获取焦点两种情况
@@ -241,11 +237,17 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
}
private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair<Int, ConsultVideoPlayer?> {
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition)
val player = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
return Pair(centerItemPosition, player)
}
override fun onDetachedFromWindow() {
val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (_: Int, player) = getPlayer(carouselLayoutManager)
player?.let {
if(player is ConsultVideoPlayer){
player.currentPlayer.release()

26
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt
View File

@@ -77,8 +77,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
var prePlayerPosition = 0
override fun pageSelect(recyclerView: RecyclerView?, newState: Int) {
//播放视频
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
indicatorView.onPageSelected(centerItemPosition)
if(player is ConsultVideoPlayer){
if(prePlayerPosition!=centerItemPosition) {
@@ -86,8 +85,8 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
player.onVideoReset()
}else{
}
val prePlayer =
carouselLayoutManager.findViewByPosition(prePlayerPosition)
val playerHolder = carouselLayoutManager.findViewByPosition(prePlayerPosition)
val prePlayer = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
prePlayer?.let {
if(it is ConsultVideoPlayer){
it.onVideoReset()
@@ -105,8 +104,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
}
override fun pageStop() {
val centerItemPosition: Int = carouselLayoutManager.getCenterItemPosition()
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
if(player is ConsultVideoPlayer){
player.onVideoPause()
}
@@ -126,8 +124,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
indicatorView.onPageScrolled(currentIndex, fl, 0)
}
recyclerVideoAdapter.setOnThumbImageClilckListener {
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
if(player is ConsultVideoPlayer) {
player.onVideoReset()
player.thumbImageViewLayout.visibility = View.VISIBLE
@@ -200,8 +197,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
super.onWindowFocusChanged(hasWindowFocus)
val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
player?.let {
if (player is ConsultVideoPlayer) {
if(hasWindowFocus){// 获取焦点两种情况
@@ -241,11 +237,17 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
}
private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair<Int, ConsultVideoPlayer?> {
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition)
val player = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
return Pair(centerItemPosition, player)
}
override fun onDetachedFromWindow() {
val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager
val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
val player = carouselLayoutManager.findViewByPosition(centerItemPosition)
val (_: Int, player) = getPlayer(carouselLayoutManager)
player?.let {
if(player is ConsultVideoPlayer){
player.currentPlayer.release()

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
View File

@@ -219,7 +219,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
super.onSizeChanged(w, h, oldw, oldh)
if (!mIfCurrentIsFullscreen) {
this.outlineProvider = TextureVideoViewOutlineProvider(40F)
this.outlineProvider = TextureVideoViewOutlineProvider(50F)
this.clipToOutline = true
}
}

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 KiB

1
OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:bottomLeftRadius="50px" android:bottomRightRadius="50px"/>
<gradient android:startColor="#a3000000" android:endColor="#00000000" android:angle="90"/>
</shape>

2
OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#314F85"/>
<corners android:radius="@dimen/dp_46"/>
<corners android:radius="@dimen/dp_50"/>
</shape>

4
OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#3397FC"/>
<corners android:radius="@dimen/dp_46"/>
<gradient android:startColor="#3397FC" android:endColor="#3397FC"/>
<corners android:radius="@dimen/dp_50"/>
</shape>

4
OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:startColor="#22e5aa" android:endColor="#038f7e"/>
<corners android:radius="@dimen/dp_46"/>
<gradient android:startColor="#23FAB3" android:endColor="#009882"/>
<corners android:radius="@dimen/dp_60"/>
</shape>

18
OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml
View File

@@ -4,16 +4,16 @@
android:id="@+id/tv_comment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20px"
android:layout_marginBottom="20px"
android:layout_marginStart="10px"
android:layout_marginEnd="10px"
android:layout_marginTop="30px"
android:layout_marginBottom="30px"
android:layout_marginStart="16px"
android:layout_marginEnd="16px"
android:background="@drawable/taxi_p_comment_select"
android:button="@null"
android:paddingStart="40px"
android:paddingTop="8px"
android:paddingEnd="40px"
android:paddingBottom="8px"
android:paddingStart="45px"
android:paddingTop="15px"
android:paddingEnd="45px"
android:paddingBottom="15px"
android:textColor="@color/taxi_order_status_textColor"
android:textSize="40px"
android:textSize="46px"
tools:text="非常好" />

16
OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml
View File

@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/video_item_player"
android:layout_width="1734px"
android:layout_height="973px" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@drawable/taxi_p_video_shadow11"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer
android:id="@+id/video_item_player"
android:layout_gravity="center"
android:layout_width="1734px"
android:layout_height="973px" />
</FrameLayout>

20
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
View File

@@ -126,6 +126,7 @@
android:id="@+id/iv_star_first"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_34"
android:layout_marginEnd="3px"
app:layout_constraintTop_toBottomOf="@+id/tv_please_score"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_star_second"
@@ -135,6 +136,7 @@
<ImageView
android:id="@+id/iv_star_second"
android:layout_marginEnd="3px"
app:layout_constraintTop_toTopOf="@+id/iv_star_first"
app:layout_constraintStart_toEndOf="@+id/iv_star_first"
app:layout_constraintEnd_toStartOf="@+id/iv_star_third"
@@ -144,6 +146,7 @@
<ImageView
android:id="@+id/iv_star_third"
android:layout_marginEnd="3px"
app:layout_constraintTop_toTopOf="@+id/iv_star_second"
app:layout_constraintStart_toEndOf="@+id/iv_star_second"
app:layout_constraintEnd_toStartOf="@+id/iv_star_fourth"
@@ -153,6 +156,7 @@
<ImageView
android:id="@+id/iv_star_fourth"
android:layout_marginEnd="3px"
app:layout_constraintTop_toTopOf="@+id/iv_star_third"
app:layout_constraintStart_toEndOf="@+id/iv_star_third"
app:layout_constraintEnd_toStartOf="@+id/iv_star_fifth"
@@ -162,6 +166,7 @@
<ImageView
android:id="@+id/iv_star_fifth"
android:layout_marginEnd="3px"
app:layout_constraintTop_toTopOf="@+id/iv_star_fourth"
app:layout_constraintStart_toEndOf="@+id/iv_star_fourth"
android:src="@drawable/taxi_p_passenger_star"
@@ -170,6 +175,7 @@
<ImageView
android:id="@+id/iv_star_hide"
android:layout_marginEnd="3px"
app:layout_constraintTop_toTopOf="@+id/iv_star_fourth"
app:layout_constraintStart_toEndOf="@+id/iv_star_fourth"
android:src="@drawable/taxi_p_passenger_star"
@@ -181,11 +187,11 @@
android:id="@+id/tv_feel"
app:layout_constraintTop_toTopOf="@+id/iv_star_hide"
app:layout_constraintBottom_toBottomOf="@+id/iv_star_hide"
app:layout_constraintStart_toEndOf="@+id/iv_star_fifth"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_53"
android:textColor="#FFD868"
android:textSize="46px"
tools:text="太差了"
android:layout_marginStart="@dimen/dp_35"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -210,10 +216,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/taxi_p_comment_submit"
android:textSize="@dimen/sp_46"
android:layout_marginTop="60px"
android:layout_width="400px"
android:layout_marginBottom="80px"
android:textSize="@dimen/sp_42"
android:layout_marginTop="66px"
android:layout_marginBottom="109px"
android:paddingTop="31px"
android:paddingBottom="31px"
android:layout_width="450px"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

8
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
View File

@@ -33,9 +33,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_video_playlist"
android:layout_width="match_parent"
android:layout_height="973px"
android:layout_height="1273px"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="156px"
android:layout_marginEnd="156px"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,8 +48,8 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rv_video_playlist"
android:layout_marginTop="95px"
app:layout_constraintBottom_toBottomOf="@+id/rv_video_playlist"
android:layout_marginBottom="50px"
app:vpi_orientation="horizontal"
app:vpi_slide_mode="scale"
app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up"

1
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
View File

@@ -18,7 +18,6 @@
<ImageView
android:id="@+id/thumbImage"
android:scaleType="fitXY"
android:background="@drawable/taxi_p_video_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true" />