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 8c20c113b0..771f33071d 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 @@ -62,9 +62,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment mArrivedEndView; private WeakReference mArrivedCheckView; private WeakReference mStartAutopilotView; - - private View vOpenLeft; - protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null; private Handler mHandler = new Handler(Looper.getMainLooper()); @@ -99,7 +96,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment { OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(),0,true,-1,true); - OverlayLeftViewUtils.INSTANCE.addDragTarget(vOpenLeft); //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728"); //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext()); @@ -248,7 +243,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment(android.R.id.content) + val textView = View(context) + textView.id = R.id.ids_video_anchor + addDragTarget(textView) + val param: FrameLayout.LayoutParams = + FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,FrameLayout.LayoutParams.WRAP_CONTENT) + param.gravity = Gravity.CENTER_VERTICAL + param.width = 143 + param.height = 308 + textView.layoutParams = param + content.addView(textView) + } catch (e: java.lang.Exception) { + e.printStackTrace() + } + } + /** * 打开状态栏 */ diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt index ed390b6312..0fbd7425e9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt @@ -49,7 +49,6 @@ class VideoActivity : AppCompatActivity() { private var rvVideoPlaylist: RecyclerView?=null private lateinit var indicatorView: IndicatorView private lateinit var clContain: ConstraintLayout - private var vOpenLeft: View?=null private lateinit var acivTitleIcon: AppCompatImageView private lateinit var tvTitle: TextView @@ -116,6 +115,8 @@ class VideoActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) EventBus.getDefault().register(this) + setContentView(R.layout.taxi_p_arrived_mogo_consult) + initView() configPage() } @@ -128,8 +129,6 @@ class VideoActivity : AppCompatActivity() { private fun configPage() { FullVideoUtils.dismissOverlayView(true) releaseOnNewInstance() - setContentView(R.layout.taxi_p_arrived_mogo_consult) - initView() when (intent.getIntExtra(VIDEOTYPE, VIDEOTYPE_CONSULT)) { VIDEOTYPE_CONSULT -> { videotype = VIDEOTYPE_CONSULT @@ -295,14 +294,12 @@ class VideoActivity : AppCompatActivity() { } private fun initListener() { - OverlayLeftViewUtils.addDragTarget(vOpenLeft) } private fun initView() { rvVideoPlaylist = findViewById(R.id.rv_video_playlist) indicatorView = findViewById(R.id.indicatorView) clContain = findViewById(R.id.cl_contain) - vOpenLeft = findViewById(R.id.v_open_left) acivTitleIcon = findViewById(R.id.aciv_title_icon) tvTitle = findViewById(R.id.tv_mogo_consult) acivTitleIcon.setOnClickListener { @@ -313,21 +310,6 @@ class VideoActivity : AppCompatActivity() { private fun setBackageAndPlayNext(taxiPassengerVideoPlay: TaxiPassengerVideoPlay) { // 设置背景图片 - Glide.with(this).asBitmap() - .load(taxiPassengerVideoPlay.imageUrl) - .apply( - RequestOptions().transform( - GlideBlurTransform(taxiPassengerVideoPlay.imageUrl, 100) - ).diskCacheStrategy(DiskCacheStrategy.RESOURCE) - ) - .into(object : SimpleTarget() { - override fun onResourceReady( - resource: Bitmap, - transition: Transition? - ) { - clContain.background = BitmapDrawable(resources, resource) - } - }) } override fun onAttachedToWindow() { @@ -416,7 +398,6 @@ class VideoActivity : AppCompatActivity() { } } FullVideoUtils.dismissOverlayView(true) - OverlayLeftViewUtils.removeDragTarget(vOpenLeft) } override fun onBackPressed() {} 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 c07919ed5e..1cc637c37e 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,10 +33,10 @@ public class CarouselZoomPostLayoutListener extends CarouselLayoutManager.PostLa translateY = Math.signum(itemPositionToCenterDiff) * translateYGeneral; translateX = 0; } else { - final float translateXGeneral = (child.getMeasuredWidth()*0.9f) * (1 - scale) / 2f; + final float translateXGeneral = child.getMeasuredWidth() * (1 - scale)/8; translateX = Math.signum(itemPositionToCenterDiff) * translateXGeneral; translateY = 0; } - return new ItemTransformation(scale,scale, scale, translateX, translateY); + return new ItemTransformation(scale,scale, scale, 0, translateY); } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png new file mode 100755 index 0000000000..ac5e8d79d7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png new file mode 100644 index 0000000000..4192d9cbd7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png new file mode 100644 index 0000000000..f9b70e6888 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png new file mode 100755 index 0000000000..ac5e8d79d7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png new file mode 100644 index 0000000000..4192d9cbd7 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png new file mode 100644 index 0000000000..f9b70e6888 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml new file mode 100644 index 0000000000..d4125c5071 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml index 111239bbfe..c69b23bfc8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml @@ -1,14 +1,25 @@ + android:background="@drawable/bg_taxi_p_video_bg_shape" + android:layout_width="1620px" + android:layout_height="940px"> + + + + + android:layout_gravity="center" + android:layout_width="1560px" + android:layout_height="876px" /> 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 6d7db62b32..055cfe963e 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 @@ -5,14 +5,9 @@ android:id="@+id/cl_contain" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/cardview_dark_background" + android:background="@drawable/taxi_p_video_bg" tools:ignore="MissingDefaultResource"> - - @@ -61,14 +57,6 @@ app:vpi_slider_radius="@dimen/dp_20" app:vpi_style="round_rect" /> - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 7603c18a21..0cfb6db266 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -28,15 +28,6 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - + + + \ No newline at end of file