diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 8f38ab143a..fffbe54847 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/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) } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 683b36bbff..65d0bdd294 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/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) } } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 6e17e00b9f..81e38f028f 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/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) } diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d b/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d index 69bccf4199..d0f375886a 100644 Binary files a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d and b/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d differ diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 6e70b33d3e..3e8e790b8c 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/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 } diff --git a/core/mogo-core-res/src/main/res/raw/m1.nt3d b/core/mogo-core-res/src/main/res/raw/m1.nt3d new file mode 100644 index 0000000000..d0f375886a Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/m1.nt3d differ diff --git a/gradle.properties b/gradle.properties index 3cc68ab74a..6c46f43f2c 100644 --- a/gradle.properties +++ b/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