[3.4.0-map-sdk] merge

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt

@@ -253,6 +253,11 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider {
                     } catch (t: Throwable) {
                         t.printStackTrace()
                     }
+                    try {
+                        UpgradeDbHelper.deleteRecord(success.versionName)
+                    } catch (t:Throwable) {
+                        t.printStackTrace()
+                    }
                     return@also
                 }
             }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -770,7 +770,7 @@ internal class DebugSettingView @JvmOverloads constructor(
 
         // 强制绘制引导线
         tbIsDrawAutopilotTrajectoryData.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = isChecked
+            FunctionBuildConfig.isForceDrawAutopilotTrajectoryByDebugSettingView = isChecked
         }
 
         // 初始化 GSP数据源 数据

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -362,6 +362,12 @@ internal class SOPSettingView @JvmOverloads constructor(
         scDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData
         //是否渲染点云数据
         scDrawPointCloudData.setOnCheckedChangeListener { _, isChecked ->
+            //打开点云效果时，如果自车光圈是关闭状态，则自动打开自车光圈（点云是跟随光圈的 默认没有光圈就不显示点云的）
+            if(isChecked && !FunctionBuildConfig.isDisplayAnimEnable){
+                scCarAperture.isChecked = true
+            }else{
+                scCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
+            }
             CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked)
             FunctionBuildConfig.isDrawPointCloudData = isChecked
             CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
@@ -371,11 +377,14 @@ internal class SOPSettingView @JvmOverloads constructor(
 
         //自车光圈
         scCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
-        scCarAperture.setOnCheckedChangeListener { _, isChecked ->
+        scCarAperture.setOnCheckedChangeListener { compoundButton, isChecked ->
             CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked)
-            FunctionBuildConfig.isDisplayAnimEnable = isChecked
             hmiAction("SOP 是否展示自车光圈，",isChecked)
             Log.i(TAG,"SOP 是否展示自车光圈，$isChecked")
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
+            FunctionBuildConfig.isDisplayAnimEnable = isChecked
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt

@@ -378,7 +378,8 @@ class SystemVersionView @JvmOverloads constructor(
      */
     override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
         if(status.hdMapVer!= null && status.hdMapVer.isNotEmpty()){
-            AppConfigInfo.adHdMapVersion = status.hdMapVer
+            //对地图版本进行截取
+            AppConfigInfo.adHdMapVersion = status.hdMapVer.substringAfter("/hadmap_data/").substringBefore(".sqlite")
             updateAdHdMapVersion()
         }
 
@@ -392,7 +393,8 @@ class SystemVersionView @JvmOverloads constructor(
      */
     override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
         if(statusInf.hdMapVer!= null && statusInf.hdMapVer.isNotEmpty()){
-            AppConfigInfo.adHdMapVersion = statusInf.hdMapVer
+            //对地图版本进行截取
+            AppConfigInfo.adHdMapVersion = statusInf.hdMapVer.substringAfter("/hadmap_data/").substringBefore(".sqlite")
             updateAdHdMapVersion()
         }
     }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java

@@ -76,7 +76,7 @@ public class MogoRouteOverlayManager implements
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;
         }
-        boolean force = FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
+        boolean force = FunctionBuildConfig.isForceDrawAutopilotTrajectoryByDebugSettingView || FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
         if (!force && autopilotMode.get() != 2) {
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt

@@ -189,6 +189,13 @@ object FunctionBuildConfig {
     @JvmField
     var isIgnoreConditionsDrawAutopilotTrajectoryData = false
 
+    /**
+     * 调试面板中，是否开启了强制绘制引导线
+     */
+    @Volatile
+    @JvmField
+    var isForceDrawAutopilotTrajectoryByDebugSettingView = false
+
     /**
      * 皮肤模式
      * 0--默认夜间模式，