[6.6.0]

[saas 添加badcas信息]

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt

@@ -1,6 +1,8 @@
 package com.mogo.och.common.module.manager.autopilot.line
 
+import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.function.call.map.CallerMapGlobalTrajectoryDrawManager
+import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
@@ -36,8 +38,19 @@ object LineManager : CallerBase<ILineCallback>() {
     fun setLineInfo(lineInfo: LineInfo?){
         if(lineInfo==null){
             clearGlobalTrajectory(true)
+            CallerOrderListenerManager.invokeOrderLineUpdate("")
         }
         this.lineInfos = lineInfo
+        this.lineInfos?.let { line ->
+            if(ProjectUtils.isSaas()) {
+                val sb = StringBuilder()
+                sb.append(line.lineName)
+                line.multiMap?.forEach {
+                    sb.append(it.value)
+                }
+                CallerOrderListenerManager.invokeOrderLineUpdate(sb.toString())
+            }
+        }
     }
 
 

OCH/common/data/src/main/java/com/mogo/och/data/bean/LineInfo.kt

@@ -11,4 +11,9 @@ data class LineInfo(
      */
     val lineName: String,
 
+    /**
+     * 附加信息
+     */
+    var multiMap: MutableMap<String,String>? = mutableMapOf()
+
 )

OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java

@@ -4,6 +4,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -870,7 +871,17 @@ public class OrderModel {
             return;
         }
         busRoutesResult = result;
-        LineManager.setLineInfo(new LineInfo(busRoutesResult.getLineId(),busRoutesResult.getName()));
+        ArrayMap<String, String> attach = new ArrayMap<>();
+        try {
+            String lineTime = DateTimeUtil.formatLongToString(
+                    busRoutesResult.getTaskTime(),
+                    DateTimeUtil.HH_mm);
+            attach.put("taskInfo",lineTime);
+        }catch (Exception e){
+            OchChainLogManager.writeChainLog("设置任务名称","设置任务名称报错"+e.getStackTrace());
+        }
+        LineInfo lineInfo = new LineInfo(busRoutesResult.getLineId(), busRoutesResult.getName(),attach);
+        LineManager.setLineInfo(lineInfo);
         stationList.clear();
         stationList.addAll(result.getSites());
         for (int i = 0; i < stationList.size(); i++) {

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt

@@ -7,6 +7,7 @@ import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.LineInfo
 import com.mogo.och.weaknet.database.bean.TaskSiteDataBean
 import com.mogo.och.weaknet.database.repository.TaskSiteRepository
+import com.mogo.och.weaknet.model.BusLineModel
 import java.lang.Boolean
 import kotlin.String
 
@@ -60,6 +61,7 @@ class BusRoutesResponse : BaseData() {
                 if (lineInfo == null && taskAndsite.lineId != null && taskAndsite.lineName != null) {
                     lineInfo = LineInfo(taskAndsite.lineId!!, taskAndsite.lineName!!)
                 }
+                lineInfo?.multiMap?.put("taskInfo",BusLineModel.getTaskTime())
             }
             LineManager.setLineInfo(lineInfo)
 

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

@@ -254,8 +254,6 @@ object BusLineModel {
                         .putLong(BusSwitchLineActivity.LASTCOMMITLINEID,  line.lineId)
                     EventRepository.saveEventTaskStart(task.id,line.lineId,task.taskStartTime,line.name)
                     mBusLinesCallback?.onChangeLineIdSuccess()
-                    val taskTime = DateTimeUtil.formatLongToString(task.taskStartTime, DateTimeUtil.HH_mm)
-                    CallerOrderListenerManager.invokeOrderLineUpdate("${line.name}  ${taskTime}")
                 }
 
                 override fun startFail(msg: String) {
@@ -488,7 +486,6 @@ object BusLineModel {
     }
 
     fun endTask() {
-        CallerOrderListenerManager.invokeOrderLineUpdate("")
         currentTask?.let {task->
             if (task.taskId!=null&&task.lineId!=null) {
                 TaskRepository.endTask(task.taskId!!)