diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data b/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data old mode 100644 new mode 100755 index 76641add90..8e06219090 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data and b/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data b/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data old mode 100644 new mode 100755 index 4bed4023d5..e5a16d46be Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data and b/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index 928180c353..b7e352c7b8 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/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() } } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index bc2d52176b..959ab497d2 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/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() { diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png new file mode 100644 index 0000000000..d316e9eb43 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png new file mode 100644 index 0000000000..54495679b5 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png new file mode 100644 index 0000000000..ba83173bb5 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png index 722c3a0787..cec9275411 100644 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml new file mode 100644 index 0000000000..6ea3fc81b6 --- /dev/null +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 61a1312d0e..66b8f6175e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/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" /> + + + app:visible="false" /> diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml index e144609f35..b14a3b9ec8 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/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"/> diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml index 9f2f2d5094..cae4941f91 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml @@ -22,7 +22,7 @@ —公里 —分钟 请按秩序下车 - 路线加载中… + 暂无路线