[m1]

[1.0.2]
[删除adas 的直接依赖]

OCH/mogo-och-bus-passenger/build.gradle

@@ -75,7 +75,6 @@ dependencies {
     implementation rootProject.ext.dependencies.amapnavi3dmap
     implementation project(":OCH:mogo-och-common-module")
     compileOnly project(":libraries:mogo-map")
-    compileOnly project(':libraries:mogo-adas')
     implementation project(':core:mogo-core-res')
     testImplementation 'junit:junit:4.12'
 

OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt

@@ -4,15 +4,12 @@ import android.content.Context
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.mogo.commons.module.status.IMogoStatusChangedListener
-import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.bus.passenger.constant.BusPassengerConst
-import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment
+import com.mogo.och.bus.passenger.ui.MainPassengerFragment
 
 /**
  * 网约车-Bus-乘客端
@@ -23,7 +20,7 @@ import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment
 class MogoOCHBusPassenger : IMogoOCH {
     private var mActivity: FragmentActivity? = null
     private var mContainerId = 0
-    private var mPassengerFragment: BusPassengerRouteFragment? = null
+    private var mPassengerFragment: MainPassengerFragment? = null
     override fun createCoverage(activity: FragmentActivity, containerId: Int) {}
     override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
         mActivity = activity
@@ -56,7 +53,7 @@ class MogoOCHBusPassenger : IMogoOCH {
     private fun showFragment() {
         if (mPassengerFragment == null) {
             d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
-            mPassengerFragment = BusPassengerRouteFragment()
+            mPassengerFragment = MainPassengerFragment()
             mActivity!!.supportFragmentManager.beginTransaction()
                 .add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss()
             return

OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java

@@ -2,9 +2,6 @@ package com.mogo.och.bus.passenger.bean.request;
 
 public
 /**
- * @author congtaowang
- * @since 2021/3/22
- *
  * 根据车机行驶线路站点信息
  */
 class BusPassengerQueryLineRequest {

OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java

@@ -4,8 +4,6 @@ import com.amap.api.maps.model.LatLng;
 
 import java.util.List;
 
-import mogo.telematics.pad.MessagePad;
-
 /**
  * Created on 2022/3/31
  */

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

@@ -3,14 +3,13 @@ package com.mogo.och.bus.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback
 import com.mogo.och.bus.passenger.model.BusPassengerModel
 import com.mogo.och.bus.passenger.ui.BusPassengerFunctionDeviceFragment
 import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager
-import com.zhidao.support.adas.high.AdasManager
 import io.reactivex.disposables.Disposable
 
 class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragment?) :
@@ -68,9 +67,9 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme
         }
         disposeSubscribe(subscribe)
         subscribe = createSubscribe(1000) {
-            AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(0)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0)
         }
-        AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(1)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1)
         disposeSubscribe(subscribeDoorStatus)
         subscribeDoorStatus = createSubscribe {
             if (!OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) {
@@ -87,9 +86,9 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme
         }
         disposeSubscribe(subscribe)
         subscribe = createSubscribe(1000) {
-            AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(0)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0)
         }
-        AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(2)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2)
         disposeSubscribe(subscribeDoorStatus)
         subscribeDoorStatus = createSubscribe {
             if (OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) {
@@ -117,7 +116,7 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme
             }
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
                 // 靠边停车
-                AdasManager.getInstance().sendPlanningCmd(1)
+                CallerAutoPilotControlManager.sendPlanningCmd(1)
             }
             IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {
                 ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试")
@@ -137,7 +136,7 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme
             }
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
                 // 重新起步
-                AdasManager.getInstance().sendPlanningCmd(2)
+                CallerAutoPilotControlManager.sendPlanningCmd(2)
             }
             IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {
                 ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试")

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

@@ -1,14 +1,13 @@
 package com.mogo.och.bus.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
-import com.mogo.commons.mvp.Presenter
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.ui.BusPassengerFunctionSoftFragment
 import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager
-import com.zhidao.support.adas.high.AdasManager
 import io.reactivex.disposables.Disposable
 
 class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) :
@@ -135,7 +134,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
     fun openAndSetAircondition(modeCmd: Int, windSpeedCmd: Int, temperatureCmd: Int) {
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "" +
                 "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd")
-        AdasManager.getInstance().sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd)
         disposeSubscribe(airconditionDisposable)
         airconditionDisposable = createSubscribe(5000){
             if (!OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen&&
@@ -148,7 +147,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
     }
     fun closeAircondition() {
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭空调")
-        AdasManager.getInstance().sendRoboBusJinlvM1AirConditionerCmd(2,0,0,0)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(2,0,0,0)
         disposeSubscribe(airconditionDisposable)
         airconditionDisposable = createSubscribe(2000){
             if (OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen) {
@@ -161,7 +160,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
      */
     fun openAndSetHeader(windSpeedCmd: Int) {
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "打开暖风机、档位${windSpeedCmd}")
-        AdasManager.getInstance().sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd)
         disposeSubscribe(heaterDisposable)
         heaterDisposable = createSubscribe(2000){
             if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen&&
@@ -173,7 +172,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
 
     fun closeHeader(){
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭暖风机")
-        AdasManager.getInstance().sendRoboBusJinlvM1HeaderCmd(2,0)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(2,0)
         disposeSubscribe(heaterDisposable)
         heaterDisposable = createSubscribe(2000){
             if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen) {
@@ -186,14 +185,14 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "顶灯2:$leftLight")
         disposeSubscribe(subscribeLightTop1)
         if(leftLight){
-            AdasManager.getInstance().sendRoboBusJinlvM1MainLamp1Cmd(1)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(1)
             subscribeLightTop1 = createSubscribe{
                 if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")
                 }
             }
         }else{
-            AdasManager.getInstance().sendRoboBusJinlvM1MainLamp1Cmd(2)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(2)
             subscribeLightTop1 = createSubscribe{
                 if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")
@@ -205,14 +204,14 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "顶灯1:$rightLight")
         disposeSubscribe(subscribeLightTop2)
         if(rightLight){
-            AdasManager.getInstance().sendRoboBusJinlvM1MainLamp2Cmd(1)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(1)
             subscribeLightTop2 = createSubscribe{
                 if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")
                 }
             }
         }else{
-            AdasManager.getInstance().sendRoboBusJinlvM1MainLamp2Cmd(2)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(2)
             subscribeLightTop2 = createSubscribe{
                 if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")
@@ -224,14 +223,14 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "氛围灯:$atmosphereLight")
         disposeSubscribe(subscribeLightAtmosphere)
         if (atmosphereLight) {
-            AdasManager.getInstance().sendRoboBusJinlvM1SmallLampCmd(1)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(1)
             subscribeLightAtmosphere = createSubscribe{
                 if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")
                 }
             }
         } else {
-            AdasManager.getInstance().sendRoboBusJinlvM1SmallLampCmd(2)
+            CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(2)
             subscribeLightAtmosphere = createSubscribe{
                 if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) {
                     ToastUtils.showShort("操作未生效，请稍后重试吧～")

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

@@ -3,16 +3,17 @@ package com.mogo.och.bus.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback
 import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback
 import com.mogo.och.bus.passenger.model.BusPassengerModel
-import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment
+import com.mogo.och.bus.passenger.ui.MainPassengerFragment
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
 import java.util.*
 
-class BusPassengerPresenter(view: BusPassengerRouteFragment?) :
-    BusBasePassengerFunctionDevicePresenter<BusPassengerRouteFragment?>(view),
+class BusPassengerPresenter(view: MainPassengerFragment?) :
+    BusBasePassengerFunctionDevicePresenter<MainPassengerFragment?>(view),
     IBusPassengerControllerStatusCallback, IBusPassengerAutopilotPlanningCallback {
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
@@ -28,11 +29,15 @@ class BusPassengerPresenter(view: BusPassengerRouteFragment?) :
         BusPassengerModel.setControllerStatusCallback(TAG,null)
     }
     private fun setSpeed(speed:Float){
-        val speedKM =(Math.abs(speed) * 3.6f).toInt()
-        mView?.setSpeed(speedKM.toString())
+        UiThreadHandler.post {
+            val speedKM =(Math.abs(speed) * 3.6f).toInt()
+            mView?.setSpeed(speedKM.toString())
+        }
     }
     private fun setDistanceAndTime(distance: String,distanceUnit: String,sumTime:String,arrivedTime:String){
-        mView?.setDistanceAndTime(distance,distanceUnit,sumTime,arrivedTime)
+        UiThreadHandler.post {
+            mView?.setDistanceAndTime(distance, distanceUnit, sumTime, arrivedTime)
+        }
     }
     companion object{
         private const val TAG = "BusPassengerPresenter"

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

@@ -6,12 +6,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter
 import com.mogo.och.common.module.utils.SoundPoolHelper
-import com.zhidao.support.adas.high.AdasManager
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.m1.bus_p_function_setting_devices_fragment.*
-import java.util.concurrent.TimeUnit
 
 /**
  * @author: yangyakun
@@ -38,7 +33,6 @@ class BusPassengerFunctionDeviceFragment :
         }
         tv_car_setting_stopside.setOnClickListener {
             // 执行靠边停车 AdasManager.getInstance().sendPlanningCmd(1);
-            AdasManager.getInstance().sendPlanningCmd(1);
             mPresenter?.startStopSide()
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
         }

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

@@ -21,8 +21,8 @@ import java.lang.ref.WeakReference
  * @author: wangmingjun
  * @date: 2022/4/12
  */
-class BusPassengerRouteFragment :
-    MvpFragment<BusPassengerRouteFragment?, BusPassengerPresenter?>() {
+class MainPassengerFragment :
+    MvpFragment<MainPassengerFragment?, BusPassengerPresenter?>() {
 
     private var bpFunctionGroupDialogFragment: WeakReference<BusPassengerFunctionFragment>? = null
 

OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml

@@ -42,7 +42,6 @@
         android:layout_marginTop="@dimen/dp_74"
         android:layout_marginStart="@dimen/dp_29"
         android:layout_width="@dimen/dp_152"
-        android:gravity="center"
         android:background="@drawable/bus_p_car_speed"
         android:orientation="vertical"
         android:layout_height="@dimen/dp_152">
@@ -52,12 +51,15 @@
             android:text="0"
             android:textSize="@dimen/dp_60"
             android:gravity="center"
+            android:layout_marginTop="@dimen/dp_12"
             android:textColor="@color/bus_p_m1_f5fbff"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         <TextView
             android:textSize="@dimen/dp_19"
             android:text="@string/bus_p_m1_speed_unit"
+            android:layout_marginTop="-10dp"
+            android:layout_gravity="center_horizontal"
             android:textColor="@android:color/white"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>