diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
index 4cd44d6cdf..dcd51a20d0 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
@@ -197,7 +197,8 @@ class BusPassengerFunctionSoftFragment :
}
}
if(HorizontalDecoration.distance!=0){
- rv_aircondition_temperature.smoothScrollToPosition(data.size-1)
+ rv_aircondition_temperature.scrollToPosition(data.size-1)
+ adapter.setCheckIndex(data.size-1)
}
}
@@ -326,7 +327,9 @@ class BusPassengerFunctionSoftFragment :
val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter
if(enable){
adapter.setEnable(true)
- iv_temperature_select.visibility = View.VISIBLE
+ if(rg_select_function.checkedRadioButtonId==R.id.tv_setting_aircondition) {
+ iv_temperature_select.visibility = View.VISIBLE
+ }
rb_wind_speed_low.setTextColor(ContextCompat.getColorStateList(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector))
}else{
adapter.setEnable(false)
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
index c62073bf50..d351df0d90 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
@@ -58,7 +58,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag)
override fun init(context: Context) {
- mEnlargeImageRes = R.drawable.taxi_p_change_full
+ mEnlargeImageRes = R.drawable.bus_p_function_video_player_change_full
super.init(context)
start = findViewById(R.id.start)
coverImage = findViewById(R.id.thumbImage)
@@ -78,7 +78,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
aivStartPlay.scaleX = 0.8f
aivStartPlay.scaleY = 0.8f
- mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.bg_taxi_p_video_index,0.66f,0.66f)
+ mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_samll)
}
private fun addDrageAnchor(){
@@ -105,8 +105,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
titleTextView.layoutParams = layoutParams1
aivStartPlay.scaleX = 1f
aivStartPlay.scaleY = 1f
- val drawable = ActivityCompat.getDrawable(context, R.drawable.bg_taxi_p_video_index)
- mProgressBar.thumb = drawable
+ mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_big)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
mProgressBar.maxHeight = 6
mProgressBar.minHeight = 6
@@ -122,11 +121,19 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
override fun updateStartImage() {
when (mCurrentState) {
GSYVideoView.CURRENT_STATE_PLAYING ->{
- start.setImageResource(R.drawable.notice_video_pause)
+ if(isIfCurrentIsFullscreen){
+ start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
+ }else {
+ start.setImageResource(R.drawable.bus_p_function_video_player_pause_small)
+ }
aivStartPlay.visibility = View.GONE
}
else -> {
- start.setImageResource(R.drawable.notice_video_after_pause)
+ if(isIfCurrentIsFullscreen){
+ start.setImageResource(R.drawable.bus_p_function_video_player_start_big)
+ }else {
+ start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
+ }
aivStartPlay.visibility = View.VISIBLE
}
}
@@ -156,7 +163,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
override fun changeUiToNormal() {
super.changeUiToNormal()
- setViewShowState(fullscreenButton, INVISIBLE)
+ setViewShowState(fullscreenButton, VISIBLE)
}
override fun changeUiToPlayingShow() {
@@ -237,7 +244,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
}
override fun onCompletion() {
- start.setImageResource(R.drawable.notice_video_after_pause)
+ start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
}
override fun onSurfaceUpdated(surface: Surface) {
@@ -375,8 +382,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
cloneParams(this, gsyVideoPlayer)
val frameLayout = FrameLayout(context)
if (gsyVideoPlayer.fullscreenButton != null) {
- gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxi_p_change_normal)
- gsyVideoPlayer.start.setImageResource(R.drawable.notice_video_pause_big)
+ gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.bus_p_function_video_player_change_normal)
+ gsyVideoPlayer.start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
gsyVideoPlayer.fullscreenButton.setOnClickListener { v ->
if (mBackFromFullScreenListener == null) {
clearFullscreenLayout(gsyVideoPlayer)
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
index 889957bc92..a5f398b392 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter;
public class HorizontalDecoration extends RecyclerView.ItemDecoration {
private int space = 0;
@@ -55,7 +56,11 @@ public class HorizontalDecoration extends RecyclerView.ItemDecoration {
view.postDelayed(new Runnable() {
@Override
public void run() {
- parent.smoothScrollToPosition(shouldScrollTo);
+ final RecyclerView.Adapter adapter = parent.getAdapter();
+ if(adapter instanceof TemperatureAdapter){
+ parent.scrollToPosition(shouldScrollTo);
+ ((TemperatureAdapter)adapter).setCheckIndex(shouldScrollTo);
+ }
}
}, 500);
SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putInt(distancekey,distance);
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png
index 61f22d3bf0..dc69247e9e 100644
Binary files a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png
new file mode 100644
index 0000000000..cbada54d33
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png
new file mode 100644
index 0000000000..dc69247e9e
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png
new file mode 100644
index 0000000000..661a22faa2
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png
new file mode 100644
index 0000000000..e6ed9652f3
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png
index b3ceb81fb6..5d2427b6f7 100644
Binary files a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml
new file mode 100644
index 0000000000..a5ff8d8fec
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml
@@ -0,0 +1,7 @@
+
+
+