[m2]

[3.0.0]
[ui调整]

OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt

@@ -1,6 +1,7 @@
 package com.mogo.och.bus.passenger.ui
 
 import android.graphics.BitmapFactory
+import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
@@ -206,9 +207,13 @@ class PM2DrivingInfoFragment :
             tv_distance.text = resources.getString(R.string.m2_p_empty_remain_km)
             tv_left_time.text = resources.getString(R.string.m2_p_empty_remain_minute)
             tv_next_station_title.text = resources.getString(R.string.m2_p_station_title_arrived_tv)
+            iv_animal_list.visibility = View.VISIBLE
+            val animationDrawable = iv_animal_list.drawable as AnimationDrawable
+            animationDrawable.start()
             haveLineAndArrivedStation()
         }else{ //前往目的地中
             tv_next_station_title.text = resources.getString(R.string.shuttle_p_next_station_title)
+            iv_animal_list.visibility = View.GONE
             haveLineAndArriveingStation()
         }
     }

OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt

@@ -21,7 +21,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     init {
         hideWidget()
         GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL)
-        //GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
+        GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
     }
 
     override fun hideAllWidget() {

OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
+android:oneshot="false">
+    <item android:drawable="@drawable/m2_arrived_an_0"  android:duration="300"/>
+    <item android:drawable="@drawable/m2_arrived_an_1" android:duration="300"/>
+    <item android:drawable="@drawable/m2_arrived_an_2" android:duration="300"/>
+
+
+</animation-list>

OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml

@@ -56,7 +56,7 @@
         android:id="@+id/line_name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_20"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit="marquee_forever"
         android:maxWidth="@dimen/dp_600"
@@ -121,6 +121,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        app:layout_constraintTop_toTopOf="@+id/tv_next_station_title"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_next_station_title"
+        app:layout_constraintStart_toEndOf="@+id/tv_next_station_title"
+        android:id="@+id/iv_animal_list"
+        android:layout_width="@dimen/dp_25"
+        android:layout_height="@dimen/dp_30"
+        android:src="@drawable/bg_p_m2_arrived_station"
+        android:visibility="gone"
+        android:layout_marginStart="@dimen/dp_7" />
+
     <com.mogo.och.common.module.wigets.MarqueeTextView
         android:id="@+id/station_name_tv"
         android:layout_width="0dp"
@@ -270,7 +281,7 @@
         app:day_light_mode="true"
         app:layout_constraintLeft_toRightOf="@+id/auto_tv"
         app:layout_constraintTop_toTopOf="@+id/auto_tv"
-        app:visible="true" />
+        app:visible="false" />
 
     <!-- 红绿灯-->
 <!--    <com.mogo.och.bus.passenger.ui.widget.M2PTrafficLightView-->

OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml

@@ -29,7 +29,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:scaleType="fitXY"
         android:layout_width="1080dp"
-        android:layout_height="@dimen/dp_563"/>
+        android:layout_height="@dimen/dp_630"/>
 
 
 
@@ -56,9 +56,9 @@
         android:layout_width="match_parent"
         android:layout_marginStart="@dimen/dp_35"
         android:layout_marginEnd="@dimen/dp_35"
-        android:layout_height="@dimen/dp_490"
+        android:layout_height="@dimen/dp_492"
+        android:layout_marginTop="@dimen/dp_13"
         app:layout_constraintTop_toTopOf="@+id/och_shadow_layout"
-        app:layout_constraintBottom_toBottomOf="@+id/och_shadow_layout"
         app:layout_constraintEnd_toEndOf="@+id/och_shadow_layout"
         app:layout_constraintStart_toStartOf="@+id/och_shadow_layout"/>
 

OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml

@@ -22,7 +22,7 @@
     <string name="m2_p_empty_remain_km">—公里</string>
     <string name="m2_p_empty_remain_minute">—分钟</string>
     <string name="m2_p_arrived_station_title">请按秩序下车</string>
-    <string name="m2_p_not_select_line_content">路线加载中…</string>
+    <string name="m2_p_not_select_line_content">暂无路线</string>