[清扫车]UI 底部按钮图片修改

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

@@ -6,7 +6,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import com.amap.api.maps.model.LatLng;
 import com.amap.api.navi.model.NaviLatLng;

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

@@ -1,5 +1,6 @@
 package com.mogo.och.sweeper.fragment
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.lifecycleScope
@@ -100,6 +101,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
      * @return
      */
     private fun setShowTaskListPanelView(isShow: Boolean) {
+        tvTaskConfirm.setTextColor(Color.parseColor("#66FFFFFF"))
+        tvTaskConfirm.isSelected=false
         if (isShow) {
             sweeper_current_task_list_view.visibility = View.VISIBLE
         } else {
@@ -177,6 +180,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         override fun onItemClick(position: Int, mainTask: SweeperMainTaskBean) {
             mAdapter?.selectPosition(position)
             tvTaskConfirm.isSelected = true
+            tvTaskConfirm.setTextColor(Color.parseColor("#FFFFFFFF"))
             this@SweeperFragment.mMainTask = mainTask
         }
 

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

@@ -68,7 +68,7 @@ class TaskListAdapter() : RecyclerView.Adapter<TaskListAdapter.TaskViewHolder>()
         }
         if (position == mSelectPosition) {
             holder.selectIv.visibility = View.VISIBLE
-            holder.itemView.setBackgroundColor(Color.parseColor("#FF152644"))
+            holder.itemView.setBackgroundColor(Color.parseColor("#FF122B4E"))
         } else {
             holder.selectIv.visibility = View.GONE
             holder.itemView.setBackgroundColor(Color.parseColor("#00000000"))

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

@@ -104,14 +104,16 @@ class SweeperCurrentTaskInfoView : ConstraintLayout {
      * 设置准备就绪按钮时都可以点击
      */
     fun setEnableClickBtn(isWorking: Boolean) {
-        readyTaskBtn.isSelected = !isWorking
+        readyTaskBtn.isSelected = isWorking
         readyTaskBtn.isClickable=!isWorking
         presenter?.setWorking(isWorking)
         if (isWorking) {
             tvTaskState.text = "正在作业"
+            readyTaskBtn.text="任务中"
             tvTaskState.setBackgroundResource(R.drawable.bg_shape_task_state_working)
         } else {
             tvTaskState.text = "暂未准备"
+            readyTaskBtn.text="开始任务"
             tvTaskState.setBackgroundResource(R.drawable.bg_shape_task_state_not_ready)
         }
     }

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

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <rotate
-            android:fromDegrees="-45"
+            android:fromDegrees="315"
             android:pivotX="85%"
             android:pivotY="-35%">
             <shape android:shape="rectangle">

OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_dialog_no_title.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="#2A537F" android:endColor="#263A5B" android:angle="139"/>
+<gradient android:startColor="#2A537F" android:endColor="#263A5B" android:angle="135"/>
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-<gradient android:startColor="#20AAFF" android:endColor="#2F6EFF" android:angle="-44"/>
+<gradient android:startColor="#20AAFF" android:endColor="#2F6EFF" android:angle="315"/>
 <corners android:bottomLeftRadius="@dimen/dp_45" />
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-<gradient  android:startColor="#20AAFF" android:endColor="#2F6EFF" android:angle="-44"/>
+<gradient  android:startColor="#20AAFF" android:endColor="#2F6EFF" android:angle="315"/>
 <corners android:bottomLeftRadius="@dimen/dp_45" android:bottomRightRadius="@dimen/dp_45"/>
 </shape>

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

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

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

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

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

@@ -4,7 +4,7 @@
         <shape android:shape="rectangle">
 
             <corners android:bottomRightRadius="30dp" android:bottomLeftRadius="@dimen/dp_30"/>
-            <gradient android:angle="180" android:endColor="#004DFF" android:startColor="#20AAFF" />
+            <gradient android:angle="180" android:endColor="#2F6EFF" android:startColor="#20AAFF" />
         </shape>
     </item>
 </selector>

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

@@ -115,7 +115,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:text="确认"
-                android:textColor="@color/white"
+                android:textColor="#999999"
                 android:gravity="center"
                 android:textSize="@dimen/dp_42"
                 />

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

@@ -105,7 +105,6 @@
             android:id="@+id/currentSubTask"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/preSubTask" />
@@ -114,7 +113,6 @@
             android:id="@+id/lastSubTask"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/currentSubTask" />
@@ -122,7 +120,7 @@
                 android:id="@+id/tvStartAuto"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/dp_116"
-                android:background="@drawable/sweeper_start_auto_not_running"
+                android:background="@drawable/sweeper_start_auto_btn"
                 android:gravity="center"
                 android:text="启动自驾"
                 android:textColor="@android:color/white"
@@ -138,7 +136,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_116"
             android:layout_weight="1"
-            android:background="@drawable/sweeper_task_not_working"
+            android:background="@drawable/sweeper_task_btn"
             android:gravity="center"
             android:text="开始任务"
             android:textColor="@android:color/white"

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

@@ -58,7 +58,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:background="#89C5EC"
+        android:background="#4D89C5EC"
         app:layout_constraintTop_toBottomOf="@+id/tvTaskDesc"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
     <TextView
         android:id="@+id/tvLimitingVelocity"
@@ -9,7 +10,7 @@
         android:layout_height="@dimen/dp_52"
         android:background="@drawable/sweeper_bg_waring_limiting_velocity"
         android:gravity="center"
-        android:text="60"
+        tools:text="60"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_24"
         />

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

@@ -20,13 +20,13 @@
         />
     <ImageView
         android:id="@+id/ivSubTaskSelect"
-        android:layout_width="@dimen/dp_50"
-        android:layout_height="@dimen/dp_50"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:src="@drawable/sweeper_icon_select_subtask"
         app:layout_constraintTop_toTopOf="@+id/tvSubTaskName"
         app:layout_constraintBottom_toBottomOf="@+id/tvSubTaskName"
         app:layout_constraintEnd_toStartOf="@+id/tvSubTaskName"
-        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_17"
         android:layout_marginTop="@dimen/dp_8"
         android:visibility="gone"/>
     <ImageView
@@ -61,6 +61,6 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubTaskDesc"
         android:layout_marginStart="@dimen/dp_46"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginTop="@dimen/dp_10"
         />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -135,7 +135,7 @@
         android:layout_marginBottom="@dimen/dp_36"
         android:layout_gravity="center"
         android:gravity="center"
-        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_36"
         >
         <ImageView
             android:id="@+id/sweeperIvBgWaterWarning"
@@ -143,7 +143,7 @@
             android:layout_height="wrap_content"
             android:src="@drawable/icon_water_level_warning"
             tools:visibility="visible"
-            android:visibility="visible"
+            android:visibility="gone"
             android:layout_gravity="center"
             />
         <ImageView
@@ -152,7 +152,7 @@
             android:layout_height="@dimen/dp_30"
             android:src="@drawable/sweeper_water_selector"
             android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/dp_4"
+            android:layout_marginBottom="@dimen/dp_10"
             />
     </FrameLayout>
     <View

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

@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_36"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
             android:text="当前作业模式："
             android:textColor="@color/white"
             android:textSize="@dimen/dp_32"

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt

@@ -12,7 +12,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
-import com.mogo.eagle.core.function.call.map.*
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java

@@ -39,7 +39,7 @@ public class TapPositionView extends ConstraintLayout {
         tabN = findViewById(R.id.tap_n);
         tabD = findViewById(R.id.tap_d);
         typedArray = context.obtainStyledAttributes(attrs, R.styleable.TapPositionView);
-        if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)){
+        if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)||AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){
             tabP.setVisibility(View.GONE);
         }
     }