[清扫车]清扫车列表和列表无数据时布局修改

OCH/mogo-och-sweeper/src/main/AndroidManifest.xml

@@ -11,10 +11,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-        <activity android:name=".ui.SweeperSwitchLineActivity"
-            android:theme="@style/SwitchLineDialogStyle"
-            android:launchMode="singleTask"
-            android:screenOrientation="landscape" />/>
     </application>
 
 </manifest>

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/TaskInfoBean.kt

@@ -0,0 +1,3 @@
+package com.mogo.och.sweeper.bean
+
+data class TaskInfoBean(var taskId: Int, var taskName: String, var taskType: Int)

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java

@@ -100,14 +100,21 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
             public void onClickImpl(View v) {
                 //切换地图的远近视图
                 if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
-                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
+                    // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
-                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
-                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, SweeperConst.TYPE_MARKER_SWEEPER_ORDER);
+                    // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+//                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, BusConst.TYPE_MARKER_BUS_ORDER);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_long);
+                } else {
+                    // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
+                    MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
+                    mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_long);
                 }
             }
         });

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java

@@ -1,73 +0,0 @@
-package com.mogo.och.sweeper.fragment;
-
-import android.view.View;
-
-import com.mogo.och.sweeper.R;
-import com.mogo.och.sweeper.presenter.SweeperPresenter;
-
-import androidx.annotation.NonNull;
-
-
-/**
- * 网约车小巴界面
- *
- * @author tongchenfei
- */
-public class SweeperFragment extends BaseSweeperTabFragment<SweeperFragment, SweeperPresenter> {
-    @Override
-    public String getTagName() {
-        return "SweepersFragment";
-    }
-
-    @Override
-    protected void initViews() {
-        super.initViews();
-    }
-
-    @NonNull
-    @Override
-    protected SweeperPresenter createPresenter() {
-        return new SweeperPresenter(this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public int getStationPanelViewId() {
-        return R.layout.fragment_och_sweeper;
-    }
-
-    @Override
-    public int getSweepOperatePanelViewId() {
-        return R.layout.sweeper_operate_panel_view;
-    }
-
-    @Override
-    public void restartAutopilot() {
-        if (!isAnimateRunning) {
-            mPresenter.restartAutopilot();
-        }
-    }
-    /**
-     * VR模式切换
-     *
-     * @param isVRMode
-     */
-    public void onVRModeChanged(boolean isVRMode) {
-        if (mRootView != null) {
-            mRootView.setVisibility(isVRMode ? View.VISIBLE : View.GONE);
-        }
-    }
-    public void hideOchSweeper(){
-
-    }
-    @Override
-    public void debugAutoPilotStatus(int status) {
-        mPresenter.debugAutoPilotStatus(status);
-    }
-
-
-}

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt

@@ -0,0 +1,89 @@
+package com.mogo.och.sweeper.fragment
+
+import android.view.View
+import android.widget.ImageView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.och.sweeper.R
+import com.mogo.och.sweeper.bean.TaskInfoBean
+import com.mogo.och.sweeper.presenter.SweeperPresenter
+import com.mogo.och.sweeper.ui.adapter.TaskListAdapter
+
+/**
+ * 清扫车主界面
+ */
+class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresenter?>() {
+    private var mTaskRefresh: ImageView? = null //刷新任务列表按钮
+    private var mRecyclerView: RecyclerView? = null
+    private var mAdapter: TaskListAdapter? = null
+    private val mutableList:MutableList<TaskInfoBean> by lazy { mutableListOf() }
+    override fun getTagName(): String {
+        return "SweepersFragment"
+    }
+
+    override fun initViews() {
+        super.initViews()
+        mTaskRefresh = findViewById(R.id.ivTaskRefresh)
+        mRecyclerView = findViewById(R.id.rvTaskList)
+        mutableList.add(TaskInfoBean(1,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(2,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(3,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(4,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(5,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(6,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(7,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(8,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(9,"环球贸易中心",1))
+        mutableList.add(TaskInfoBean(10,"环球贸易中心",1))
+        mAdapter= context?.let { TaskListAdapter(it,mutableList) }
+        val linearLayoutManager=LinearLayoutManager(context)
+        linearLayoutManager.orientation=LinearLayoutManager.VERTICAL
+        mRecyclerView?.layoutManager=linearLayoutManager
+        mRecyclerView?.adapter=mAdapter
+        mAdapter?.setOnTaskItemClickListener(onTaskItemClickListener)
+    }
+
+    override fun createPresenter(): SweeperPresenter {
+        return SweeperPresenter(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+    }
+
+    override fun getStationPanelViewId(): Int {
+        return R.layout.fragment_och_sweeper
+    }
+
+    override fun getSweepOperatePanelViewId(): Int {
+        return R.layout.sweeper_operate_panel_view
+    }
+
+    override fun restartAutopilot() {
+        if (!isAnimateRunning) {
+            mPresenter?.restartAutopilot()
+        }
+    }
+
+    /**
+     * VR模式切换
+     *
+     * @param isVRMode
+     */
+    fun onVRModeChanged(isVRMode: Boolean) {
+        if (mRootView != null) {
+            mRootView.visibility = if (isVRMode) View.VISIBLE else View.GONE
+        }
+    }
+
+    fun hideOchSweeper() {}
+    override fun debugAutoPilotStatus(status: Int) {
+        mPresenter!!.debugAutoPilotStatus(status)
+    }
+    private val onTaskItemClickListener=object : TaskListAdapter.TaskItemClickListener{
+        override fun onItemClick(position: Int) {
+             mAdapter?.selectPosition(position)
+        }
+
+    }
+}

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt

@@ -0,0 +1,66 @@
+package com.mogo.och.sweeper.ui.adapter
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.och.sweeper.R
+import com.mogo.och.sweeper.bean.TaskInfoBean
+
+class TaskListAdapter(
+    private val context: Context,
+    private val data: List<TaskInfoBean>?,
+) : RecyclerView.Adapter<TaskListAdapter.TaskViewHolder>() {
+    private var mItemClickListener: TaskItemClickListener? = null
+    private var mSelectPosition: Int = -1
+    fun setOnTaskItemClickListener(itemClickListener: TaskItemClickListener?) {
+        mItemClickListener = itemClickListener
+    }
+
+    class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val selectIv: ImageView
+        val taskName: TextView//任务名称
+        val taskDesc: TextView//任务描述
+
+        init {
+            selectIv = itemView.findViewById(R.id.ivTaskSelect)
+            taskName = itemView.findViewById(R.id.tvTaskName)
+            taskDesc = itemView.findViewById(R.id.tvTaskDesc)
+        }
+    }
+
+    fun selectPosition(position: Int) {
+        this.mSelectPosition = position
+        notifyDataSetChanged()
+    }
+
+    interface TaskItemClickListener {
+        fun onItemClick(position: Int)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(
+            R.layout.sweeper_item_task_info, parent, false
+        )
+        return TaskViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TaskViewHolder, position: Int) {
+        if (position == mSelectPosition) {
+            holder.selectIv.visibility = View.VISIBLE
+            holder.itemView.setBackgroundColor(Color.parseColor("#FF152644"))
+        } else {
+            holder.selectIv.visibility = View.GONE
+            holder.itemView.setBackgroundColor(Color.parseColor("#00000000"))
+        }
+        holder.itemView.setOnClickListener {
+            mItemClickListener?.onItemClick(position)
+        }
+    }
+
+    override fun getItemCount(): Int = data?.size ?: 0
+}

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java

@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.sweeper.R;
 

OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_work_mode.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#183360"/>
+    <solid android:color="#103360"/>
     <corners android:radius="@dimen/dp_30" />
 </shape>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <gradient android:angle="180" android:endColor="#0027FF" android:startColor="#4267FF" />
+            <gradient android:angle="180" android:endColor="#4973B0" android:startColor="#348DD7" />
         </shape>
     </item>
 </selector>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-<gradient android:startColor="#348DD7" android:endColor="#4973B0" android:angle="0"/>
+    <solid android:color="#FF8921"/>
 </shape>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M960,416V192l-73.1,73.1a447.7,447.7 0,0 0,-373.6 -201.1C265.9,64 65.3,264.5 65.3,512S265.9,960 513.3,960a448.1,448.1 0,0 0,415.2 -279.5,38.4 38.4,0 1,0 -71.1,-28.9 371.4,371.4 0,0 1,-344.1 231.6C308.3,883.2 142.1,717 142.1,512S308.3,140.8 513.3,140.8c132.4,0 251.9,70.1 318,179.8L736,416h224z"
+      android:fillColor="#e6e6e6"/>
+</vector>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_selected="false" android:drawable="@drawable/sweeper_task_list_nor"/>
+<item android:state_selected="true"  android:drawable="@drawable/sweeper_ready"/>
+</selector>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_nor.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#254e7d" />
+    <corners
+        android:bottomLeftRadius="30dp"
+        android:bottomRightRadius="30dp" />
+</shape>

OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:endColor="#3B4577"
-        android:startColor="#3B4577" />
-    <!--    <stroke-->
-    <!--        android:width="1dp"-->
-    <!--        android:color="#182155" />-->
-<!--    <corners-->
-<!--        android:bottomLeftRadius="@dimen/dp_100"-->
-<!--        android:bottomRightRadius="@dimen/dp_20"-->
-<!--        android:topLeftRadius="@dimen/dp_20"-->
-<!--        android:topRightRadius="@dimen/dp_100" />-->
-    <corners
-        android:bottomLeftRadius="130dp"
-        android:bottomRightRadius="30dp"
-        android:topLeftRadius="30dp"
-        android:topRightRadius="130dp" />
-</shape>

OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml

@@ -1,176 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_och_sweeper_order_status_stationInfo"
-    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/dp_28"
-    android:background="@drawable/sweeper_line_panel_bg"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <TextView
-        android:id="@+id/module_och_sweeper_line_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_68"
-        android:layout_marginRight="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_64"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="--"
-        android:textColor="#FFF"
-        android:textSize="38dp"
-        android:textStyle="bold"
-        app:layout_constraintRight_toLeftOf="@+id/module_och_sweeper_tag"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_och_sweeper_tag"
-        android:layout_width="@dimen/dp_109"
-        android:layout_height="@dimen/dp_42"
-        android:layout_gravity="right"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginRight="@dimen/dp_60"
-        android:background="@drawable/sweeper_panel_anchor_bkg"
-        android:gravity="center"
-        android:text="小巴车"
-        android:textColor="#FFF"
-        android:textSize="@dimen/module_mogo_och_autopilot_order_tag_height"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/module_och_sweeper_line_name"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/module_och_sweeper_line_name" />
-
-    <View
-        android:id="@+id/line1"
+    android:layout_width="@dimen/dp_560"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:background="@drawable/bg_shape_work_mode"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent">
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_4"
-        android:layout_marginTop="@dimen/dp_24"
-        android:layout_marginLeft="@dimen/dp_30"
-        android:layout_marginRight="@dimen/dp_30"
-        android:background="@drawable/sweeper_line_dividing_line1_selector"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_tag" />
+        android:layout_height="match_parent">
+        <View
+            android:id="@+id/sweeperListLine"
+            android:layout_width="@dimen/dp_10"
+            android:layout_height="@dimen/dp_36"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/sweeperListTitle"
+            app:layout_constraintBottom_toBottomOf="@+id/sweeperListTitle"
+            android:background="@drawable/sweeper_list_left_top_line"/>
+        <TextView
+            android:id="@+id/sweeperListTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_42"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginStart="@dimen/dp_38"
+            android:text="任务列表"
+            android:layout_marginTop="@dimen/dp_43"
+            />
+        <ImageView
+            android:id="@+id/ivTaskRefresh"
+            android:layout_width="@dimen/dp_42"
+            android:layout_height="@dimen/dp_42"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/sweeperListTitle"
+            app:layout_constraintBottom_toBottomOf="@+id/sweeperListTitle"
+            android:layout_marginEnd="@dimen/dp_39"
+            android:src="@drawable/sweeper_refresh"
+            />
+        <View
+            android:id="@+id/viewTaskListLine"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@drawable/sweeper_line_dividing_line1_selector"
+            app:layout_constraintTop_toBottomOf="@+id/sweeperListTitle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_43"/>
+        <View
+            android:id="@+id/viewTaskListLine1"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@drawable/sweeper_line_dividing_line2_selector"
+            app:layout_constraintTop_toBottomOf="@+id/viewTaskListLine"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
-    <View
-        android:id="@+id/line2"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_4"
-        android:layout_marginLeft="@dimen/dp_30"
-        android:layout_marginRight="@dimen/dp_30"
-        android:background="@drawable/sweeper_line_dividing_line2_selector"
-        app:layout_constraintLeft_toLeftOf="@+id/line1"
-        app:layout_constraintRight_toRightOf="@+id/line1"
-        app:layout_constraintTop_toBottomOf="@+id/line1" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvTaskList"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/dp_116"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/viewTaskListLine"
+            app:layout_constraintVertical_bias="0.0"
+            tools:itemCount="6"
+            tools:listitem="@layout/sweeper_item_task_info" />
 
-    <TextView
-        android:id="@+id/module_och_sweeper_current_station_anchor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="@dimen/dp_24"
-        android:text="当前站点："
-        android:textColor="#CAD6FF"
-        android:textSize="@dimen/module_och_sweeper_order_start_station_anchor_textSize"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toRightOf="@+id/greenDot"
-        app:layout_constraintTop_toBottomOf="@+id/line2" />
-
-    <TextView
-        android:id="@+id/module_och_sweeper_current_station"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_16"
-        android:layout_marginRight="@dimen/dp_60"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:text="--"
-        android:textColor="#FFF"
-        android:textSize="@dimen/module_mogo_och_sweeper_station_name_text_size"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_current_station_anchor"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_current_station_anchor" />
-
-    <TextView
-        android:id="@+id/module_och_sweeper_next_station_anchor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_34"
-        android:text="下一站："
-        android:textColor="#CAD6FF"
-        android:textSize="@dimen/module_och_sweeper_order_start_station_anchor_textSize"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_current_station"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_current_station" />
-
-    <TextView
-        android:id="@+id/module_och_sweeper_order_end_station"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_goneMarginTop="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_16"
-        android:layout_marginRight="@dimen/dp_60"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="2"
-        app:layout_goneMarginBottom="@dimen/dp_40"
-        android:text="--"
-        android:textColor="#FFF"
-        android:textSize="@dimen/module_mogo_och_sweeper_station_name_text_size"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_next_station_anchor"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/switch_line_btn"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_sweeper_next_station_anchor"
-        tools:text="后路站1" />
-
-    <ImageView
-        android:id="@+id/greenDot"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
-        android:src="@drawable/sweeper_icon_current_subtask"
-        app:layout_constraintBottom_toBottomOf="@+id/module_och_sweeper_current_station"
-        app:layout_constraintLeft_toLeftOf="@+id/module_och_sweeper_line_name"
-        app:layout_constraintTop_toTopOf="@+id/module_och_sweeper_current_station" />
-
-    <ImageView
-        android:id="@+id/dotLine"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/sweeper_dot_line"
-        app:layout_constraintBottom_toTopOf="@+id/blueDot"
-        app:layout_constraintLeft_toLeftOf="@+id/greenDot"
-        app:layout_constraintRight_toRightOf="@+id/greenDot"
-        app:layout_constraintTop_toBottomOf="@+id/greenDot" />
-
-    <ImageView
-        android:id="@+id/blueDot"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/sweeper_icon_arriving_station"
-        app:layout_constraintBottom_toBottomOf="@+id/module_och_sweeper_order_end_station"
-        app:layout_constraintLeft_toLeftOf="@+id/greenDot"
-        app:layout_constraintTop_toTopOf="@+id/module_och_sweeper_order_end_station" />
-
-
-    <TextView
-        android:id="@+id/switch_line_btn"
-        android:layout_width="@dimen/sweeper_switch_line_btn_width_1"
-        android:layout_height="@dimen/sweeper_switch_line_btn_height_1"
-        android:layout_marginLeft="@dimen/dp_28"
-        android:background="@drawable/sweeper_ready"
-        android:gravity="center"
-        android:text="@string/sweeper_switch_line_btn"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_mogo_och_sweeper_station_notice_text_size"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/tvTaskConfirm"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_116"
+            android:background="@drawable/sweeper_task_list_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="确认"
+            android:textColor="#728bb0"
+            android:gravity="center"
+            android:textSize="@dimen/dp_42"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <include layout="@layout/sweeper_no_data_common_view"
+        android:visibility="gone"/>
+</FrameLayout>

OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml

@@ -19,7 +19,8 @@
          android:layout_marginStart="@dimen/dp_41"
          android:background="@drawable/bg_shape_work_mode"
          app:layout_constraintLeft_toLeftOf="parent"
-         app:layout_constraintTop_toBottomOf="@+id/sweeper_arc"/>
+         app:layout_constraintTop_toBottomOf="@+id/sweeper_arc"
+         android:visibility="gone"/>
     <com.mogo.och.sweeper.view.SweeperCurrentTaskInfoView
         app:layout_constraintTop_toBottomOf="@+id/sweeper_cl_work_mode"
         android:layout_width="@dimen/dp_560"
@@ -29,18 +30,19 @@
         android:layout_marginStart="@dimen/dp_41"
         android:layout_marginTop="@dimen/dp_36"
         android:layout_marginBottom="@dimen/dp_30"
+        android:visibility="gone"
         />
     <FrameLayout
         android:id="@+id/module_mogo_och_task_list_container"
-        android:layout_width="@dimen/dp_560"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginStart="@dimen/dp_41"
         app:layout_constraintLeft_toLeftOf="parent"
         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="gone"
-        android:layout_marginTop="@dimen/dp_36"/>
+        android:visibility="visible"
+        android:layout_marginBottom="@dimen/dp_30"/>
     <com.mogo.och.sweeper.ui.SweeperOperatePanelView
         android:id="@+id/module_mogo_och_sweeper_operate_panel"
         android:layout_width="wrap_content"

OCH/mogo-och-sweeper/src/main/res/layout/sweeper_current_task_info.xml

@@ -64,11 +64,19 @@
         android:id="@+id/viewTaskInfoLine"
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:background="@drawable/bg_shape_task_info_line"
+        android:background="@drawable/sweeper_line_dividing_line1_selector"
         app:layout_constraintTop_toBottomOf="@+id/tvTaskTime"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="@dimen/dp_26"/>
+    <View
+        android:id="@+id/viewTaskInfoLine1"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@drawable/sweeper_line_dividing_line2_selector"
+        app:layout_constraintTop_toBottomOf="@+id/viewTaskInfoLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
     <com.mogo.och.sweeper.view.SubTaskView
         android:id="@+id/currentSubTask"
         android:layout_width="match_parent"

OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/itemTaskView"
+    android:paddingEnd="@dimen/dp_36">
+    <TextView
+        android:id="@+id/tvTaskName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_40"
+        android:textColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="惠新西街南口地铁站"
+        android:layout_marginStart="@dimen/dp_38"
+        android:layout_marginTop="@dimen/dp_21"/>
+    <TextView
+        android:id="@+id/tvTaskDesc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_30"
+        android:textColor="#A6CEFF"
+        app:layout_constraintTop_toBottomOf="@+id/tvTaskName"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="全程包含12个子任务"
+        android:layout_marginStart="@dimen/dp_38"
+        android:layout_marginTop="1dp"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_shape_clean_mode"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="9:00"
+        android:textColor="@color/white"
+        android:paddingStart="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_12"
+        android:paddingTop="@dimen/dp_1"
+        android:paddingBottom="@dimen/dp_1"
+        android:textSize="@dimen/dp_28"/>
+    <ImageView
+        android:id="@+id/ivTaskSelect"
+        android:layout_width="@dimen/dp_21"
+        android:layout_height="0dp"
+        android:src="@drawable/sweeper_task_list_left_select_icon"
+        android:scaleType="fitXY"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:visibility="gone"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#89C5EC"
+        app:layout_constraintTop_toBottomOf="@+id/tvTaskDesc"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="@dimen/dp_38"
+        android:layout_marginTop="@dimen/dp_26"
+      />
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml

@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/no_order_data_view"
-    android:visibility="gone">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="visible">
 
     <ImageView
-        android:id="@+id/no_order_data_iv"
-        android:layout_width="502dp"
-        android:layout_height="455dp"
-        android:src="@drawable/no_order_data"
+        android:id="@+id/ivNoTaskData"
+        android:layout_width="@dimen/dp_294"
+        android:layout_height="@dimen/dp_244"
         android:scaleType="fitXY"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
-    <TextView
-        android:id="@+id/no_order_data_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#9099BF"
-    android:textSize="46dp"
-        android:gravity="center"
-        android:layout_marginTop="58dp"
+        android:src="@drawable/no_task_data"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
-        android:text="@string/sweeper_no_line_tip"/>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <TextView
+        android:id="@+id/tvNoTaskData"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="27dp"
+        android:gravity="center"
+        android:text="@string/sweeper_no_task_tip"
+        android:textColor="#9099BF"
+        android:textSize="@dimen/dp_31"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivNoTaskData" />
+
+    <ImageView
+        android:id="@+id/ivTaskRefresh"
+        android:layout_width="@dimen/dp_42"
+        android:layout_height="@dimen/dp_42"
+        android:layout_marginTop="@dimen/dp_39"
+        android:layout_marginEnd="@dimen/dp_39"
+        android:src="@drawable/sweeper_refresh"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-sweeper/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
     <string name="sweeper_switch_line_btn">准备就绪</string>
     <string name="sweeper_switch_line_btn_warning1">自动驾驶中，不可切换路线</string>
     <string name="sweeper_switch_line_btn_warning2">当前行程未完成，不可切换路线</string>
-    <string name="sweeper_no_line_tip">当前车辆无路线\n请联系运营人员绑定</string>
+    <string name="sweeper_no_task_tip">当前暂无任务</string>
     <string name="sweeper_line_start">起点: </string>
     <string name="sweeper_line_end">终点: </string>
     <string name="sweeper_change_line_commit_tip_s">更换路线成功</string>