[map]

[模型修改、高精地图版本升级]

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -492,6 +492,7 @@ object CharterPassengerModel {
             // 车辆空闲 订单结束已经还车
             // 结束车态轮训
             endCarStatusLoop()
+            this.carTypeChageListener?.setCarChangeListener(0)
             setOrderStatus(OrderStatusEnum.NoOrderUnuse)
         }
     }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt

@@ -53,7 +53,7 @@ class BusPassengerPresenter(view: MainFragment?) :
         CharterPassengerModel.setStatusChangeListener(TAG,this)
         CallerTelematicListenerManager.addListener(TAG, msgReceived)
         OCHPlanningStopSideStatusManager.addListener(TAG,this)
-        setCarChangeListener(R.raw.aiqinghao)
+        setCarChangeListener(R.raw.m1)
         //BusPassengerModel.setMoGoAutopilotPlanningListener(this)
 
     }
@@ -215,7 +215,7 @@ class BusPassengerPresenter(view: MainFragment?) :
                 mView?.setCarModle(R.raw.pengyouhao)
             }
             else -> {
-                mView?.setCarModle(R.raw.aiqinghao)
+                mView?.setCarModle(R.raw.m1)
             }
         }
     }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt

@@ -52,7 +52,6 @@ class MainFragment :
     }
 
     override fun initViews() {
-        setCarModle(R.raw.m1)
         cb_bp_video_player.onClick {
             openSettingPage(M1ContainFragment.VIDEOTAB)
         }

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -99,9 +99,7 @@ object ConfigStartUp {
         } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
             HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
         } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
-        } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+            HdMapBuildConfig.currentCarVrIconRes = R.raw.m1
         }
 
 

gradle.properties

@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.6.4
 MOGO_TELEMATIC_VERSION=1.4.6.4
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.10.0.9
+MAP_SDK_VERSION=2.11.0.12
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7