Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2

# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackerSourceHelper.kt

@@ -59,9 +59,10 @@ object TrackerSourceHelper {
         }
 
         // pnc预警
-        val pncColor = WarningHelper.getPncColor(data.uuid.toString())
-        if (pncColor.isNotBlank()) {
-            color = pncColor
+        WarningHelper.getPncColor(data.uuid.toString()){
+            if (it.isNotBlank()) {
+                color = it
+            }
         }
         return color
     }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt

@@ -1,12 +1,13 @@
 package com.mogo.eagle.core.function.map.identify
 
 import android.annotation.SuppressLint
-import android.util.Log
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.data.traffic.threatLevelColor
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84SatelliteTime
+import com.zhjt.service_biz.BizConfig
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.PlanningObject
 import java.util.concurrent.ConcurrentHashMap
@@ -97,7 +98,6 @@ object WarningHelper {
             return
         }
         if (exist) {
-            Log.i("EmArrow0926","obu color uuid : ${obuTrafficData.uuid}")
             obuWarningTrafficData[obuTrafficData.uuid!!] = obuTrafficData
         } else {
             obuWarningTrafficData.remove(obuTrafficData.uuid)
@@ -111,30 +111,33 @@ object WarningHelper {
         return ""
     }
 
-    fun getPncColor(uuid: String): String {
+    fun getPncColor(uuid: String, color:((String) -> Unit)) {
+        if(!FunctionBuildConfig.isPNCWarning){
+            color.invoke("")
+            return
+        }
         if (FunctionBuildConfig.isBeautyMode) {
             // 判断物体是否有预警信息
             if (pncWarningBeautyTrafficData.containsKey(uuid)) {
                 val planningTrack = pncWarningBeautyTrafficData[uuid]
                 if (planningTrack != null && !timeOut(planningTrack.time)) {
-                    Log.i("EmArrow0926","pnc color uuid : $uuid")
-                    return planningTrack.color
+                    color.invoke(planningTrack.color)
                 } else {
                     pncWarningBeautyTrafficData.remove(uuid)
                 }
             }
-            return ""
+            color.invoke("")
         } else {
             // 判断物体是否有预警信息
             if (pncWarningOriginTrafficData.containsKey(uuid)) {
                 val planningTrack = pncWarningOriginTrafficData[uuid]
                 if (planningTrack != null && !timeOut(planningTrack.time)) {
-                    return planningTrack.color
+                    color.invoke(planningTrack.color)
                 } else {
                     pncWarningOriginTrafficData.remove(uuid)
                 }
             }
-            return ""
+            color.invoke("")
         }
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -38,6 +39,7 @@ public class SmallMapFragment extends BaseFragment
         IMoGoAutopilotStatusListener {
     private final String TAG = "SmallMapFragment";
     protected SmallMapDirectionView mSmallMapDirectionView;
+    private int autoPilotStatus = 0;
 
     @Override
     public void onAttach(Context context) {
@@ -139,9 +141,13 @@ public class SmallMapFragment extends BaseFragment
 
     @Override
     public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) {
-        if (autoPilotStatusInfo.getPilotmode() != 1) {
+        int  tempStatus =   autoPilotStatusInfo.getPilotmode();
+        if (tempStatus != 1) {
             clearPolyline();
+        }else if (tempStatus  == 1 && autoPilotStatus == 0){
+            CallerAutoPilotManager.INSTANCE.getGlobalPath();
         }
+        autoPilotStatus = tempStatus;
     }
 
     @Override