diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index d82b2a051a..5367e1e268 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -99,7 +99,7 @@ android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:traffic_light_user="taxi_p" + app:traffic_light_user="traffic_light_taxi_p" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt index 9c8b4a77b0..8c229f8890 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt @@ -7,6 +7,7 @@ import android.view.View import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView +import androidx.core.content.ContextCompat import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum @@ -20,7 +21,7 @@ import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI -import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.ThreadUtils.* import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.hmi_view_traffic_light.view.* @@ -58,7 +59,11 @@ class SingleTrafficLightView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - LayoutInflater.from(context).inflate(R.layout.hmi_view_traffic_light, this, true) + if(trafficLightUser==1){ + LayoutInflater.from(context).inflate(R.layout.hmi_view_traffic_light_taxi_p, this, true) + }else{ + LayoutInflater.from(context).inflate(R.layout.hmi_view_traffic_light, this, true) + } mLightIconIV = findViewById(R.id.hmi_traffic_light_iv) mLightIconBG = findViewById(R.id.hmi_traffic_light_bg) mLightTimeTV = findViewById(R.id.hmi_traffic_light_time_tv) @@ -71,8 +76,8 @@ class SingleTrafficLightView @JvmOverloads constructor( if(trafficLightUser==1){ hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg_taxi_p) - hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_2D3E5F)) - hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_2D3E5F)) + hmi_traffic_light_source.setTextColor(ContextCompat.getColor(context,R.color.color_FF213757)) + hmi_traffic_light_divider.setBackgroundColor(ContextCompat.getColor(context,R.color.color_CC5C71AB)) } } @@ -89,17 +94,17 @@ class SingleTrafficLightView @JvmOverloads constructor( } override fun onSkinModeChange(skinMode: Int) { - ThreadUtils.runOnUiThread { + runOnUiThread { when (skinMode) { 0 -> { hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg) - hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_FFFFFF)) - hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_FFFFFF)) + hmi_traffic_light_source.setTextColor(ContextCompat.getColor(context,R.color.color_FFFFFF)) + hmi_traffic_light_divider.setBackgroundColor(ContextCompat.getColor(context,R.color.color_FFFFFF)) } 1 -> { hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg_day_light) - hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_2D3E5F)) - hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_2D3E5F)) + hmi_traffic_light_source.setTextColor(ContextCompat.getColor(context,R.color.color_2D3E5F)) + hmi_traffic_light_divider.setBackgroundColor(ContextCompat.getColor(context,R.color.color_2D3E5F)) } } } @@ -184,12 +189,22 @@ class SingleTrafficLightView @JvmOverloads constructor( if (redNum > 0) { resetView() mLightTimeTV!!.setVertical(true) - mLightTimeTV!!.setColorList( - intArrayOf( - resources.getColor(R.color.hmi_traffic_light_red_color_up), - resources.getColor(R.color.hmi_traffic_light_red_color_down) + if(trafficLightUser == 1){ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.color_FF384D6E), + ContextCompat.getColor(context,R.color.color_FF384D6E) + ) ) - ) + }else{ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.hmi_traffic_light_red_color_up), + ContextCompat.getColor(context,R.color.hmi_traffic_light_red_color_down) + ) + ) + } + mLightTimeTV!!.text = redNum.toString() } else { disableTrafficLightCountDown() @@ -204,12 +219,21 @@ class SingleTrafficLightView @JvmOverloads constructor( if (greenNum > 0) { resetView() mLightTimeTV!!.setVertical(true) - mLightTimeTV!!.setColorList( - intArrayOf( - resources.getColor(R.color.hmi_traffic_light_green_color_up), - resources.getColor(R.color.hmi_traffic_light_green_color_down) + if(trafficLightUser == 1){ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.color_FF384D6E), + ContextCompat.getColor(context,R.color.color_FF384D6E) + ) ) - ) + }else{ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.hmi_traffic_light_green_color_up), + ContextCompat.getColor(context,R.color.hmi_traffic_light_green_color_down) + ) + ) + } mLightTimeTV!!.text = greenNum.toString() } else { disableTrafficLightCountDown() @@ -224,12 +248,21 @@ class SingleTrafficLightView @JvmOverloads constructor( if (yellowNum > 0) { resetView() mLightTimeTV!!.setVertical(true) - mLightTimeTV!!.setColorList( - intArrayOf( - resources.getColor(R.color.hmi_traffic_light_yellow_color_up), - resources.getColor(R.color.hmi_traffic_light_yellow_color_down) + if(trafficLightUser == 1){ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.color_FF384D6E), + ContextCompat.getColor(context,R.color.color_FF384D6E) + ) ) - ) + }else{ + mLightTimeTV!!.setColorList( + intArrayOf( + ContextCompat.getColor(context,R.color.hmi_traffic_light_yellow_color_up), + ContextCompat.getColor(context,R.color.hmi_traffic_light_yellow_color_down) + ) + ) + } mLightTimeTV!!.text = yellowNum.toString() } else { disableTrafficLightCountDown() @@ -247,28 +280,40 @@ class SingleTrafficLightView @JvmOverloads constructor( private fun updateTrafficLightIcon(lightId: TrafficLightEnum, lightSource: DataSourceType) { when (lightId) { TrafficLightEnum.RED -> { - mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_red_nor) + if(trafficLightUser == 1){ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_red_taxi_p) + }else{ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_red_nor) + } this@SingleTrafficLightView.visibility = VISIBLE } TrafficLightEnum.YELLOW -> { - mLightIconIV!!.setBackgroundResource(R.drawable.hmi_lightyellow_nor) + if(trafficLightUser == 1){ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_lightyellow_taxi_p) + }else{ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_lightyellow_nor) + } this@SingleTrafficLightView.visibility = VISIBLE } TrafficLightEnum.GREEN -> { - mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_green_nor) + if(trafficLightUser == 1){ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_green_taxi_p) + }else{ + mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_green_nor) + } this@SingleTrafficLightView.visibility = VISIBLE } else -> this@SingleTrafficLightView.visibility = GONE } when (lightSource) { DataSourceType.AICLOUD -> { - mLightSourceTV!!.text = "云端下发" + mLightSourceTV!!.text = context.getString(R.string.light_source_ai_cloud) } DataSourceType.TELEMATIC -> { - mLightSourceTV!!.text = "自车感知" + mLightSourceTV!!.text = context.getString(R.string.light_source_perception) } DataSourceType.OBU -> { - mLightSourceTV!!.text = "OBU" + mLightSourceTV!!.text = context.getString(R.string.light_source_obu) } else -> { mLightSourceTV!!.visibility = GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_green_taxi_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_green_taxi_p.png new file mode 100644 index 0000000000..5880ac9fd6 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_green_taxi_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_red_taxi_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_red_taxi_p.png new file mode 100644 index 0000000000..35886c0737 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_light_red_taxi_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_lightyellow_taxi_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_lightyellow_taxi_p.png new file mode 100644 index 0000000000..0355f43139 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_lightyellow_taxi_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light_taxi_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light_taxi_p.xml new file mode 100644 index 0000000000..7845671a6b --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light_taxi_p.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 8519e67a96..ff93b33d7e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -79,7 +79,7 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 4db8ecf5b7..25544292eb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -25,6 +25,9 @@ #D4D8DC #27FFFFFF #1E111111 + #FF213757 + #335C71AB + #FF384D6E #FF999900 #FFCC0000 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 2ea3cd0e92..35244d89ef 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -82,4 +82,8 @@ 再按一次退出应用 %s-%s + + 云端下发 + 自车感知 + \u3000OBU\u3000 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt index 13491090cd..a612706b6c 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt @@ -49,11 +49,11 @@ interface IMoGoTrafficLightListener { fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) {} /** - * @param readNum 红灯倒计时 + * @param redNum 红灯倒计时 * @param yellowNum 黄灯倒计时 * @param greenNum 绿灯倒计时 */ - fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {} + fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) {} fun changeCountdownGreen(greenNum: Int) {} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt index b795e482a8..b71eb67d59 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt @@ -71,10 +71,10 @@ object CallerTrafficLightListenerManager : CallerBase } } - fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) { + fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) { M_LISTENERS.forEach { val listener = it.value - listener.changeCountdownTrafficLightNum(readNum, yellowNum, greenNum) + listener.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum) } }