diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt index bc73f62522..ccd4886280 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt @@ -22,7 +22,12 @@ class CommentAdapter(private val context: Context?,private val itemDataList: Mut this.notifyDataSetChanged() } fun getSelectComment(): List { - return itemDataList.filter { it.isSelect } + return itemDataList.filter { + if(it.isSelect==null){ + it.isSelect = false + } + it.isSelect + } } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemCommentHolder { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt index e08b6777ad..b88cee347a 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt @@ -165,7 +165,11 @@ object OverlayLeftViewUtils { * 打开状态栏 */ private fun open(overlayView: View,windowManager: WindowManager?) { - acivOpenClose?.setImageResource(R.drawable.ic_baseline_arrow_right_24) + acivOpenClose?.apply { + pivotX = (width /2).toFloat() + pivotY = (height /2).toFloat() + rotation = 180f + } params?.x = 0 windowManager?.updateViewLayout(overlayView, params) closeByTime(overlayView, windowManager) @@ -193,7 +197,11 @@ object OverlayLeftViewUtils { * 关闭状态栏 */ private fun close(overlayView: View,windowManager: WindowManager?) { - acivOpenClose?.setImageResource(R.drawable.ic_baseline_arrow_left_24) + acivOpenClose?.apply { + pivotX = (width /2).toFloat() + pivotY = (height /2).toFloat() + rotation = 0f + } params?.x = DEVIATION_WIDTH windowManager?.updateViewLayout(overlayView, params) } 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 4b6732a813..c9ea5579d1 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 @@ -70,7 +70,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { indicatorView.setSlideMode(IndicatorSlideMode.SCALE) indicatorView.setOrientation(IndicatorOrientation.INDICATOR_HORIZONTAL) indicatorView.setIndicatorStyle(IndicatorStyle.ROUND_RECT) - indicatorView.setSliderColor(Color.parseColor("#80FFFFFF"), Color.parseColor("#2972FF")) + indicatorView.setSliderColor(Color.parseColor("#80FFFFFF"), Color.parseColor("#2972FF"),Color.parseColor("#27C8FF")) indicatorView.setSliderWidth(16f, 101f) indicatorView.setSliderHeight(16f) indicatorView.setSliderGap(30f) @@ -94,9 +94,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { } } val taxiPassengerVideoPlay = arrayListOf[centerItemPosition] - if (player.getVideoAllCallBack()==null) { - setBackageAndPlayNext(taxiPassengerVideoPlay, player, centerItemPosition) - } + setBackageAndPlayNext(taxiPassengerVideoPlay, player, centerItemPosition) }else{ player.onVideoResume(false) } @@ -147,7 +145,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { .load(taxiPassengerVideoPlay.imageUrl) .apply( RequestOptions().transform( - GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 5) + GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 85) ) ) .into(object : SimpleTarget() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt index da3d73b419..463bf8749d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt @@ -70,9 +70,10 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { indicatorView.setSlideMode(IndicatorSlideMode.SCALE) indicatorView.setOrientation(IndicatorOrientation.INDICATOR_HORIZONTAL) indicatorView.setIndicatorStyle(IndicatorStyle.ROUND_RECT) - indicatorView.setSliderColor(Color.parseColor("#80FFFFFF"), Color.parseColor("#2972FF")) - indicatorView.setSliderWidth(14f, 90f) - indicatorView.setSliderHeight(14f) + indicatorView.setSliderColor(Color.parseColor("#80FFFFFF"), Color.parseColor("#2972FF"),Color.parseColor("#27C8FF")) + indicatorView.setSliderWidth(16f, 101f) + indicatorView.setSliderHeight(16f) + indicatorView.setSliderGap(30f) rvVideoPlaylist.addOnScrollListener(object: CenterScrollListener() { var prePlayerPosition = 0 override fun pageSelect(recyclerView: RecyclerView?, newState: Int) { @@ -93,9 +94,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { } } val taxiPassengerVideoPlay = arrayListOf[centerItemPosition] - if (player.getVideoAllCallBack()==null) { - setBackageAndPlayNext(taxiPassengerVideoPlay, player, centerItemPosition) - } + setBackageAndPlayNext(taxiPassengerVideoPlay, player, centerItemPosition) }else{ player.onVideoResume(false) } @@ -146,11 +145,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { .load(taxiPassengerVideoPlay.imageUrl) .apply( RequestOptions().transform( - GlideBlurTransform( - context, - taxiPassengerVideoPlay.imageUrl, - 5 - ) + GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 85) ) ) .into(object : SimpleTarget() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java index bbd7537f0b..e77f40efe4 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java @@ -1,6 +1,7 @@ package com.mogo.och.taxi.passenger.ui.video.layoutmanage; import android.graphics.PointF; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Parcel; @@ -519,6 +520,11 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements Math.round(end + transformation.mTranslationX), Math.round(bottom + transformation.mTranslationY)); view.setScaleX(transformation.mScaleX); view.setScaleY(transformation.mScaleY); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + view.setTransitionAlpha(transformation.mAlpha); + }else { + view.setAlpha(transformation.mAlpha); + } } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java index 925b89ffa3..c07919ed5e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java @@ -33,15 +33,10 @@ public class CarouselZoomPostLayoutListener extends CarouselLayoutManager.PostLa translateY = Math.signum(itemPositionToCenterDiff) * translateYGeneral; translateX = 0; } else { - final float translateXGeneral = child.getMeasuredWidth() * (1 - scale) / 2f; + final float translateXGeneral = (child.getMeasuredWidth()*0.9f) * (1 - scale) / 2f; translateX = Math.signum(itemPositionToCenterDiff) * translateXGeneral; translateY = 0; } - if(Math.abs(itemPositionToCenterDiff)==1){ - if(child instanceof ConsultVideoPlayer){ - ((ConsultVideoPlayer)child).hideAllWidget(); - } - } - return new ItemTransformation(scale, scale, translateX, translateY); + return new ItemTransformation(scale,scale, scale, translateX, translateY); } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java index 14003ca28b..c0851112ab 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java @@ -2,15 +2,17 @@ package com.mogo.och.taxi.passenger.ui.video.layoutmanage; public class ItemTransformation { + final float mAlpha; final float mScaleX; final float mScaleY; final float mTranslationX; final float mTranslationY; - public ItemTransformation(final float scaleX, final float scaleY, final float translationX, final float translationY) { + public ItemTransformation(final float alpha,final float scaleX, final float scaleY, final float translationX, final float translationY) { mScaleX = scaleX; mScaleY = scaleY; mTranslationX = translationX; mTranslationY = translationY; + mAlpha = alpha; } } \ No newline at end of file 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 06011c3833..8338546d19 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 @@ -28,7 +28,7 @@ public class GlideBlurTransform extends BitmapTransformation { if(lruBitmap!=null){ return lruBitmap; } - Bitmap bitmap = FastBlurUtil.doBlur( toTransform, 8, blurRadius ); + Bitmap bitmap = FastBlurUtil.doBlur( toTransform, 1, 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 324eb8938b..303ceaabe3 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 @@ -93,7 +93,12 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToNormal() { super.changeUiToNormal() - setViewShowState(mTopContainer, INVISIBLE) + setViewShowState(fullscreenButton, INVISIBLE) + } + + override fun changeUiToPlayingShow() { + super.changeUiToPlayingShow() + setViewShowState(fullscreenButton, VISIBLE) } public override fun hideAllWidget() { @@ -202,7 +207,10 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { if(mIfCurrentIsFullscreen&&smalllPlayer!=null) { if(mTopContainer.marginTop==0) { val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams - layoutParams.setMargins(0, getStatusBarHeight(), 0, 0) + //layoutParams.setMargins(0, getStatusBarHeight(), 0, 0) + layoutParams.height = 316 + mTopContainer.setPadding(93,0,93,0) + mTopContainer.layoutParams = layoutParams } } } @@ -237,7 +245,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(38F) this.clipToOutline = true } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt index 9a7e19ef07..4cfeac55eb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt @@ -150,9 +150,10 @@ open class BaseIndicatorView constructor( fun setSliderColor( @ColorInt normalColor: Int, - @ColorInt selectedColor: Int + @ColorInt selectedColor: Int, + @ColorInt selectedEndColor: Int ): BaseIndicatorView { - mIndicatorOptions.setSliderColor(normalColor, selectedColor) + mIndicatorOptions.setSliderColor(normalColor, selectedColor,selectedEndColor) return this } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt index 9e4cab5f9c..a0d1367e84 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt @@ -54,7 +54,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : (i * normalWidth + i * indicatorGap) } mRectF.set(left, 0f, left + normalWidth, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,mRectF.width()>checkedWidth/2) } i == currentPosition -> { mPaint.color = checkedColor @@ -68,7 +68,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : (mIndicatorOptions.pageSize - 1) * (normalWidth + mIndicatorOptions.sliderGap) + checkedWidth val left = right - checkedWidth + (checkedWidth - normalWidth) * (slideProgress) mRectF.set(left, 0f, right, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,mRectF.width()>checkedWidth/2) } else { if (slideProgress < 1) { val evaluate = argbEvaluator?.evaluate( @@ -78,7 +78,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : val left = i * normalWidth + i * indicatorGap val right = left + normalWidth + (checkedWidth - normalWidth) * (1 - slideProgress) mRectF.set(left, 0f, right, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,mRectF.width()>checkedWidth/2) } } @@ -92,7 +92,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : val right = left + normalWidth + (checkedWidth - normalWidth) * slideProgress mRectF.set(left, 0f, right, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,mRectF.width()>checkedWidth/2) } } else { if (slideProgress > 0) { @@ -104,7 +104,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : i * normalWidth + i * indicatorGap + normalWidth + (indicatorGap + checkedWidth) val left = right - (normalWidth) - (checkedWidth - normalWidth) * (slideProgress) mRectF.set(left, 0f, right, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,mRectF.width()>checkedWidth/2) } } } @@ -113,7 +113,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : mPaint.color = mIndicatorOptions.normalSliderColor val left = i * minWidth + i * indicatorGap + (checkedWidth - minWidth) mRectF.set(left, 0f, left + minWidth, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,false) } } } @@ -127,7 +127,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : mPaint.color = mIndicatorOptions.normalSliderColor val left = i * maxWidth + i * +mIndicatorOptions.sliderGap + (maxWidth - minWidth) mRectF.set(left, 0f, left + minWidth, mIndicatorOptions.sliderHeight) - drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight) + drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight,false) } } @@ -141,7 +141,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : mPaint.color = if (i == mIndicatorOptions.currentPosition) mIndicatorOptions.checkedSliderColor else mIndicatorOptions.normalSliderColor mRectF.set(left, 0f, left + sliderWidth, mIndicatorOptions.sliderHeight) - drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight) + drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight,false) left += sliderWidth + mIndicatorOptions.sliderGap } } @@ -165,7 +165,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : ) mPaint.color = (evaluate as Int) mRectF.set(left, 0f, left + minWidth, mIndicatorOptions.sliderHeight) - drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight) + drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight,false) } var nextSliderLeft = left + mIndicatorOptions.sliderGap + mIndicatorOptions.normalSliderWidth @@ -177,7 +177,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : ) mPaint.color = evaluate as Int mRectF.set(nextSliderLeft, 0f, nextSliderLeft + minWidth, mIndicatorOptions.sliderHeight) - drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight) + drawRoundRect(canvas, mIndicatorOptions.sliderHeight, mIndicatorOptions.sliderHeight,false) } private fun drawWormSlider(canvas: Canvas) { @@ -194,7 +194,7 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : distance ) + mIndicatorOptions.normalSliderWidth / 2 mRectF.set(left, 0f, right, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,false) } private fun drawSmoothSlider(canvas: Canvas) { @@ -204,13 +204,14 @@ open class RectDrawer internal constructor(indicatorOptions: IndicatorOptions) : val left = currentPosition * maxWidth + currentPosition * +indicatorGap + (maxWidth + indicatorGap) * mIndicatorOptions.slideProgress mRectF.set(left, 0f, left + maxWidth, sliderHeight) - drawRoundRect(canvas, sliderHeight, sliderHeight) + drawRoundRect(canvas, sliderHeight, sliderHeight,false) } protected open fun drawRoundRect( canvas: Canvas, rx: Float, - ry: Float + ry: Float, + isWidth:Boolean ) { drawDash(canvas) } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt index 78c77633f4..37f2a2c62d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt @@ -1,24 +1,39 @@ package com.mogo.och.taxi.passenger.widget.indicator.drawer import android.graphics.Canvas - +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Shader import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions + /** * 
  * Created by zhpan on 2019/11/26.
  * Description:
* */ -class RoundRectDrawer internal constructor(indicatorOptions: IndicatorOptions) : RectDrawer( +class RoundRectDrawer internal constructor(val indicatorOptions: IndicatorOptions) : RectDrawer( indicatorOptions ) { - override fun drawRoundRect( - canvas: Canvas, - rx: Float, - ry: Float - ) { + override fun drawRoundRect(canvas: Canvas, rx: Float, ry: Float, isWidth: Boolean) { + if(isWidth) { + val linearGradient = + LinearGradient( + mRectF.left, + (mRectF.bottom - mRectF.top) / 2, + mRectF.right, + (mRectF.bottom - mRectF.top) / 2, + indicatorOptions.checkedSliderColor, + indicatorOptions.checkedEndSliderColor, + Shader.TileMode.CLAMP + ) + mPaint.shader = linearGradient + }else{ + mPaint.color = indicatorOptions.normalSliderColor + mPaint.shader = null + } canvas.drawRoundRect(mRectF, rx, ry, mPaint) } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt index 168342d080..47a993e1d7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt @@ -47,6 +47,10 @@ class IndicatorOptions { * 选中时Indicator颜色 */ var checkedSliderColor: Int = 0 + /** + * 选中时IndicatorEnd颜色 + */ + var checkedEndSliderColor: Int = 0 /** * Indicator间距 @@ -100,9 +104,11 @@ class IndicatorOptions { fun setSliderColor( normalColor: Int, - checkedColor: Int + checkedColor: Int, + selectedEndColor: Int ) { this.normalSliderColor = normalColor this.checkedSliderColor = checkedColor + this.checkedEndSliderColor = selectedEndColor } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png index d8084f5fce..0762a845e9 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png index 90f33faa6d..24fee28781 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png new file mode 100644 index 0000000000..63c2024754 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png old mode 100755 new mode 100644 index 55997f4ed2..b188a5c0d6 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png differ 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 old mode 100755 new mode 100644 index 7b247d6780..ff5fb41cab Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png 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_change_full.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png index d8084f5fce..0762a845e9 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png index 90f33faa6d..24fee28781 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_left_flow_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_left_flow_bg.png index c4a7c79f53..63c2024754 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_left_flow_bg.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_left_flow_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png old mode 100755 new mode 100644 index 55997f4ed2..b188a5c0d6 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.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 old mode 100755 new mode 100644 index 7b247d6780..ff5fb41cab Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png 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/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 3bb16d1a58..24a02712f9 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_top.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml new file mode 100644 index 0000000000..9f60d99323 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow.png new file mode 100644 index 0000000000..cee67737c1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml index d593c74acf..c516964991 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml @@ -16,11 +16,11 @@ - + - + \ 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 e361c06ec8..8fc00d3235 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 @@ -28,9 +28,10 @@ app:layout_constraintTop_toTopOf="@+id/aciv_title_icon" app:layout_constraintBottom_toBottomOf="@+id/aciv_title_icon" app:layout_constraintStart_toEndOf="@+id/aciv_title_icon" - android:layout_marginStart="@dimen/dp_13" android:text="蘑菇资讯" + android:textStyle="bold" android:textSize="60px" + android:includeFontPadding="false" android:textColor="@color/taxi_order_status_textColor" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -40,8 +41,7 @@ android:layout_width="match_parent" android:layout_height="1294px" android:orientation="horizontal" - android:layout_marginStart="156px" - android:layout_marginEnd="156px" + android:layout_marginTop="-40px" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_mogo_consult"/> @@ -53,7 +53,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="132px" + android:layout_marginBottom="172px" app:vpi_orientation="horizontal" app:vpi_slide_mode="scale" app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml index 6698f08824..5585bf4b37 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml @@ -8,6 +8,12 @@ android:background="@color/cardview_dark_background" tools:ignore="MissingDefaultResource"> + + + @@ -33,11 +40,9 @@ @@ -48,8 +53,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="parent" + android:layout_marginBottom="172px" app:vpi_orientation="horizontal" app:vpi_slide_mode="scale" app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up" 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 41960139e5..000cc366cc 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 @@ -15,12 +15,13 @@ android:id="@+id/thumb" android:layout_width="match_parent" android:layout_height="match_parent"> + + android:layout_centerInParent="true" + android:scaleType="fitXY" /> @@ -103,8 +106,8 @@ app:layout_constraintTop_toTopOf="@+id/total" app:layout_constraintBottom_toBottomOf="@+id/total" android:max="100" - android:maxHeight="10px" - android:minHeight="10px" + android:maxHeight="4px" + android:minHeight="4px" android:progressDrawable="@drawable/taxi_video_seekbar_style" android:thumb="@drawable/bg_taxi_p_video_index" /> @@ -117,8 +120,7 @@ app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="64px" android:gravity="bottom" - android:text="08:66" - android:layout_marginEnd="47px" + android:layout_marginEnd="55px" android:textSize="36px" android:textColor="@android:color/white"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml index 747e1776e8..1d58c0314c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml @@ -14,10 +14,11 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" + android:paddingTop="153px" android:layout_marginEnd="143px" android:divider="@null" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="match_parent"/> + android:layout_marginStart="14px" + android:src="@drawable/ic_baseline_arrow" + android:layout_width="25px" + android:layout_height="33px"/>