From 39a9a66f54a0c7f13c8f583af4cfe0d5c4b865cb Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Tue, 17 Jan 2023 18:10:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/sweeper/SweeperProvider.java |   5 +-
 .../fragment/BaseSweeperTabFragment.java      |  18 +---
 .../och/sweeper/fragment/SweeperFragment.kt   |   2 +-
 .../och/sweeper/view/SweeperTaskMenuView.kt   |  23 ++++
 .../src/main/res/drawable/bg_bubble.xml       |  16 +++
 .../src/main/res/drawable/bg_task_menu.xml    |   5 +
 .../res/drawable/img_sweeper_status_bg.9.png  | Bin 4299 -> 0 bytes
 .../main/res/layout/sweeper_base_fragment.xml |  13 ++-
 .../res/layout/sweeper_item_task_info.xml     |   7 +-
 .../src/main/res/layout/sweeper_task_menu.xml |  98 ++++++++++++++++++
 10 files changed, 162 insertions(+), 25 deletions(-)
 create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTaskMenuView.kt
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml
 delete mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
index 0db6a47aff..76640cb43f 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
@@ -1,6 +1,7 @@
 package com.mogo.och.sweeper;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
 
 import android.content.Context;
 
@@ -37,7 +38,7 @@ public class SweeperProvider implements IMogoOCH {
      * 进入鹰眼模式，设置手势缩放地图失效
      */
     private void stepIntoVrMode(){
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" );
+        CallerLogger.INSTANCE.d( M_SWEEPER + TAG, "进入vr模式" );
         MogoMapUIController.getInstance()
                 .stepInVrMode(false);
     }
@@ -69,7 +70,7 @@ public class SweeperProvider implements IMogoOCH {
 
     private final IMogoStatusChangedListener statusChangedListener = (descriptor, isTrue) -> {
         if (descriptor == StatusDescriptor.VR_MODE) {
-            // 进入vr模式默认显示网约车小巴fragment
+            // 进入vr模式默认显示清扫车fragment
             if (isTrue) {
                 showFragment();
             } else {
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
index 73628b6b50..33177ec7b0 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
@@ -1,6 +1,5 @@
 package com.mogo.och.sweeper.fragment;
 
-import android.animation.ObjectAnimator;
 import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,16 +7,12 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.data.config.HmiBuildConfig;
-import com.mogo.eagle.core.data.constants.DataTypes;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
@@ -25,22 +20,15 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.map.MogoMapUIController;
-import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.sweeper.R;
-import com.mogo.och.sweeper.constant.SweeperConst;
 import com.mogo.och.sweeper.ui.SweeperOperatePanelView;
 import com.mogo.och.sweeper.view.SweeperTrafficDataView;
 import com.mogo.och.sweeper.view.SweeperWorkModeView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
-import mogo.telematics.pad.MessagePad;
-import record_cache.RecordPanelOuterClass;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 
@@ -86,14 +74,12 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         groupTestPanel = findViewById(R.id.groupTestPanel);
         flTaskListPanelContainer = findViewById(R.id.module_mogo_och_task_list_container);
         mTrafficDataView = findViewById(R.id.sweeper_arc);
-        panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flTaskListPanelContainer);
-
+        panelView = LayoutInflater.from(getContext()).inflate(getTaskListPanelViewId(), flTaskListPanelContainer);
         mSwitchMapModeLayout = findViewById(R.id.sweeper_switch_model_layout);
         mSwitchMapModeImage = findViewById(R.id.sweeper_switch_model_icon);
         mClWorkMode = findViewById(R.id.sweeper_cl_work_mode);
         mOperatePanel = findViewById(R.id.module_mogo_och_sweeper_operate_panel);
         updateSwitchMapIcon();
-
         mSwitchMapModeLayout.setOnClickListener(new OnPreventFastClickListener() {
 
             @Override
@@ -198,7 +184,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
      *
      * @return 站点面板view
      */
-    public abstract int getStationPanelViewId();
+    public abstract int getTaskListPanelViewId();
 
     /**
      * 获取清扫车操作面板layout id
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 929146f4ed..d766d121c3 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
@@ -51,7 +51,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         super.onResume()
     }
 
-    override fun getStationPanelViewId(): Int {
+    override fun getTaskListPanelViewId(): Int {
         return R.layout.fragment_och_sweeper
     }
 
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTaskMenuView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTaskMenuView.kt
new file mode 100644
index 0000000000..8f67c128e4
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTaskMenuView.kt
@@ -0,0 +1,23 @@
+package com.mogo.och.sweeper.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.och.sweeper.R
+
+/**
+ * 清扫车任务操作菜单
+ */
+class SweeperTaskMenuView:ConstraintLayout {
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs){
+        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)
+
+    private fun initView(context: Context) {
+        LayoutInflater.from(context).inflate(R.layout.sweeper_task_menu, this)
+    }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml
new file mode 100644
index 0000000000..73729e9ef6
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:fromDegrees="-45"
+            android:pivotX="85%"
+            android:pivotY="-35%">
+            <shape android:shape="rectangle">
+                <size
+                    android:width="30dp"
+                    android:height="30dp" />
+                <solid android:color="#2F6296"/>
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml
new file mode 100644
index 0000000000..9942026a18
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<gradient android:angle="270" android:startColor="#2F6296" android:endColor="#263A5B"/>
+    <corners android:radius="@dimen/dp_16"/>
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png b/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png
deleted file mode 100644
index 0af2b9db73cb4c30103f78bdc300e634b540a8e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4299
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

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 ac531f1404..b6544ba351 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
@@ -20,7 +20,7 @@
          android:background="@drawable/bg_shape_work_mode"
          app:layout_constraintLeft_toLeftOf="parent"
          app:layout_constraintTop_toBottomOf="@+id/sweeper_arc"
-         android:visibility="gone"/>
+         android:visibility="visible"/>
     <com.mogo.och.sweeper.view.SweeperCurrentTaskInfoView
         app:layout_constraintTop_toBottomOf="@+id/sweeper_cl_work_mode"
         android:layout_width="@dimen/dp_560"
@@ -30,8 +30,15 @@
         android:layout_marginStart="@dimen/dp_41"
         android:layout_marginTop="@dimen/dp_36"
         android:layout_marginBottom="@dimen/dp_30"
-        android:visibility="gone"
+        android:visibility="visible"
         />
+    <com.mogo.och.sweeper.view.SweeperTaskMenuView
+        android:id="@+id/sweeper_task_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/sweeper_cl_work_mode"
+        app:layout_constraintTop_toBottomOf="@+id/sweeper_cl_work_mode"
+        android:visibility="gone"/>
     <FrameLayout
         android:id="@+id/module_mogo_och_task_list_container"
         android:layout_width="wrap_content"
@@ -41,7 +48,7 @@
         app:layout_constraintTop_toBottomOf="@id/sweeper_arc"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
         app:layout_constraintBottom_toTopOf="@+id/sweeper_switch_model_layout"
-        android:visibility="visible"
+        android:visibility="gone"
         android:layout_marginBottom="@dimen/dp_30"/>
     <com.mogo.och.sweeper.ui.SweeperOperatePanelView
         android:id="@+id/module_mogo_och_sweeper_operate_panel"
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml
index afd9cb9f69..70430324a0 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml
@@ -3,6 +3,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemTaskView"
     android:paddingEnd="@dimen/dp_36">
     <TextView
@@ -13,7 +14,7 @@
         android:textColor="@color/white"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:text="惠新西街南口地铁站"
+        tools:text="惠新西街南口地铁站"
         android:layout_marginStart="@dimen/dp_38"
         android:layout_marginTop="@dimen/dp_21"/>
     <TextView
@@ -24,7 +25,7 @@
         android:textColor="#A6CEFF"
         app:layout_constraintTop_toBottomOf="@+id/tvTaskName"
         app:layout_constraintStart_toStartOf="parent"
-        android:text="全程包含12个子任务"
+        tools:text="全程包含12个子任务"
         android:layout_marginStart="@dimen/dp_38"
         android:layout_marginTop="1dp"/>
     <TextView
@@ -34,7 +35,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:text="9:00"
+        tools:text="9:00"
         android:textColor="@color/white"
         android:paddingStart="@dimen/dp_12"
         android:paddingEnd="@dimen/dp_12"
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
new file mode 100644
index 0000000000..44709acb4e
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_174"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_gravity="center"
+    tools:ignore="MissingDefaultResource">
+    <ImageView
+        android:id="@+id/ivTriangle"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:src="@drawable/bg_bubble"/>
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/bg_task_menu"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+    <TextView
+        android:id="@+id/tvTaskJumpOver"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="跳过"
+        android:textColor="#A6CEFF"
+        android:textSize="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_16"/>
+    <View
+        android:id="@+id/line1"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/dp_20"
+        android:background="#A6CEFF"
+        app:layout_constraintTop_toBottomOf="@+id/tvTaskJumpOver"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"/>
+    <TextView
+        android:id="@+id/tvTaskFinish"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line1"
+        android:text="结束"
+        android:textColor="#A6CEFF"
+        android:textSize="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_16"/>
+    <View
+        android:id="@+id/line2"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/dp_20"
+        android:background="#A6CEFF"
+        app:layout_constraintTop_toBottomOf="@+id/tvTaskFinish"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"/>
+    <TextView
+        android:id="@+id/tvTaskCancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line2"
+        android:text="结束"
+        android:textColor="#A6CEFF"
+        android:textSize="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_16"/>
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_16"
+        app:layout_constraintStart_toEndOf="@+id/ivTriangle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvTaskCancel"/>
+    <com.mogo.och.common.module.wigets.OCHShapeBlurView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:clickable="false"
+        app:och_realtime_onece="true"
+        app:och_realtime_end_color="#121526"
+        app:och_realtime_radius="@dimen/dp_10"
+        app:och_realtime_start_color="#121526"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file