diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt index 1dc67cae43..0714e5ddc3 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt @@ -122,6 +122,11 @@ class SweeperFragment : BaseSweeperTabFragment { + tvStartAuto.setTextColor(Color.parseColor("#66FFFFFF")) + tvStartAuto.isSelected = false + } + //人工驾驶 + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> { + tvStartAuto.setTextColor(Color.parseColor("#FFFFFFFF")) + tvStartAuto.isSelected = true + } + //自动驾驶中 + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { + tvStartAuto.setTextColor(Color.parseColor("#66FFFFFF")) + tvStartAuto.isSelected = false + } + //平行驾驶 + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { + tvStartAuto.setTextColor(Color.parseColor("#66FFFFFF")) + tvStartAuto.isSelected = false + } + } + } + /** * 设置当前任务数据 */ @@ -51,12 +93,13 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { tvTaskName.text = taskName val calendarStart = DateTimeUtil.formatLongToCalendar(taskStartTime) val calendarEnd = DateTimeUtil.formatLongToCalendar(taskEndTime) - tvTaskTime.text = "${DateTimeUtil.formatCalendarToString(calendarStart, DateTimeUtil.HH_mm)}-${ - DateTimeUtil.formatCalendarToString( - calendarEnd, - DateTimeUtil.HH_mm - ) - }" + tvTaskTime.text = + "${DateTimeUtil.formatCalendarToString(calendarStart, DateTimeUtil.HH_mm)}-${ + DateTimeUtil.formatCalendarToString( + calendarEnd, + DateTimeUtil.HH_mm + ) + }" } listTask?.let { //特殊处理当前暂无执行中任务的情况 @@ -75,10 +118,10 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { */ private fun setSubTaskState(isWorking: Boolean) { if (isWorking) { - tvTaskState.text = "正在作业" + tvTaskState.text = "任务执行中" tvTaskState.setBackgroundResource(R.drawable.bg_shape_task_state_working) } else { - tvTaskState.text = "暂未准备" + tvTaskState.text = "任务待开始" tvTaskState.setBackgroundResource(R.drawable.bg_shape_task_state_not_ready) } } diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_upload_autopoiltstate.xml b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_upload_autopoiltstate.xml index 6d189929bc..ea710c45e4 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_upload_autopoiltstate.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/drawable/sweeper_upload_autopoiltstate.xml @@ -1,10 +1,15 @@ - + - - + + + + + + + \ No newline at end of file diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_work_mode.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_work_mode.xml index f2e743be58..34be95b606 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_work_mode.xml +++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_work_mode.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_36" android:layout_marginTop="@dimen/dp_20" - android:text="当前作业模式:" + android:text="当前上装模式:" android:textColor="@color/white" android:textSize="@dimen/dp_32" app:layout_constraintStart_toStartOf="parent"