From 5fe5e0346acd53b06953b73f022225a3b7f8062b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 10 Mar 2023 11:34:41 +0800 Subject: [PATCH] =?UTF-8?q?[M2]=20UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt | 3 +++ .../src/m2/res/layout/p_m2_driving_info_fragment.xml | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index f09c063b3e..2a0dedfa46 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -60,6 +60,9 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { setViewShowState(mBackButton, INVISIBLE) setViewShowState(mStartButton, INVISIBLE) + setViewShowState(mThumbImageViewLayout, VISIBLE) + setViewShowState(mThumbImageView, VISIBLE) + setViewShowState(mTopContainer, INVISIBLE) setViewShowState(mLoadingProgressBar, INVISIBLE) diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 472a6ed211..7e60dcc4e4 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -127,8 +127,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:textStyle="bold" - android:singleLine="true" - android:ellipsize="marquee" android:text="@string/m2_p_empty_tv" android:textSize="@dimen/dp_22" android:layout_marginTop="@dimen/dp_8" @@ -187,10 +185,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:textStyle="bold" - android:singleLine="true" - android:marqueeRepeatLimit="marquee_forever" - android:ellipsize="marquee" - android:layout_marginTop="@dimen/dp_56" + android:layout_marginTop="@dimen/dp_40" android:textSize="@dimen/dp_22" app:layout_constraintRight_toRightOf="@+id/img_line_location_bg" app:layout_constraintTop_toTopOf="@+id/img_time_bg"