[6.7.0]

[fea]
[暴露orderId]

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

@@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapGlobalTrajectoryDrawManager
+import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
@@ -253,6 +254,7 @@ object LineManager : CallerBase<ILineCallback>() {
         CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
         TrajectoryAndDistanceManager.setStationPoint(null, null, null)
         this.orderId = ""
+        CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(this.orderId)
         OchLocationManager.removeGCJ02Listener(TAG)
     }
 
@@ -300,6 +302,7 @@ object LineManager : CallerBase<ILineCallback>() {
             this.orderId =  "${lineInfo.lineId}_${start.siteId}_${end.siteId}"
             parameters?.orderId = this.orderId
             parameters?.firstAutopilotFlag = isFirstStartAutopilot
+            CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(this.orderId)
 
             if (parameters?.autoPilotLine == null) {
                 parameters?.autoPilotLine = AutoPilotLine(

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt

@@ -76,4 +76,9 @@ interface IEagleBaseFunctionCall4Och {
      */
     fun setOchLoginNo(loginNo: String?){}
 
+    /**
+     * Och设置 启动自动驾驶附带的orderId
+     */
+    fun setOchAutopilotOrderId(orderId:String?){}
+
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt

@@ -8,6 +8,7 @@ import com.mogo.eagle.core.function.api.och.toolkit.ToolKitCustomItemAddParam
 import com.mogo.eagle.core.function.api.och.toolkit.ToolKitDefaultItemAddParam
 import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import kotlin.properties.Delegates
 
 /**
  * 鹰眼底层提供给 Och业务层 调用的接口
@@ -16,6 +17,12 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
 
     const val TAG = "CallerEagleBaseFunctionCall4OchManager"
 
+    private var _autopilotOrderId: String? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+
+        }
+    }
+
 
     /**
      * 注册 工具箱 item点击事件监听 (默认样式item的点击事件监听，自定义样式的item的点击交给view自己处理)
@@ -103,4 +110,9 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
     override fun setOchLoginNo(loginNo: String?) {
         CallerDataCenterBizManager.notifyLoginInfo(loginNo)
     }
+
+    override fun setOchAutopilotOrderId(orderId: String?) {
+        super.setOchAutopilotOrderId(orderId)
+        _autopilotOrderId = orderId
+    }
 }