From 3b467a517e212991bf8bfe05e27b2419fa102483 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 16 Jun 2023 15:52:15 +0800
Subject: [PATCH] =?UTF-8?q?[Sweeper-Cloud]=20feat:=20=E2=80=9C=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=BF=9B=E5=85=A5=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=E6=A0=B9=E6=8D=AE=E8=87=AA=E9=A9=BE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E8=83=8C=E6=99=AF=E5=92=8C?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=EF=BC=9B=20feat:=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88=20=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A->=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=9A=82=E6=9C=AA=E5=87=86=E5=A4=87->?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=BC=80=E5=A7=8B=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E4=BD=9C=E4=B8=9A=E6=A8=A1=E5=BC=8F->=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E4=B8=8A=E8=A3=85=E4=BD=9C=E4=B8=9A=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  |  5 ++
 .../view/SweeperCurrentTaskInfoView.kt        | 63 ++++++++++++++++---
 .../sweeper_upload_autopoiltstate.xml         | 11 +++-
 .../src/main/res/layout/sweeper_work_mode.xml |  2 +-
 4 files changed, 67 insertions(+), 14 deletions(-)

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<SweeperFragment?, SweeperPresente
         }
     }
 
+    override fun setAutoState(state: Int) {
+        super.setAutoState(state)
+        getCurrentView().updateStartAutoPilotBtnState(state)
+    }
+
     fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates) {
         mCleanSystemState = cleanSystemState
         sweeper_cl_work_mode.setSweeperFutianCleanSystemState(mSubTaskType, cleanSystemState)
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt
index 3bdbcea852..41b06aae2d 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/view/SweeperCurrentTaskInfoView.kt
@@ -1,11 +1,13 @@
 package com.mogo.och.sweepercloud.view
 
 import android.content.Context
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.sweepercloud.R
 import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon.TaskStatus
@@ -27,8 +29,20 @@ class SweeperCurrentTaskInfoView : ConstraintLayout {
         initView(context)
     }
 
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {}
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+    }
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int,
+        defStyleRes: Int
+    ) : super(context, attrs, defStyleAttr, defStyleRes) {
+    }
 
     private fun initView(context: Context) {
         LayoutInflater.from(context).inflate(R.layout.sweeper_current_task_info, this)
@@ -39,6 +53,34 @@ class SweeperCurrentTaskInfoView : ConstraintLayout {
         return tvStartAuto
     }
 
+    /**
+     * 根据当前自动驾驶状态，更新【请求进入自动驾驶】按钮样式
+     */
+    fun updateStartAutoPilotBtnState(autopilotState: Int) {
+        when (autopilotState) {
+            //不可自动驾驶
+            IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {
+                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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <item android:state_selected="true">
         <shape android:shape="rectangle">
-
-            <corners android:bottomRightRadius="30dp" android:bottomLeftRadius="@dimen/dp_30"/>
+            <corners android:bottomLeftRadius="@dimen/dp_30" android:bottomRightRadius="@dimen/dp_30" />
             <gradient android:angle="180" android:endColor="#2F6EFF" android:startColor="#20AAFF" />
         </shape>
     </item>
+    <item android:state_selected="false">
+        <shape>
+            <solid android:color="#4D2F6EFF" />
+            <corners android:bottomLeftRadius="@dimen/dp_30" android:bottomRightRadius="@dimen/dp_30" />
+        </shape>
+    </item>
 </selector>
\ 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"