diff --git a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt index 9f24640842..497bca0520 100644 --- a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt +++ b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt @@ -314,19 +314,21 @@ abstract class CharterBaseFragment?>() : ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_disable_autopilot_icon) ctvAutopilotStatus!!.isSelected = false ctvAutopilotStatus!!.isClickable = true - } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING - == autopilotStatus){ - //todo 处理平行驾驶 }else{ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal)) - ctvAutopilotStatusTv!!.text = - resources.getString(R.string.bus_loading_autopilot_runnig_tv) ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_ic_autopilot) ctvAutopilotStatus!!.isClickable = true if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) { //1可用 ctvAutopilotStatus!!.isSelected = false } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) { + ctvAutopilotStatusTv!!.text = + resources.getString(R.string.bus_loading_autopilot_runnig_tv) ctvAutopilotStatus!!.isSelected = true + } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING + == autopilotStatus){ + ctvAutopilotStatusTv!!.text = + resources.getString(R.string.bus_loading_autopilot_pingxing_tv) + ctvAutopilotStatusTv!!.background = context?.getDrawable(R.drawable.pingxingjiashi) } } } diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/pingxingjiashi.png new file mode 100644 index 0000000000..78bfa2687f Binary files /dev/null and b/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/pingxingjiashi.png differ diff --git a/OCH/mogo-och-charter/src/main/res/values/strings.xml b/OCH/mogo-och-charter/src/main/res/values/strings.xml index 27b49dfd20..47ca830c1c 100644 --- a/OCH/mogo-och-charter/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ 启动成功 启动失败 自动驾驶 + 平行驾驶 任务列表 暂无任务 选择时间