Merge branch 'dev_robotaxi-d_241112_6.8.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_241112_6.8.0

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
@@ -454,6 +455,10 @@ object LineModel {
     }
 
     fun endTaskByOther(taskId: Long,plateNumber:String) {
+        if(LoginStatusManager.getLoginInfo()?.plateNumber==plateNumber){
+            CallerLogger.d(TAG,"当前车辆消耗任务")
+            return
+        }
         RepositoryManager.endTaskByOther(taskId)
         mBusLinesCallbackMap.forEach { callback ->
             callback.value.onEndTaskByOther(taskId,plateNumber)

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt

@@ -151,7 +151,12 @@ object TaskDb : IDbRepository {
 
     fun endTask(taskId: Long) {
         BizLoopManager.runInIoThread{
-            taskDataDao?.endTask(taskId)
+            val taskInfo = taskDataDao?.queryTaskByTaskIdOne(taskId)
+            if(taskInfo!=null){
+                if (taskInfo.status == TaskDataBean.unUse) {
+                    taskDataDao?.endTask(taskId)
+                }
+            }
         }
     }
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt

@@ -89,8 +89,8 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal
             .tips("请点击按钮反馈验证结果")
             .showClose(true)
             .cancelTextColor(R.color.taxi_color_FF4E41)
-            .cancelStr("线路可用")
-            .confirmStr("线路不可用")
+            .cancelStr("线路不可用")
+            .confirmStr("线路可用")
             .status(CommonDialogStatus.Status.success)
             .clickListener(object :CommonDialogStatus.ClickListener{
                 override fun confirm() {