From 1bf71b4c383fbe8db61d9f3faf6b311f279528be Mon Sep 17 00:00:00 2001 From: bxb Date: Tue, 31 Jan 2023 17:38:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=87=E6=8D=A2=E5=88=B0=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=80=E5=8D=95=E9=80=BB=E8=BE=91=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/sweeper/fragment/SweeperFragment.kt | 36 +++++++----- .../sweeper/presenter/SweeperPresenter.java | 21 +++---- .../com/mogo/och/sweeper/view/SubTaskView.kt | 11 +++- .../view/SweeperCurrentTaskInfoView.kt | 7 +++ .../main/res/layout/fragment_och_sweeper.xml | 2 +- .../res/layout/item_och_sweeper_station.xml | 58 ------------------- .../main/res/layout/sweeper_base_fragment.xml | 6 +- .../res/layout/sweeper_current_task_info.xml | 2 +- .../main/res/layout/sweeper_subtask_view.xml | 15 ++++- .../src/main/res/layout/sweeper_work_mode.xml | 3 +- .../src/main/res/values/strings.xml | 2 - 11 files changed, 65 insertions(+), 98 deletions(-) delete mode 100644 OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt index 2f2bde46be..386413f434 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt @@ -2,7 +2,6 @@ package com.mogo.och.sweeper.fragment import android.view.View import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.sweeper.R import com.mogo.och.sweeper.bean.TaskInfoBean import com.mogo.och.sweeper.constant.TaskMenuTypeEnum @@ -14,12 +13,14 @@ import kotlinx.android.synthetic.main.fragment_och_sweeper.* /** * 清扫车主界面 */ -class SweeperFragment : BaseSweeperTabFragment(),MenuPopWindow.OnMenuItemOnClickListener { +class SweeperFragment : BaseSweeperTabFragment(), MenuPopWindow.OnMenuItemOnClickListener { private var mAdapter: TaskListAdapter? = null + //当前任务操作菜单 private var mTaskMenuPopWindow: MenuPopWindow? = null + // - private var mPosition:Int=-1 + private var mPosition: Int = -1 private val mutableList: MutableList by lazy { mutableListOf() } override fun getTagName(): String { return "SweepersFragment" @@ -43,7 +44,7 @@ class SweeperFragment : BaseSweeperTabFragment @@ -100,7 +101,7 @@ class SweeperFragment : BaseSweeperTabFragment - if (mTaskMenuPopWindow?.isShowing!=true) { + if (mTaskMenuPopWindow?.isShowing != true) { mTaskMenuPopWindow?.showAsDropDown( workModePanelView, resources.getDimension(R.dimen.dp_580).toInt(), @@ -115,20 +116,23 @@ class SweeperFragment : BaseSweeperTabFragment{ + when (itemType.code) { + TaskMenuTypeEnum.JUMP_OVER_TASK.code -> { setShowTaskListPanelView(true) setShowCurrentTaskPanelView(false) + workModePanelView.visibility = View.GONE } - TaskMenuTypeEnum.END_TASK.code->{ + TaskMenuTypeEnum.END_TASK.code -> { setShowTaskListPanelView(true) setShowCurrentTaskPanelView(false) + workModePanelView.visibility = View.GONE } } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 79c20e5c9e..dedfc7b2ca 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -82,8 +82,8 @@ public class SweeperPresenter extends Presenter if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE; } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); + // 设置自动驾驶状态是否可用 + runOnUIThread(() -> mView.onAutopilotEnableChange(true)); break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING: if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { @@ -91,22 +91,19 @@ public class SweeperPresenter extends Presenter SweeperTaskModel.getInstance().triggerStartServiceEvent( SweeperTaskModel.getInstance().isRestartAutopilot(), true); } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); + // 设置自动驾驶状态是否可用 + runOnUIThread(() -> mView.onAutopilotEnableChange(true)); break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE: if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE; } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); + // 设置自动驾驶状态是否可用 + runOnUIThread(() -> mView.onAutopilotEnableChange(false)); break; - case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING: - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING) { - currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING; - } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); + default: + // 设置自动驾驶状态是否可用 + runOnUIThread(() -> mView.onAutopilotEnableChange(false)); break; } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt index a191eba1db..188506b569 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt @@ -1,6 +1,7 @@ package com.mogo.och.sweeper.view import android.content.Context +import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.View @@ -30,8 +31,14 @@ class SubTaskView : ConstraintLayout { */ fun setData(taskInfo:TaskInfoBean,isSelect:Boolean=false,isLastTask:Boolean=false){ tvSubTaskName.text = taskInfo.taskName - tvSubTaskName.setTextColor(if (isSelect) 0x3BD2FF else 0xFFFFFF) - ivSubTask.setImageResource(if (isSelect) R.drawable.sweeper_icon_select_subtask else R.drawable.sweeper_icon_not_select_subtask) + tvSubTaskName.setTextColor(if (isSelect) Color.parseColor("#3BD2FF")else Color.parseColor("#FFFFFF")) + if (isSelect){ + ivSubTaskSelect.visibility=View.VISIBLE + ivSubTask.visibility=View.GONE + }else{ + ivSubTaskSelect.visibility=View.GONE + ivSubTask.visibility=View.VISIBLE + } ivRightDownArrow.visibility=if (isLastTask) View.GONE else View.VISIBLE } } \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt index 6e6031a9e4..217eccbbea 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt @@ -63,4 +63,11 @@ class SweeperCurrentTaskInfoView : ConstraintLayout { } } } + + /** + * 设置准备就绪按钮时都可以点击 + */ + fun setEnableClickBtn(isEnable:Boolean){ + readyTaskBtn.isSelected= isEnable + } } \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml index 088264b922..6bfaec3e97 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml @@ -82,7 +82,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:text="确认" - android:textColor="#728bb0" + android:textColor="@color/white" android:gravity="center" android:textSize="@dimen/dp_42" /> diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml b/OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml deleted file mode 100644 index 3d18f13240..0000000000 --- a/OCH/mogo-och-sweeper/src/main/res/layout/item_och_sweeper_station.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml index 77aa62ac3a..473406deb5 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml @@ -23,7 +23,7 @@ android:background="@drawable/bg_shape_work_mode" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/sweeper_arc" - android:visibility="visible"/> + android:visibility="gone"/> + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml index 5f760c8cc9..e0e9cf0da0 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml @@ -82,13 +82,14 @@ android:layout_marginTop="@dimen/dp_16" android:text="暂无" android:textSize="@dimen/dp_34" + android:visibility="gone" android:textColor="@color/white" android:layout_marginStart="@dimen/dp_36"/> \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml index 187d9bf3c9..99c55aa65a 100644 --- a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml +++ b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml @@ -18,12 +18,10 @@ 终点: 更换路线成功 更换路线失败 - 起点： 终点： 当前站点： 下一站： 自动驾驶状态为0不可用 - 预计等待%d秒