Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo

# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt

OCH/common/common/build.gradle

@@ -61,7 +61,7 @@ dependencies {
     testImplementation project(path: ':OCH:common:common')
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation rootProject.ext.dependencies.amapnavi3dmap
+    api rootProject.ext.dependencies.amapnavi3dmap
     implementation rootProject.ext.dependencies.rxandroid
 
     implementation rootProject.ext.dependencies.arouter

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/routing/RoutingCallback.java

@@ -0,0 +1,5 @@
+package com.mogo.och.common.module.biz.routing;
+
+public interface RoutingCallback {
+    void showMap(boolean show);
+}

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/routing/RoutingManager.kt

@@ -0,0 +1,35 @@
+package com.mogo.och.common.module.biz.routing
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
+import com.mogo.och.common.module.biz.time.TimeService
+import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.manager.loop.BizLoopManager
+
+object RoutingManager {
+
+    private const val TAG = M_OCHCOMMON+"RoutingManager"
+
+    private var routingService: RoutingService? =
+        ARouter.getInstance().build(OchCommonConst.BIZ_ROUTING).navigation() as RoutingService
+
+
+    fun load(){
+        OchChainLogManager.writeChainLogInit("初始化信息","初始化算路验证系统")
+        d(TAG,"初始化信息_初始化算路验证系统")
+    }
+
+    fun getRoutingView():View?{
+        return routingService?.getRoutingView()
+    }
+
+    fun setRoutingCallback(callback: RoutingCallback?){
+        routingService?.setRoutingCallback(callback)
+    }
+
+
+}

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/routing/RoutingService.kt

@@ -0,0 +1,13 @@
+package com.mogo.och.common.module.biz.routing
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.template.IProvider
+
+interface RoutingService : IProvider {
+
+    fun getRoutingView(): View?
+
+    fun setRoutingCallback(callback: RoutingCallback?)
+
+}

OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt

@@ -39,6 +39,7 @@ class OchCommonConst {
         const val BIZ_TIME = "/ochbiz/common/time"
         const val BIZ_Media = "/ochbiz/common/media"
 
+        const val BIZ_ROUTING = "/ochbiz/common/routing"
         const val BIZ_OFFLINE = "/offlinedriver/offlinedata"
         const val BIZ_Bridge = "/birdge/bridge"
 
@@ -75,6 +76,19 @@ class OchCommonConst {
         const val ARRIVE_AT_END_STATION_DISTANCE = 10
 
 
+        // taxi 到达起始点围栏
+        const val ARRIVE_AT_START_STATION_DISTANCE = 15 //围栏由20m改为50m 再次改为15m
+
+        //算路终点UUID
+        const val TAXI_ROUTING_VERIFY_END_SITE = "taxi_routing_verify_end_site"
+
+        //算路起点UUID
+        const val TAXI_ROUTING_VERIFY_START_SITE = "taxi_routing_verify_start_site"
+
+        const val TYPE_MARKER_ROUTING_VERIFY = "TYPE_MARKER_TAXI_ROUTING_VERIFY"
+
+
+
         //b1 b2 平均速度 bus的平均里程：25km/h
         const val BUS_AVERAGE_SPEED = 25
 

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt

@@ -64,6 +64,13 @@ object OchChainLogManager {
 
     const val EVENT_KEY_INFO_ERROR = "analytics_event_och_error"
 
+    // 算路验证模式
+    const val EVENT_KEY_INFO_ROUTING = "analytics_event_och_routing"
+
+    fun writeChainLogRouting(title: String, info: String , upload: Boolean = true) {
+        writeChainLog(title, info, upload, EVENT_KEY_INFO_ROUTING)
+    }
+
     const val EVENT_KEY_INFO_VLM = "analytics_event_och_vlm"
 
     const val EVENT_KEY_INFO_BRIDGE = "analytics_event_och_bridge"

OCH/common/common/src/main/res/values/strings.xml

@@ -41,6 +41,10 @@
 
     <string name="common_dialog_goback">返回</string>
 
+    <string name="common_leave_station">滑动出发</string>
+    <string name="common_arrive_station">到站</string>
+    <string name="common_complete">结束</string>
+
     <string name="common_start_task_after_upload_success">请等待升级完成后再选择任务</string>