diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png new file mode 100644 index 0000000000..7377fd23a7 Binary files /dev/null and b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png differ diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png new file mode 100644 index 0000000000..38e78514d9 Binary files /dev/null and b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png differ diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png deleted file mode 100644 index 405d2cddaa..0000000000 Binary files a/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png and /dev/null differ diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png deleted file mode 100644 index a0b2ab93d9..0000000000 Binary files a/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png and /dev/null differ diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml index 191ec2e51f..96080c5b58 100644 --- a/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml +++ b/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml @@ -1,8 +1,8 @@ - - - - - + + + + + \ No newline at end of file diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 7a510d7c24..3196c03903 100644 --- a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -36,16 +36,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/video_switch_iv" app:roma_close="@drawable/roma_bus_p_bg_selector" - app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" /> + app:roma_open="@drawable/bus_p_roma_checked" /> - - - - - - - - + - - - - - - - - + - - - - - - - - - + 漫游距离${dis}米") + } else { + romaDistanceMeter.text = "漫游距离${dis}米" + } + } + } + sendEmptyMessageDelayed(1, 1000) + } + } init { LayoutInflater.from(context).inflate(R.layout.view_roma_distance, this, true) @@ -34,14 +57,16 @@ class RomaDistanceView @JvmOverloads constructor( defStyleAttr, 0 ) -// val distanceBg = a.getResourceId(R.styleable.RomaDistanceView_roma_distance_bg,0) -// if(distanceBg != 0){ -// romaDistanceBg.background = resources.getDrawable(distanceBg) -// } - val txtSize = a.getInteger(R.styleable.RomaDistanceView_roma_txt_size,35) - romaDistanceMeter.setTextSize(TypedValue.COMPLEX_UNIT_PX, - AutoSizeUtils.dp2px(getContext(),txtSize.toFloat()).toFloat()) - val txtDisColor = a.getBoolean(R.styleable.RomaDistanceView_roma_change_dis_color,false) + val distanceBg = a.getResourceId(R.styleable.RomaDistanceView_roma_distance_bg, 0) + if (distanceBg != 0) { + romaDistanceBg.background = resources.getDrawable(distanceBg) + } + val txtSize = a.getInteger(R.styleable.RomaDistanceView_roma_txt_size, 35) + romaDistanceMeter.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + AutoSizeUtils.dp2px(getContext(), txtSize.toFloat()).toFloat() + ) + val txtDisColor = a.getBoolean(R.styleable.RomaDistanceView_roma_change_dis_color, false) disChangeColor = txtDisColor a.recycle() } @@ -54,22 +79,19 @@ class RomaDistanceView @JvmOverloads constructor( override fun romaStatus(status: Boolean) { super.romaStatus(status) if (status) { - romaDistanceBg.visibility = View.VISIBLE + mHandler.sendEmptyMessageDelayed(1, 500) } else { + mHandler.removeMessages(1) romaDistanceBg.visibility = View.GONE romaDistanceMeter.text = "" + dis = 0 } } override fun romaDistance(distance: String) { super.romaDistance(distance) - val dis = distance.toDouble().toInt() - Log.i(TAG, "romaDistance:$distance") - if(disChangeColor){ - romaDistanceMeter.text = Html.fromHtml("漫游距离${dis}米") - }else{ - romaDistanceMeter.text = "漫游距离${dis}米" - } + dis = distance.toDouble().toInt() + Log.i(TAG, "romaDistance:$dis") } override fun onDetachedFromWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_distance.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_distance.xml index 621006cb4e..8628349a0b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_distance.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_distance.xml @@ -9,9 +9,8 @@ android:id="@+id/romaDistanceMeter" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_20" android:layout_gravity="center_horizontal" - android:gravity="center_horizontal" + android:gravity="center" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent"