[8.4.0]

[b4]
[恢复跳站+debu到站]

OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/taskrunning/TaskRunningView.kt

@@ -83,15 +83,15 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
         })
         unmanned_actv_arriver_station.onClick {
             unmanned_loading_arrive_station.visibility = VISIBLE
-//            if(LineModel.isPreLastStation()==true){
-//                viewModel?.arriveStation()
-//            }else{
-//                viewModel?.skipStation()
-//            }
+            if(LineModel.isPreLastStation()==true){
+                viewModel?.arriveStation()
+            }else{
+                viewModel?.skipStation()
+            }
             viewModel?.arriveStation()
         }
         unmanned_actv_arriver_station_new.setOnLongClickListener {
-            CallerAutoPilotControlManager.sendTaskManagerRunningInfo()
+            viewModel?.arriveStation()
             true
         }
         unmanned_actv_complete_task.onClick {

OCH/shuttle/driver_unmanned/src/main/res/layout/shuttle_unmanned_task_running.xml

@@ -131,7 +131,7 @@
         android:layout_height="@dimen/dp_200"
         android:background="@drawable/unmanned_bus_switch_task_selector"
         android:gravity="center"
-        android:text="@string/unmanned_bus_running_task_jump_station"
+        android:text="@string/unmanned_bus_running_task_arrive_station"
         android:textColor="@color/unmanned_bus_task_submit_text_color_selector"
         android:textSize="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="parent"