[m2]

[3.1.0]
[动画展示和隐藏]

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

@@ -207,13 +207,9 @@ 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()
         }
     }
@@ -250,6 +246,8 @@ class PM2DrivingInfoFragment :
         clg_distance_left_time.visibility = View.GONE
         // 到达站点
         tv_arrived_notice.visibility = View.GONE
+
+        iv_animal_list.visibility = View.GONE
     }
     // 有线路正在到站点
     fun haveLineAndArriveingStation(){
@@ -257,6 +255,7 @@ class PM2DrivingInfoFragment :
         group_stationinfo.visibility = View.VISIBLE
         clg_distance_left_time.visibility = View.VISIBLE
         tv_arrived_notice.visibility = View.GONE
+        iv_animal_list.visibility = View.GONE
     }
     // 有线路到达站点
     fun haveLineAndArrivedStation(){
@@ -264,6 +263,9 @@ class PM2DrivingInfoFragment :
         group_stationinfo.visibility = View.VISIBLE
         clg_distance_left_time.visibility = View.GONE
         tv_arrived_notice.visibility = View.VISIBLE
+        iv_animal_list.visibility = View.VISIBLE
+        val animationDrawable = iv_animal_list.drawable as AnimationDrawable
+        animationDrawable.start()
     }
 
     companion object {

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

@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         app:carDrawable="@drawable/m2_map_car_icon"
         app:endPointDrawable="@drawable/m2_map_end_icon"
-        app:isClearArrived="true"
+        app:isClearArrived="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.6"
         app:mapStyleExtraPath="@string/m2_over_map_style_extra_path"
@@ -24,6 +24,8 @@
         app:unArrivedDrawable="@drawable/m2_amap_arriving_road"
         app:mapTilt="0"
         app:leftPadding="200"
+        app:topPadding="150"
+        app:bottomPadding="50"
         app:startPointDrawable="@drawable/m2_map_start_icon" />
 
     <ImageView
@@ -286,15 +288,15 @@
         app:layout_constraintBottom_toBottomOf="parent" />
 
     <!-- 转向灯  IMoGoChassisLamplightListener-->
-<!--    <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView-->
-<!--        android:id="@+id/turn_light_view"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginLeft="@dimen/dp_12"-->
-<!--        app:day_light_mode="true"-->
-<!--        app:layout_constraintLeft_toRightOf="@+id/auto_tv"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/auto_tv"-->
-<!--        app:visible="false" />-->
+    <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
+        android:id="@+id/turn_light_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_12"
+        app:day_light_mode="true"
+        app:layout_constraintLeft_toRightOf="@+id/auto_tv"
+        app:layout_constraintTop_toTopOf="@+id/auto_tv"
+        app:visible="false" />
 
     <!-- 红绿灯-->
 <!--    <com.mogo.och.bus.passenger.ui.widget.M2PTrafficLightView-->