From a4ad075992ae5426bf0527882b677f91b1aa6138 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 12 May 2023 12:50:44 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jinlvvan/res/layout/bus_p_route_fragment.xml |  7 ++++---
 .../och/common/module/utils/BlinkAnimationUtil.java  |  4 ++--
 .../src/main/res/layout/dialog_bus_commit.xml        | 12 ++++++------
 .../src/jinlvvan/res/layout/bus_p_route_fragment.xml |  8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index 653bf6d42a..b5acaf3140 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -32,7 +32,8 @@
 
         <com.mogo.och.common.module.wigets.MarqueeTextView
             android:id="@+id/bus_p_line_name_tv"
-            android:layout_width="@dimen/dp_340"
+            android:layout_width="wrap_content"
+            android:maxWidth="@dimen/dp_340"
             android:layout_height="@dimen/dp_76"
             android:singleLine="true"
             android:ellipsize="marquee"
@@ -55,8 +56,8 @@
             android:src="@drawable/bus_line_logo"
             app:layout_constraintTop_toTopOf="@+id/bus_p_line_name_tv"
             app:layout_constraintBottom_toBottomOf="@+id/bus_p_line_name_tv"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:layout_marginLeft="@dimen/dp_160"/>
+            app:layout_constraintRight_toLeftOf="@+id/bus_p_line_name_tv"
+            android:layout_marginRight="@dimen/dp_20"/>
 
         <com.mogo.och.common.module.wigets.OCHGradientTextView
             android:id="@+id/bus_p_speed_tv"
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
index 02c67cf910..a0ebe260e9 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
@@ -22,8 +22,8 @@ public class BlinkAnimationUtil {
         AnimatorSet animationSet = new AnimatorSet();
         imageView.setTag(imageView.getId(),animationSet);
 
-        ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",0f, 1.0f);
-        ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0f);
+        ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0f);
+        ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",0f, 1.0f);
         valueAnimator.setDuration(1000);
         valueAnimatorDisappare.setDuration(800);
 
diff --git a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
index 0dcd9c9048..355b6a4a3f 100644
--- a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
+++ b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
@@ -14,8 +14,8 @@
         android:layout_height="@dimen/dp_65"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginLeft="@dimen/dp_40"
         android:src="@drawable/count_down_rotate_bg"/>
 
     <TextView
@@ -26,8 +26,8 @@
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginLeft="@dimen/dp_40"
         android:text="120"
         android:textSize="@dimen/dp_20"/>
 
@@ -63,8 +63,8 @@
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/common_tips"
-        android:layout_marginTop="80dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_136"
         />
 
     <View
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index b7ebbea089..42580f9fdf 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -24,12 +24,12 @@
 
         <com.mogo.och.common.module.wigets.MarqueeTextView
             android:id="@+id/bus_p_line_name_tv"
-            android:layout_width="@dimen/dp_698"
+            android:layout_width="wrap_content"
+            android:maxWidth="@dimen/dp_340"
             android:layout_height="@dimen/dp_76"
             android:singleLine="true"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
-            android:background="@drawable/route_line_name_bg"
             android:text="@string/bus_p_no_line"
             android:gravity="center"
             app:customGap="0.5"
@@ -48,8 +48,8 @@
             android:src="@drawable/bus_line_logo"
             app:layout_constraintTop_toTopOf="@+id/bus_p_line_name_tv"
             app:layout_constraintBottom_toBottomOf="@+id/bus_p_line_name_tv"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:layout_marginLeft="@dimen/dp_194"/>
+            app:layout_constraintRight_toLeftOf="@+id/bus_p_line_name_tv"
+            android:layout_marginRight="@dimen/dp_20"/>
 
         <com.mogo.och.common.module.wigets.OCHGradientTextView
             android:id="@+id/bus_p_speed_tv"