[shuttle]

2023-03-23 17:24:42 +08:00
parent 3c81e145e1
commit dc32885197
104 changed files with 12 additions and 5652 deletions
--- a/OCH/mogo-och-bus-passenger/build.gradle
+++ b/OCH/mogo-och-bus-passenger/build.gradle
@@ -48,17 +48,6 @@ android {
            dimension "vehicle"
            buildConfigField 'int', 'NEW_TEST', '0'
        }
-        // 车型：金旅m1 小巴业务
-        m1 {
-            dimension "vehicle"
-            buildConfigField 'int', 'NEW_TEST', '1'
-        }
-
-        // 车型：金旅m1 小巴业务
-        m2 {
-            dimension "vehicle"
-            buildConfigField 'int', 'NEW_TEST', '1'
-        }
    }
 }

--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/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
 */
--- a/OCH/mogo-och-bus-passenger/src/m2/AndroidManifest.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/AndroidManifest.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.och.bus.passenger">
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-</manifest>
--- a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data
+++ b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data
--- a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data
+++ b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data
--- a/OCH/mogo-och-bus-passenger/src/m2/java/BPRouteDataTestUtils.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/BPRouteDataTestUtils.java
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt
@@ -1,92 +0,0 @@
-package com.mogo.och.bus.passenger
-
-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.PM2BaseFragment
-
-/**
- * 网约车-Bus-乘客端
- *
- * Created on 2022/3/29
- */
-@Route(path = BusPassengerConst.PATH)
-class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener {
-    private var mActivity: FragmentActivity? = null
-    private var mContainerId = 0
-    private var mPM2Fragment: PM2BaseFragment? = null
-    override fun createCoverage(activity: FragmentActivity, containerId: Int) {}
-    override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
-        mActivity = activity
-        mContainerId = containerId!!
-//        if (MogoStatusManager.getInstance().isScreenCoverDismiss){
-            showFragment()
-//        }else{
-//            MogoStatusManager.getInstance()
-//                .registerStatusChangedListener("ochM2Passenger", StatusDescriptor.SCREEN_COVER, this)
-//        }
-        return null
-    }
-
-    override val functionName: String
-        get() = "och-bus-passenger-m2"
-
-    override fun onDestroy() {
-        // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        mActivity?.finish()
-    }
-
-    override fun init(context: Context) {
-    }
-
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private fun stepIntoVrMode() {
-        d(SceneConstant.M_TAXI_P + TAG, "进入vr模式")
-        getMapUIController()?.stepInVrMode(true) // 白天模式
-        stepInDayMode() //白天模式 状态栏字体颜色变黑
-    }
-
-    private fun showFragment() {
-        if (mPM2Fragment == null) {
-            d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
-            mPM2Fragment = PM2BaseFragment()
-            mActivity?.supportFragmentManager?.beginTransaction()
-                ?.add(mContainerId, mPM2Fragment!!)?.commitAllowingStateLoss()
-        }
-        d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
-        mActivity?.supportFragmentManager?.beginTransaction()?.show(mPM2Fragment!!)
-            ?.commitAllowingStateLoss()
-    }
-
-    private fun hideFragment() {
-        if (mPM2Fragment != null) {
-            mActivity?.supportFragmentManager?.beginTransaction()?.hide(mPM2Fragment!!)
-                ?.commitAllowingStateLoss()
-        }
-    }
-
-    companion object {
-        private val TAG = MogoOCHBusPassenger::class.java.simpleName
-    }
-
-    override fun onStatusChanged(descriptor: StatusDescriptor?, isTrue: Boolean) {
-        if (descriptor == StatusDescriptor.SCREEN_COVER){
-            if (isTrue){
-                showFragment()
-            }else{
-                hideFragment()
-            }
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java
@@ -1,21 +0,0 @@
-package com.mogo.och.bus.passenger.bean;
-
-import com.mogo.eagle.core.data.BaseData;
-
-/**
- * @author congtaowang
- * @since 2021/3/22
- *
- * 小巴车运营状态返回参数
- */
-public class PM2OperationStatusResponse extends BaseData {
-
-    public Result data;
-
-    public static class Result {
-        private String sn; //司机屏sn
-        private String phone; //司机手机号
-        public String plateNumber; //车牌号
-        public int driverStatus;//0:已收车，1:已出车
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java
@@ -1,16 +0,0 @@
-package com.mogo.och.bus.passenger.bean;
-
-public
-/**
- * @author congtaowang
- * @since 2021/3/22
- *
- * 根据车机行驶线路站点信息
- */
-class PM2QueryLineRequest {
-
-    private String sn;
-    public PM2QueryLineRequest(String sn) {
-        this.sn = sn;
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java
@@ -1,28 +0,0 @@
-package com.mogo.och.bus.passenger.bean;
-
-import com.mogo.eagle.core.data.BaseData;
-
-/**
- * 网约车小巴路线接口请求响应结果 返回的是对应司机屏的线路信息
- *
- * @author tongchenfei
- */
-public class PM2RoutesResponse extends BaseData {
-    private PM2RoutesResult data;
-
-    public PM2RoutesResult getResult() {
-        return data;
-    }
-
-    public void setResult(PM2RoutesResult data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return "OchBusRoutesResponse{" +
-                "data=" + data +
-                '}';
-    }
-
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java
@@ -1,79 +0,0 @@
-package com.mogo.och.bus.passenger.bean;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 网约车小巴路线接口返回接口数据封装
- *
- * @author tongchenfei
- */
-public class PM2RoutesResult {
-    private List<PM2Station> sites;
-    private int lineId;
-    private String name; //线路名称
-    private int lineType;  //线路类型，0:环形
-    private String description;
-    private int status;
-    private String runningDur; //运营时间
-    private long taskTime; //线路时间班次
-
-    public List<PM2Station> getSites() {
-        return sites;
-    }
-
-    public int getLineId() {
-        return lineId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getLineType() {
-        return lineType;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public String getRunningDur() {
-        return runningDur;
-    }
-
-    @Override
-    public String toString() {
-        return "BusPassengerRoutesResult{" +
-                "sites=" + sites +
-                ", lineId=" + lineId +
-                ", name='" + name + '\'' +
-                ", lineType=" + lineType +
-                ", description='" + description + '\'' +
-                ", status=" + status +
-                ", runningDur='" + runningDur + '\'' +
-                '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        PM2RoutesResult that = (PM2RoutesResult) o;
-        return lineId == that.lineId
-                && lineType == that.lineType
-                && status == that.status
-                && sites.equals(that.sites)
-                && name.equals(that.name)
-                && runningDur.equals(that.runningDur);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(sites, lineId, name, lineType, description, status, runningDur);
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java
@@ -1,173 +0,0 @@
-package com.mogo.och.bus.passenger.bean;
-
-import java.util.Objects;
-
-/**
- * 单个网约车小巴车站信息
- *
- * @author wangmingjun
- */
-public class PM2Station {
-
-    private String name;
-    private String description;
-    private String cityCode;
-    private double lon; //高精坐标
-    private double lat; //高精坐标
-    private double gcjLon; //高德坐标
-    private double gcjLat; //高德坐标
-    private int businessType; //站点类型，9:taxi，10:bus
-    private int status;
-    private int siteId;
-    private int seq;
-    private int drivingStatus;//行驶信息，0初始值；1已经过；2当前站；3未到站
-    private int ifStop = 1; // 是否需要停靠、1需要、0不需要   // TODO: 2021/10/19 原来站点里有设计是否需要停靠字段，现设计暂无，默认都需要停靠
-    private boolean leaving;
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setCityCode(String cityCode) {
-        this.cityCode = cityCode;
-    }
-
-    public void setLon(double lon) {
-        this.lon = lon;
-    }
-
-    public void setLat(double lat) {
-        this.lat = lat;
-    }
-
-    public void setBusinessType(int businessType) {
-        this.businessType = businessType;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public void setSiteId(int siteId) {
-        this.siteId = siteId;
-    }
-
-    public void setSeq(int seq) {
-        this.seq = seq;
-    }
-
-    public void setDrivingStatus(int drivingStatus) {
-        this.drivingStatus = drivingStatus;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getCityCode() {
-        return cityCode;
-    }
-
-    public double getGcjLon() {
-        return gcjLon;
-    }
-
-    public double getGcjLat() {
-        return gcjLat;
-    }
-
-    public int getBusinessType() {
-        return businessType;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public int getSiteId() {
-        return siteId;
-    }
-
-    public int getSeq() {
-        return seq;
-    }
-
-    public int getDrivingStatus() {
-        return drivingStatus;
-    }
-
-    public double getLon() {
-        return lon;
-    }
-
-    public double getLat() {
-        return lat;
-    }
-
-    public void setIfStop(int ifStop) {
-        this.ifStop = ifStop;
-    }
-
-    public int getIfStop() {
-        return ifStop;
-    }
-
-    public void setLeaving(boolean leaving) {
-        this.leaving = leaving;
-    }
-
-    public boolean isLeaving() {
-        return leaving;
-    }
-
-    @Override
-    public String toString() {
-        return "OchBusStation{" +
-                "name='" + name + '\'' +
-                ", description='" + description + '\'' +
-                ", cityCode='" + cityCode + '\'' +
-                ", lon=" + lon +
-                ", lat=" + lat +
-                ", businessType=" + businessType +
-                ", status=" + status +
-                ", siteId=" + siteId +
-                ", seq=" + seq +
-                ", drivingStatus=" + drivingStatus +
-                ", ifStop=" + ifStop +
-                ", leaving=" + leaving +
-                '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        PM2Station that = (PM2Station) o;
-        return Double.compare(that.lon, lon) == 0
-                && Double.compare(that.lat, lat) == 0
-                && Double.compare(that.gcjLon, gcjLon) == 0
-                && Double.compare(that.gcjLat, gcjLat) == 0
-                && businessType == that.businessType
-                && status == that.status
-                && siteId == that.siteId
-                && seq == that.seq
-                && drivingStatus == that.drivingStatus
-                && ifStop == that.ifStop
-                && leaving == that.leaving
-                && Objects.equals(name, that.name)
-                && Objects.equals(cityCode, that.cityCode);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, description, cityCode, lon, lat, gcjLon, gcjLat, businessType, status, siteId, seq, drivingStatus, ifStop, leaving);
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt
@@ -1,10 +0,0 @@
-package com.mogo.och.bus.passenger.callback
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/15
- */
-interface ADASCallback {
-    fun updateHDMapStations(stations: MutableList<MutableList<Double>>)
-    fun removeHDMapStations()
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt
@@ -1,14 +0,0 @@
-package com.mogo.och.bus.passenger.callback
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/13
- */
-interface AutoPilotStatusCallback {
-    /**
-     * false: 未开启自驾， true ： 开启自驾
-     */
-    fun updateAutoStatus(isOpen: Boolean)
-
-    fun updateAutoStatus(status: Int)
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt
@@ -1,18 +0,0 @@
-package com.mogo.och.bus.passenger.callback
-
-import com.mogo.och.bus.passenger.bean.PM2Station
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/2
- */
-interface DrivingInfoCallback {
-    fun updateSpeed(speed: Int)
-    fun updatePlateNumber(carNum: String)
-    fun updateLine(lineName: String, lineDuring: String)
-    fun updateRemainMT(meters : Long, timeInSecond : Long) // 米，秒
-    fun changeOperationStatus(loginStatus : Boolean)
-    fun showNoTaskView(isTrue : Boolean)
-    fun updateLineStations(stations: MutableList<PM2Station>)
-    fun updateStationsInfo(stations: MutableList<PM2Station>, i: Int, isArrived: Boolean)
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt
@@ -1,16 +0,0 @@
-package com.mogo.och.bus.passenger.constant
-
-/**
- * Created on 2021/12/6
- */
-class M2Const {
-    companion object {
-        //站点UUID
-        const val M2_MAP_STATION_MAKER = "m2_map_station_maker"
-
-        /**
-         * Marker类型
-         */
-        const val TYPE_MARKER_M2_LINE = "TYPE_MARKER_M2_LINE"
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt
@@ -1,46 +0,0 @@
-package com.mogo.och.bus.passenger.model
-
-import android.content.Context
-import com.amap.api.maps.model.LatLng
-import com.mogo.och.bus.passenger.bean.PM2Station
-import com.mogo.och.bus.passenger.callback.ADASCallback
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/2
- */
-class PM2ADASModel private constructor() {
-
-    private var mContext: Context? = null
-    private var mAdasCallback: ADASCallback? = null
-
-    companion object {
-        val TAG = PM2ADASModel::class.java.simpleName
-        val INSTANCE: PM2ADASModel by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            PM2ADASModel()
-        }
-    }
-
-    fun init(context : Context){
-        this.mContext = context
-    }
-
-    fun setAdasCallback(adasCallback: ADASCallback?){
-        this.mAdasCallback = adasCallback
-    }
-
-    fun updateHDMapStations(stations: MutableList<PM2Station>){
-        var stationsList = mutableListOf<MutableList<Double>>()
-        for (i in stations.indices){
-            var listLatLng = mutableListOf<Double>() // 0: long 1:lat
-            listLatLng.add(stations[i].lon)
-            listLatLng.add(stations[i].lat)
-            stationsList.add(listLatLng)
-        }
-        mAdasCallback?.updateHDMapStations(stationsList)
-    }
-
-    fun removeHDMapStations(){
-        mAdasCallback?.removeHDMapStations()
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -1,530 +0,0 @@
-package com.mogo.och.bus.passenger.model
-
-import android.content.Context
-import android.media.AudioAttributes
-import android.media.AudioFocusRequest
-import android.media.AudioManager
-import android.net.ConnectivityManager
-import android.os.Build
-import android.os.Handler
-import androidx.annotation.RequiresApi
-import com.mogo.commons.module.intent.IMogoIntentListener
-import com.mogo.commons.module.intent.IntentManager
-import com.mogo.commons.voice.AIAssist
-import com.mogo.commons.voice.IMogoVoiceCmdCallBack
-import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
-import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.eagle.core.utilcode.util.GsonUtils
-import com.mogo.eagle.core.utilcode.util.NetworkUtils
-import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse
-import com.mogo.och.bus.passenger.bean.PM2RoutesResponse
-import com.mogo.och.bus.passenger.bean.PM2RoutesResult
-import com.mogo.och.bus.passenger.bean.PM2Station
-import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback
-import com.mogo.och.bus.passenger.callback.DrivingInfoCallback
-import com.mogo.och.bus.passenger.constant.BusPassengerConst
-import com.mogo.och.bus.passenger.network.PM2ModelLoopManager
-import com.mogo.och.common.module.bean.AppConnectMsg
-import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.constant.OchCommonConst
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
-import com.mogo.och.common.module.utils.DateTimeUtil
-import mogo.telematics.pad.MessagePad
-import kotlin.math.abs
-
-/**
- * @author: wangmingjun
- * @date: 2023/1/31
- */
-class PM2DrivingModel private constructor() {
-
-    private var mContext: Context? = null
-    private var mLocation: MogoLocation? = null
-
-    private var mRoutePoints = mutableListOf<MogoLocation>()
-    private var routesResult: PM2RoutesResult? = null
-
-    private var mCurrentAutoStatus = -1
-
-    var mStations = mutableListOf<PM2Station>()
-    private var mNextStationIndex = 0 // A-B要到达站的index
-    private var isGoingToNextStation = false //是否前往下一站过程中
-
-    private var mTwoStationsRouts = mutableListOf<MogoLocation>()
-    private var mPreRouteIndex = 0
-    private var mWipePreIndex = 0
-
-    private var mDrivingInfoCallback: DrivingInfoCallback? = null //行程信息
-    private var mAutoStatusCallback: AutoPilotStatusCallback? = null //自动驾驶状态
-
-    private var operationStatus: PM2OperationStatusResponse.Result? = null
-
-    private val handler = Handler(Handler.Callback { msg ->
-        if (msg.what == MSG_QUERY_BUS_P_STATION) {
-            queryDriverOperationStatus()
-            return@Callback true
-        }
-        false
-    })
-
-    companion object {
-        val TAG = PM2DrivingModel::class.java.simpleName
-        const val MSG_QUERY_BUS_P_STATION = 1001
-        val INSTANCE: PM2DrivingModel by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            PM2DrivingModel()
-        }
-    }
-
-    fun init(context : Context){
-        mContext = context
-        initListener()
-        // TODO: 2022/3/31
-        queryDriverOperationStatus()
-        startOrStopOrderLoop(true)
-    }
-
-    private fun initListener() {
-        //自动驾驶状态监听
-        CallerAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener)
-
-        // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, mMapLocationListener)
-//        CallerChassisLocationGCJ02ListenerManager.setListenerHz(TAG,2)//设置2hz, 1s返回2次
-
-        //司乘屏通信监听
-        CallerTelematicListenerManager.addListener(TAG,mReceivedMsgListener)
-
-        //自动驾驶轨迹监听
-        CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener)
-
-        //网络监听
-        IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
-
-    }
-
-    fun releaseListener(){
-        //自动驾驶状态监听
-        CallerAutoPilotStatusListenerManager.removeListener(TAG)
-
-        // 定位监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
-
-        CallerTelematicListenerManager.removeListener(TAG)
-
-        //自动驾驶轨迹监听
-        CallerPlanningRottingListenerManager.removeListener(TAG)
-    }
-
-    fun setDrivingInfoCallback(drivingInfoCallback : DrivingInfoCallback?){
-        mDrivingInfoCallback = drivingInfoCallback
-    }
-
-    fun setAutoStatusCallback(autoPilotStatusCallback: AutoPilotStatusCallback?){
-        mAutoStatusCallback = autoPilotStatusCallback
-    }
-
-    private val mNetWorkIntentListener = IMogoIntentListener { intentStr, _ ->
-            if (ConnectivityManager.CONNECTIVITY_ACTION == intentStr) {
-                if (NetworkUtils.isConnected(mContext)) {
-                    queryDriverOperationStatus()
-                }
-            }
-        }
-
-    private val mReceivedMsgListener: IReceivedMsgListener =
-        object  : IReceivedMsgListener{
-            @RequiresApi(Build.VERSION_CODES.O)
-            override fun onReceivedMsg(type: Int, byteArray: ByteArray) {//接收司机端发来的信息
-                if (OchCommonConst.BUSINESS_STRING == type){
-                    val msg = GsonUtils.fromJson(String(byteArray),AppConnectMsg::class.java) as AppConnectMsg
-                    Logger.d(SceneConstant.M_BUS_P+TAG,"onReceivedMsg = "+GsonUtils.toJson(msg))
-                    if (msg.isPlay){ //播报
-                        speakTTS(msg.msg)
-                    }
-                    if (msg.isViewShow){ //消息盒子显示内容
-                        OCHSocketMessageManager.pushAppOperationalMsgBox(
-                            DateTimeUtil.getCurrentTimeStamp(),msg.msg)
-                    }
-                }
-            }
-        }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun speakTTS(msg: String) {
-
-        var mAudioManager = mContext?.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        var mAudioAttributes = AudioAttributes.Builder()
-            .setUsage(AudioAttributes.USAGE_MEDIA)	//设置声音的用途
-            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)	//设置声音的类型
-            .build()
-        var mAudioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)	//设置焦点类型
-            .setAudioAttributes(mAudioAttributes)	//设置声音属性
-            .setAcceptsDelayedFocusGain(false)	//设置接受延迟获取焦点，需要设置OnAudioFocusChangeListener来监听焦点的获取
-            .build()
-        mAudioManager.requestAudioFocus(mAudioFocusRequest) //抢占焦点
-
-        AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(msg,AIAssist.LEVEL0,object : IMogoVoiceCmdCallBack{
-            override fun onSpeakEnd(speakText: String?) {
-                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-            }
-
-            override fun onSpeakError(speakText: String?, errorMsg: String?) {
-                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-            }
-
-            override fun onSpeakSelectTimeOut(speakText: String?) {
-                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-            }
-        })
-    }
-
-    private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener =
-        object  : IMoGoChassisLocationGCJ02Listener{
-            override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
-                if (null == mogoLocation) return
-                mLocation = mogoLocation
-                updateSpeed(mogoLocation)
-            }
-        }
-
-    private val moGoAutopilotPlanningListener = object : IMoGoPlanningRottingListener{
-        override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
-            d(SceneConstant.M_BUS_P + TAG, "och-rotting==globalPathResp = " + GsonUtils.toJson(globalPathResp))
-            globalPathResp?.let {
-                d(SceneConstant.M_BUS_P + TAG, "och-rotting==wayPointsSize = " + it.wayPointsList.size)
-                updateRoutePoints(it.wayPointsList)
-            }
-        }
-
-    }
-
-    fun updateRoutePoints(routePoints: List<MessagePad.Location>?) {
-        mRoutePoints.clear()
-        val latLngModels = CoordinateCalculateRouteUtil
-            .coordinateConverterWgsToGcjLocations(mContext, routePoints)
-        d(SceneConstant.M_BUS_P + TAG, "och-rotting==latLngModels = " + latLngModels.size)
-        mRoutePoints.addAll(latLngModels)
-        calculateTwoStationsRoute()
-    }
-
-    private fun updateSpeed(mogoLocation: MogoLocation) {
-        // km/h
-        val speedKM = (abs(mogoLocation.gnssSpeed) * 3.6f).toInt()
-
-        mDrivingInfoCallback?.updateSpeed(speedKM)
-    }
-
-    private val mAutoPilotStatusListener: IMoGoAutopilotStatusListener =
-        object : IMoGoAutopilotStatusListener {
-
-            override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) {
-                super.onAutopilotArriveAtStation(arrivalNotification)
-            }
-
-            override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
-                super.onAutopilotStatusResponse(autoPilotStatusInfo)
-                val status = autoPilotStatusInfo.state
-                if (mCurrentAutoStatus == status) return
-                d(SceneConstant.M_BUS_P+TAG, "onAutopilotStatusResponse ===== $status")
-                if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status){
-                    //美化模式下且行程中
-                    if (FunctionBuildConfig.isDemoMode &&
-                        mNextStationIndex>= 0 && mNextStationIndex <= mStations.size - 1
-                        && isGoingToNextStation){
-                        mAutoStatusCallback?.updateAutoStatus(true)
-                    }else{//非美化模式下
-                        mAutoStatusCallback?.updateAutoStatus(false)
-                    }
-
-                }else{//自驾状态 2
-                    mAutoStatusCallback?.updateAutoStatus(true)
-                }
-                mCurrentAutoStatus = status
-            }
-
-        }
-
-    private fun queryDriverOperationDelay() {
-        handler.sendEmptyMessageDelayed(MSG_QUERY_BUS_P_STATION,
-            BusPassengerConst.QUERY_BUS_P_STATION_DELAY
-        )
-    }
-
-    private fun queryDriverOperationStatus() {
-        mContext?.let {
-            PM2ServiceManager.queryDriverOperationStatus(
-                it,
-                object : OchCommonServiceCallback<PM2OperationStatusResponse> {
-                    override fun onSuccess(data: PM2OperationStatusResponse?) {
-                        if (data?.data == null) return
-                        if (data.data.driverStatus != operationStatus?.driverStatus
-                            || data.data.plateNumber != operationStatus?.plateNumber){
-                            d(SceneConstant.M_BUS_P+TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
-                            mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1)
-                        }
-                        operationStatus = data.data as PM2OperationStatusResponse.Result
-//                        mDrivingInfoCallback?.updatePlateNumber(data.data.plateNumber)
-                    }
-
-                    override fun onError() {
-                        if (!NetworkUtils.isConnected(mContext)) {
-                            ToastUtils.showShort(mContext!!.getString(R.string.network_error_tip))
-                        } else {
-                            ToastUtils.showShort(mContext!!.getString(R.string.request_error_tip))
-                        }
-                        queryDriverOperationDelay()
-                    }
-
-                    override fun onFail(code: Int, msg: String) {
-                        //延迟3s再次查询
-                        queryDriverOperationDelay()
-                    }
-                })
-        }
-    }
-
-    fun queryDriverSiteByCoordinate(){
-        mContext?.let {
-            PM2ServiceManager.queryDriverSiteByCoordinate(it,
-                object : OchCommonServiceCallback<PM2RoutesResponse>{
-                    override fun onSuccess(data: PM2RoutesResponse?) {
-
-                        if (data == null || data.result == null){
-                            if (routesResult != null) {
-                                routesResult == null
-                                updateLocalOrder()
-                                d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= result is null")
-                                return
-                            }
-                            return
-                        }
-                        if (data.result != null && data.result.equals(routesResult)){
-                            d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= not update")
-                            return
-                        }
-
-                        routesResult = data.result
-                        updatePassengerRouteInfo(data.result)
-                    }
-
-                    override fun onFail(code: Int, msg: String?) {
-                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
-                        if (code == 1003){
-                            queryDriverOperationDelay()
-                        }
-                        if (PM2ServiceManager.driverAppSn.isEmpty()){
-                            return
-                        }
-                        if (code == 1003) {
-                            routesResult = null
-                            isGoingToNextStation = false
-                            startOrStopCalculateRouteInfo(false)
-                            return
-                        }
-                    }
-
-                })
-        }
-    }
-
-    private fun updateLocalOrder(){
-        routesResult = null
-        mNextStationIndex = 0
-        isGoingToNextStation = false
-        startOrStopCalculateRouteInfo(false)
-        mDrivingInfoCallback?.showNoTaskView(true)
-    }
-
-    private fun updatePassengerRouteInfo(result: PM2RoutesResult) {
-        mDrivingInfoCallback?.updateLine(result.name, result.runningDur)
-            if (result.sites != null) {
-                mDrivingInfoCallback?.showNoTaskView(false)
-                val stations: List<PM2Station> = result.sites
-                mStations.clear()
-                mStations.addAll(stations)
-                mDrivingInfoCallback?.updateLineStations(mStations)
-                for (i in stations.indices) {
-                    val station: PM2Station = stations[i]
-                    if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED
-                        && station.isLeaving && i + 1 < stations.size) {
-                        mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<PM2Station>, i + 1, false)
-                        if (mNextStationIndex != i + 1) {
-                            d(SceneConstant.M_BUS_P+TAG,"och-rotting--start ")
-                            mTwoStationsRouts.clear()
-                            startRemainRouteInfo()
-                        }
-                        isGoingToNextStation = true
-                        mNextStationIndex = i + 1
-                        return
-                    } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) {
-                        mPreRouteIndex = 0
-                        isGoingToNextStation = false
-                        startOrStopCalculateRouteInfo(false)
-                        mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<PM2Station>, i, true)
-                        return
-                    }
-                }
-            }
-
-    }
-
-    fun loopRouteAndWipe(){
-        if (mRoutePoints != null && mRoutePoints.size > 0 && mLocation != null) {
-            val haveArrivedIndex = CoordinateCalculateRouteUtil
-                .getArrivedPointIndexNew(
-                    mWipePreIndex,
-                    mRoutePoints,
-                    mLocation
-                )
-            mWipePreIndex = haveArrivedIndex
-            d(SceneConstant.M_BUS_P + TAG,
-                "thread = " + Thread.currentThread().name + " haveArrivedIndex== " + haveArrivedIndex
-            )
-//            if (mAutopilotPlanningCallback != null) {
-//                val routePoints = CoordinateCalculateRouteUtil
-//                    .coordinateConverterLocationToLatLng(mContext, mRoutePoints)
-//                mAutopilotPlanningCallback.routeResult(routePoints, haveArrivedIndex)
-//            }
-        }
-    }
-
-    private fun startRemainRouteInfo() {
-        //开启实时计算剩余距离，剩余时间，预计时间
-        startOrStopCalculateRouteInfo(true)
-    }
-
-    fun dynamicCalculateRouteInfo(){
-        //计算当前位置和下一站的剩余点集合
-        //计算剩余点总里程和时间
-
-        //计算当前位置和下一站的剩余点集合
-        //计算剩余点总里程和时间
-        if (mTwoStationsRouts.size == 0) {
-            calculateTwoStationsRoute()
-        }
-
-        if (mTwoStationsRouts.size > 0 && mLocation != null) {
-            val lastPointsMap = CoordinateCalculateRouteUtil
-                .getRemainPointListByCompareNew(mPreRouteIndex, mTwoStationsRouts, mLocation)
-            for (index in lastPointsMap.keys) {
-                mPreRouteIndex = index
-                break
-            }
-            for (lastPoints in lastPointsMap.values) {
-                d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastPoints.size() = " + lastPoints.size)
-                var lastSumLength = 0f
-                lastSumLength = if (lastPoints.size == 1) { //只是最后一个点，计算当前位置和最后一个点的距离
-                    if (mNextStationIndex <= mStations.size - 1 && mNextStationIndex >= 0) {
-                        val stationNext: PM2Station = mStations[mNextStationIndex]
-                        CoordinateUtils.calculateLineDistance(
-                            stationNext.gcjLon, stationNext.gcjLat,
-                            mLocation!!.longitude, mLocation!!.latitude
-                        )
-                    } else {
-                        CoordinateUtils.calculateLineDistance(
-                            lastPoints[0].longitude, lastPoints[0].latitude,
-                            mLocation!!.longitude, mLocation!!.latitude
-                        )
-                    }
-                } else {
-                    CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints)
-                }
-                val lastTime = lastSumLength / BusPassengerConst.SHUTTLE_AVERAGE_SPEED * 3.6 //秒
-                d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastSumLength = $lastSumLength")
-                mDrivingInfoCallback?.updateRemainMT(
-                        lastSumLength.toLong(),
-                        lastTime.toLong()
-                    )
-            }
-        }
-    }
-
-    private fun calculateTwoStationsRoute() {
-        //找出前往站对应的轨迹点，拿出两站点的集合
-        d(SceneConstant.M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size)
-        if (mRoutePoints.size > 0) {
-            if (mStations.size > 1) { //两个站点及以上要计算两个站点间的轨迹路线
-                if (mNextStationIndex <= mStations.size - 1 && mNextStationIndex - 1 >= 0) {
-                    mTwoStationsRouts.clear()
-                    val stationNext: PM2Station = mStations[mNextStationIndex]
-                    val stationCur: PM2Station = mStations[mNextStationIndex - 1]
-                    //当前站在轨迹中对应的点
-                    val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
-                        0, mRoutePoints, stationCur.gcjLon, stationCur.gcjLat
-                    )
-                    //要前往的站在轨迹中对应的点
-                    val nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
-                        currentRouteIndex,
-                        mRoutePoints,
-                        stationNext.gcjLon,
-                        stationNext.gcjLat
-                    )
-
-                    d(SceneConstant.M_BUS_P + TAG, "och-rotting==currentRouteIndex = " + currentRouteIndex
-                                + "， nextRouteIndex = " + nextRouteIndex)
-
-                    if (currentRouteIndex < nextRouteIndex) { //如果找到的next在起点的轨迹前面，直接舍弃这个轨迹，不显示
-                        mTwoStationsRouts.addAll(
-                            mRoutePoints.subList(
-                                currentRouteIndex,
-                                nextRouteIndex + 1
-                            )
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 开始轮询计算剩余里程和时间
-     * @param isStart
-     */
-    fun startOrStopCalculateRouteInfo(isStart: Boolean) {
-        d(SceneConstant.M_BUS_P+TAG, "startOrStopCalculateRouteInfo() $isStart")
-        if (isStart) {
-            PM2ModelLoopManager.startCalculateRouteInfoLoop()
-        } else {
-            mTwoStationsRouts.clear()
-            PM2ModelLoopManager.stopCalculateRouteInfLoop()
-        }
-    }
-
-    /**
-     * 实时轨迹擦除
-     * @param isStart
-     */
-    private fun startOrStopRouteAndWipe(isStart: Boolean) {
-        if (isStart) {
-            PM2ModelLoopManager.startOrStopRouteAndWipe()
-        } else {
-            mWipePreIndex = 0
-            PM2ModelLoopManager.stopOrStopRouteAndWipe()
-        }
-    }
-
-    private fun startOrStopOrderLoop(start: Boolean) {
-        d(SceneConstant.M_BUS_P + TAG, "startOrStopOrderLoop() $start")
-        if (start) {
-            PM2ModelLoopManager.startQueryDriverLineLoop()
-        } else {
-            PM2ModelLoopManager.stopQueryDriverLineLoop()
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
@@ -1,77 +0,0 @@
-package com.mogo.och.bus.passenger.model
-
-import android.content.Context
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse
-import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest
-import com.mogo.och.bus.passenger.bean.PM2RoutesResponse
-import com.mogo.och.bus.passenger.network.PM2ServiceApi
-import com.mogo.och.common.module.biz.constant.OchCommonConst
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
-import com.mogo.och.common.module.biz.network.interceptor.transformTry
-
-/**
- * Created on 2022/3/31
- */
-object PM2ServiceManager {
-
-    private var mBusPassengerServiceApi =
-        MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(PM2ServiceApi::class.java)
-
-    private var driverSnCache = ""
-    /**
-     * 获取Bus司机端的sn
-     * @return
-     */
-    public val driverAppSn: String
-        get(){
-            val serverToken = getServerToken()
-            if (serverToken != driverSnCache && serverToken.isNotEmpty()) {
-                driverSnCache = serverToken
-            }
-            return driverSnCache
-        }
-
-    /**
-     * 查询绑定行驶的小巴车路线
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverSiteByCoordinate(
-        context: Context, callback: OchCommonServiceCallback<PM2RoutesResponse>?
-    ) {
-        mBusPassengerServiceApi.queryDriverSiteByCoordinate(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            PM2QueryLineRequest(
-                driverAppSn
-            )
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate=sn =$driverAppSn"))
-
-    }
-
-    /**
-     * 查询司机端出车收车状态，以及车牌号
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverOperationStatus(
-        context: Context,
-        callback: OchCommonServiceCallback<PM2OperationStatusResponse>?
-    ) {
-        mBusPassengerServiceApi.queryDriverOperationStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            driverAppSn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus=sn =$driverAppSn"))
-
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt
@@ -1,127 +0,0 @@
-package com.mogo.och.bus.passenger.network
-
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.och.bus.passenger.constant.BusPassengerConst
-import com.mogo.och.bus.passenger.model.PM2DrivingModel
-import io.reactivex.Observable
-import io.reactivex.ObservableOnSubscribe
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
-import java.util.concurrent.TimeUnit
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/1
- */
-object PM2ModelLoopManager {
-
-    private val TAG: String = PM2ModelLoopManager::class.java.getSimpleName()
-
-    private var mQueryLineDisposable: Disposable? = null   //心跳轮询
-    private var mRouteWipeDisposable: CompositeDisposable? = null  //估计擦除
-    private var mCalculateRouteDisposable: CompositeDisposable? = null //每隔2s计算一次剩余里程和时间
-
-
-    fun startOrStopRouteAndWipe() {
-        i(SceneConstant.M_BUS_P + TAG, "startOrStopRouteWipe()")
-        if (mRouteWipeDisposable != null) return
-        if (mRouteWipeDisposable == null) {
-            mRouteWipeDisposable = CompositeDisposable()
-        }
-        val disposable = startLoopRouteAndWipe()
-            .doOnSubscribe { }
-            .doOnError { }
-            .delay(
-                BusPassengerConst.LOOP_LINE_1S,
-                TimeUnit.MILLISECONDS,
-                true
-            ) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。
-            .subscribeOn(Schedulers.io())
-            .repeat() // repeat保证请求成功后能够重新订阅。
-            .retry() // retry保证请求失败后能重新订阅
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { }
-        mRouteWipeDisposable!!.add(disposable)
-    }
-
-    fun stopOrStopRouteAndWipe() {
-        if (mRouteWipeDisposable != null) {
-            mRouteWipeDisposable!!.dispose()
-            mRouteWipeDisposable = null
-        }
-    }
-
-    fun startQueryDriverLineLoop() {
-        if (mQueryLineDisposable != null && !mQueryLineDisposable!!.isDisposed) {
-            return
-        }
-        i(SceneConstant.M_BUS_P + TAG, "startQueryDriverLineLoop()")
-        mQueryLineDisposable = Observable.interval(
-            BusPassengerConst.LOOP_DELAY,
-            BusPassengerConst.LOOP_LINE_2S, TimeUnit.MILLISECONDS
-        )
-            .map { aLong: Long -> aLong + 1 }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { aLong: Long? ->
-                PM2DrivingModel.INSTANCE.queryDriverSiteByCoordinate()
-            }
-    }
-
-    fun stopQueryDriverLineLoop() {
-        if (mQueryLineDisposable != null) {
-            i(SceneConstant.M_BUS_P + TAG, "stopQueryDriverLineLoop()")
-            mQueryLineDisposable!!.dispose()
-            mQueryLineDisposable = null
-        }
-    }
-
-    fun startCalculateRouteInfoLoop() {
-        i(SceneConstant.M_BUS_P + TAG, "startCalculateRouteInfoLoop()")
-        if (mCalculateRouteDisposable != null) return
-        if (mCalculateRouteDisposable == null) {
-            mCalculateRouteDisposable = CompositeDisposable()
-        }
-        val disposable = startLoopCalculateRouteInfo()
-            .doOnSubscribe { }
-            .doOnError { }
-            .delay(
-                BusPassengerConst.LOOP_LINE_2S,
-                TimeUnit.MILLISECONDS,
-                true
-            ) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。
-            .subscribeOn(Schedulers.io())
-            .repeat() // repeat保证请求成功后能够重新订阅。
-            .retry() // retry保证请求失败后能重新订阅
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { }
-        mCalculateRouteDisposable!!.add(disposable)
-    }
-
-    fun stopCalculateRouteInfLoop() {
-        if (mCalculateRouteDisposable != null) {
-            i(SceneConstant.M_BUS_P + TAG, "stopCalculateRouteInfLoop()")
-            mCalculateRouteDisposable!!.dispose()
-            mCalculateRouteDisposable = null
-        }
-    }
-
-    private fun startLoopRouteAndWipe(): Observable<Int?> {
-        return Observable.create(ObservableOnSubscribe { emitter ->
-            if (emitter.isDisposed) return@ObservableOnSubscribe
-            PM2DrivingModel.INSTANCE.loopRouteAndWipe()
-            emitter.onComplete()
-        })
-    }
-
-    private fun startLoopCalculateRouteInfo(): Observable<Int?> {
-        return Observable.create(ObservableOnSubscribe { emitter ->
-            if (emitter.isDisposed) return@ObservableOnSubscribe
-            PM2DrivingModel.INSTANCE.dynamicCalculateRouteInfo()
-            emitter.onComplete()
-        })
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java
@@ -1,40 +0,0 @@
-package com.mogo.och.bus.passenger.network;
-
-import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse;
-import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest;
-import com.mogo.och.bus.passenger.bean.PM2RoutesResponse;
-
-import io.reactivex.Observable;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Query;
-
-/**
- * Created on 2022/3/31
- *
- * Bus乘客端接口定义
- */
-public interface PM2ServiceApi {
-    /**
-     * 查询bus司机端绑定路线
-     * @return 接口返回数据
-     */
-    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/business/v1/passenger/lineDataWithDriver/query" )
-    Observable<PM2RoutesResponse> queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body PM2QueryLineRequest request);
-
-    /**
-     * 查询司机端的登陆状态
-     * @param sn
-     * @return
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-//    @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query")
-    @GET("/och-shuttle-cabin/api/business/v1/passenger/loginStatus")
-    Observable<PM2OperationStatusResponse> queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
-
-
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt
@@ -1,41 +0,0 @@
-package com.mogo.och.bus.passenger.presenter
-
-import androidx.lifecycle.LifecycleOwner
-import com.mogo.commons.mvp.Presenter
-import com.mogo.och.bus.passenger.callback.ADASCallback
-import com.mogo.och.bus.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER
-import com.mogo.och.bus.passenger.model.PM2ADASModel
-import com.mogo.och.bus.passenger.ui.PM2HPMapFragment
-
-class PM2ADASPresenter(view: PM2HPMapFragment?) :
-    Presenter<PM2HPMapFragment?>(view), ADASCallback {
-
-    init {
-            PM2ADASModel.INSTANCE.init(context)
-            initListener()
-    }
-
-    private fun initListener() {
-        PM2ADASModel.INSTANCE.setAdasCallback(this)
-    }
-
-    private fun removeListener() {
-        PM2ADASModel.INSTANCE.setAdasCallback(null)
-    }
-
-    override fun onDestroy(owner: LifecycleOwner) {
-        super.onDestroy(owner)
-        removeListener()
-    }
-
-    override fun updateHDMapStations(stations: MutableList<MutableList<Double>>) {
-        for (i in stations.indices){
-            mView?.setMapMaker(M2_MAP_STATION_MAKER,stations[i])
-        }
-
-    }
-
-    override fun removeHDMapStations() {
-        mView?.removeMapMaker(M2_MAP_STATION_MAKER)
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
@@ -1,105 +0,0 @@
-package com.mogo.och.bus.passenger.presenter
-
-import androidx.lifecycle.LifecycleOwner
-import com.mogo.commons.mvp.Presenter
-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.ThreadUtils
-import com.mogo.och.bus.passenger.bean.PM2Station
-import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback
-import com.mogo.och.bus.passenger.callback.DrivingInfoCallback
-import com.mogo.och.bus.passenger.model.PM2ADASModel
-import com.mogo.och.bus.passenger.model.PM2DrivingModel
-import com.mogo.och.bus.passenger.ui.PM2DrivingInfoFragment
-
-class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) :
-    Presenter<PM2DrivingInfoFragment?>(view), DrivingInfoCallback, AutoPilotStatusCallback {
-
-    init {
-        PM2DrivingModel.INSTANCE.init(context)
-        PM2ADASModel.INSTANCE.init(context)
-        initListener()
-    }
-
-    override fun onDestroy(owner: LifecycleOwner) {
-        super.onDestroy(owner)
-        destroyListener()
-        PM2DrivingModel.INSTANCE.releaseListener()
-    }
-
-    private fun initListener(){
-        PM2DrivingModel.INSTANCE.setDrivingInfoCallback(this)
-        PM2DrivingModel.INSTANCE.setAutoStatusCallback(this)
-    }
-
-    private fun  destroyListener(){
-        PM2DrivingModel.INSTANCE.setDrivingInfoCallback(null)
-        PM2DrivingModel.INSTANCE.setAutoStatusCallback(null)
-    }
-
-    override fun updateSpeed(speed: Int) {
-//        CallerLogger.d(
-//            SceneConstant.M_BUS_P + "speed = ",speed.toString()
-//        )
-        ThreadUtils.runOnUiThread {
-            mView?.updateSpeed(speed)
-        }
-    }
-
-    override fun updatePlateNumber(carNum: String) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateCarPlateNum(carNum)
-        }
-    }
-
-    override fun updateLine(lineName: String, lineDuring: String) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateTaskName(lineName)
-            mView?.updateTaskDuringTime(lineDuring)
-        }
-    }
-
-    override fun updateRemainMT(meters: Long, timeInSecond: Long) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateRemainMT(meters, timeInSecond) //米，秒
-        }
-    }
-
-    override fun changeOperationStatus(loginStatus: Boolean) {
-        ThreadUtils.runOnUiThread {
-            mView?.changeOperationStatus(loginStatus)
-        }
-    }
-
-    override fun showNoTaskView(isTrue: Boolean) {
-        ThreadUtils.runOnUiThread {
-            mView?.showNoTaskView(!isTrue)
-        }
-        if (isTrue){
-            PM2ADASModel.INSTANCE.removeHDMapStations()
-        }
-    }
-
-    override fun updateLineStations(stations: MutableList<PM2Station>) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateLineStations(stations)
-        }
-        PM2ADASModel.INSTANCE.updateHDMapStations(stations)
-    }
-
-    override fun updateStationsInfo(stations: MutableList<PM2Station>, i: Int, isArrived: Boolean) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateStationsInfo(stations,i,isArrived)
-        }
-    }
-
-    override fun updateAutoStatus(isOpen: Boolean) {
-        ThreadUtils.runOnUiThread {
-            mView?.updateAutoStatus(isOpen)
-        }
-    }
-
-    override fun updateAutoStatus(status: Int) {
-
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt
@@ -1,7 +0,0 @@
-package com.mogo.och.bus.passenger.presenter
-
-import com.mogo.commons.mvp.Presenter
-import com.mogo.och.bus.passenger.ui.PM2BaseFragment
-
-class PM2Presenter(view: PM2BaseFragment?) :
-    Presenter<PM2BaseFragment?>(view)
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt
@@ -1,7 +0,0 @@
-package com.mogo.och.bus.passenger.presenter
-
-import com.mogo.commons.mvp.Presenter
-import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment
-
-class PM2VideoPresenter(view: PM2VideoFragment?) :
-    Presenter<PM2VideoFragment?>(view)
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java
@@ -1,33 +0,0 @@
-package com.mogo.och.bus.passenger.provider;
-
-import android.content.Context;
-import android.view.View;
-
-import com.mogo.och.bus.passenger.ui.widget.M2StatusBarView;
-import androidx.annotation.NonNull;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
-
-/**
- * @author congtaowang
- * @since 2020-01-06
- * <p>
- * 根据优先级控制显示 window view.
- */
-@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
-public class M2StatusViewManager implements IStatusViewLayout {
-
-
-    @NonNull
-    @Override
-    public View getStatusView(Context context) {
-        return new M2StatusBarView(context);
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt
@@ -1,72 +0,0 @@
-package com.mogo.och.bus.passenger.ui
-
-import android.provider.Settings
-import android.view.Surface
-import com.mogo.commons.mvp.MvpFragment
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.presenter.PM2Presenter
-import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment
-
-/**
- * @author: wangmingjun
- * @date: 2022/4/12
- */
-class PM2BaseFragment :
-    MvpFragment<PM2BaseFragment?, PM2Presenter?>() {
-
-    private var drivingFragment : PM2DrivingInfoFragment? = null
-    private var hdMapFragment : PM2HPMapFragment? = null
-    private var videoFragment : PM2VideoFragment? = null
-
-    override fun getLayoutId(): Int {
-        return R.layout.p_m2_fragment
-    }
-
-    override fun getTagName(): String {
-        return TAG
-    }
-
-    override fun initViews() {
-        //横竖屏
-//        setScreenDirection()
-
-        //隐藏小地图
-        initFragment()
-    }
-
-//    private fun setScreenDirection() {
-//        var ro = Settings.System.getInt(context?.contentResolver,
-//            Settings.System.USER_ROTATION,Surface.ROTATION_270)
-//        if (ro != Surface.ROTATION_270){
-//            ro = Surface.ROTATION_270
-//        }
-//       Settings.System.putInt(context?.contentResolver,
-//           Settings.System.USER_ROTATION,ro)
-//    }
-
-    /**
-     * 初始化行程信息，高静地图，宣传 三个fragment
-     */
-    private fun initFragment() {
-
-        if (drivingFragment == null) drivingFragment = PM2DrivingInfoFragment()
-        childFragmentManager.beginTransaction().add(R.id.driving_fragment, drivingFragment!!)
-            .show(drivingFragment!!).commitAllowingStateLoss()
-
-        if (hdMapFragment == null) hdMapFragment = PM2HPMapFragment()
-        childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!)
-            .show(hdMapFragment!!).commitAllowingStateLoss()
-
-        if (videoFragment == null) videoFragment = PM2VideoFragment()
-        childFragmentManager.beginTransaction().add(R.id.video_fragment, videoFragment!!)
-            .show(videoFragment!!).commitAllowingStateLoss()
-    }
-
-    override fun createPresenter(): PM2Presenter {
-        return PM2Presenter(this)
-    }
-
-    companion object {
-        private val TAG = PM2BaseFragment::class.java.simpleName
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -1,253 +0,0 @@
-package com.mogo.och.bus.passenger.ui
-
-import android.graphics.BitmapFactory
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
-import android.view.View
-import androidx.core.content.ContextCompat
-import com.amap.api.maps.model.LatLng
-import com.mogo.commons.mvp.MvpFragment
-import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
-import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.eagle.core.utilcode.util.DateTimeUtils
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.PM2Station
-import com.mogo.och.bus.passenger.presenter.PM2DrivingPresenter
-import com.mogo.och.common.module.utils.DateTimeUtil.*
-import com.mogo.och.common.module.utils.NumberFormatUtil
-import kotlinx.android.synthetic.m2.p_m2_driving_info_fragment.*
-import java.lang.ref.WeakReference
-import kotlin.math.ceil
-import kotlin.math.roundToInt
-
-/**
- * @author: wangmingjun
- * @date: 2022/4/12
- */
-class PM2DrivingInfoFragment :
-    MvpFragment<PM2DrivingInfoFragment?, PM2DrivingPresenter?>() {
-
-//    private var timeHandler: TimeHandler? = null
-
-    /**
-     * 改变自动驾驶状态
-     *
-     * @param status 2 - running  1 - enable  2 - disable
-     */
-    override fun getLayoutId(): Int {
-        return R.layout.p_m2_driving_info_fragment
-    }
-
-    override fun getTagName(): String {
-        return TAG
-    }
-
-    override fun initViews() {
-        speed_tv.setOnLongClickListener {
-            context?.let { ToggleDebugView.toggleDebugView.toggle(it) }
-            true
-        }
-
-        line_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color))
-        station_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color))
-
-//        current_time_tv.onClick {
-
-//            //测试V2X消息
-//            CallerMsgBoxManager.saveMsgBox(
-//                MsgBoxBean(
-//                    MsgBoxType.V2X,
-//                    V2XMsg(
-//                        "6666",
-//                        "超速行驶",
-//                        ""
-//                    )
-//                )
-//            )
-//
-//            val noticeTrafficStylePushData = NoticeTrafficStylePushData()
-//            noticeTrafficStylePushData.content= "测试公告布局"
-//            val noticeFromCloudMsg = NoticeFrCloudMsg(null, noticeTrafficStylePushData, 1)
-//            CallerMsgBoxManager.saveMsgBox(
-//                MsgBoxBean(
-//                    MsgBoxType.NOTICE, noticeFromCloudMsg)
-//            )
-//            BPRouteDataTestUtils.converToRouteData()
-//        }
-        updateCurrentTime()
-    }
-
-    override fun initViews(savedInstanceState: Bundle?) {
-        super.initViews(savedInstanceState)
-        overMapView?.let {
-            it.onCreateView(savedInstanceState)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        overMapView?.let{
-            it.onResume()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        overMapView?.let{
-            it.onPause()
-        }
-    }
-
-    override fun onDestroy() {
-//        timeHandler?.removeCallbacksAndMessages(null)
-        super.onDestroy()
-        overMapView?.let{
-            it.onDestroy()
-        }
-    }
-
-    fun updateSpeed(speed: Int){
-        speed_tv.text = speed.toString()
-    }
-
-    fun updateCarPlateNum(plateNum : String){
-
-    }
-
-    fun updateTaskName(name: String){
-        line_name_tv.text = name
-    }
-
-    fun updateTaskDuringTime(time : String){
-        line_during_tv.text = time
-    }
-
-    private fun updateCurrentTime(){
-        current_time_tv.text = formatCalendarToString(
-            DateTimeUtils.getCurrentDateTime(),HH_mm)
-
-        val date = formatCalendarToString(
-            DateTimeUtils.getCurrentDateTime(), yy_MM_dd)
-        val weekDay = DateTimeUtils.getWeekDayFromCalendar1(DateTimeUtils.getCurrentDateTime())
-        "$date  $weekDay".also { current_weekday_tv.text = it }
-
-        sendUpdateTimeTask() // 每10s更新一次
-    }
-
-    fun changeOperationStatus(status:Boolean){
-        if (!status){
-            updateNoOrderUI()
-        }
-    }
-
-    fun showNoTaskView(haveTask: Boolean){
-        setLineInfoView(haveTask)
-    }
-
-    private fun setLineInfoView(isShow: Boolean){
-        if (isShow){
-            line_name_tv.visibility = View.VISIBLE
-            line_during_tv.visibility = View.VISIBLE
-            no_line_tv.visibility = View.GONE
-        }else{
-            updateNoOrderUI()
-        }
-    }
-
-    private fun updateNoOrderUI() {
-        line_name_tv.visibility = View.GONE
-        line_during_tv.visibility = View.GONE
-        no_line_tv.visibility = View.VISIBLE
-        updateNoStationView()
-        overMapView?.let {
-            it.clearSiteMarkers()
-        }
-        overMapView?.let {
-            it.clearCustomPolyline()
-        }
-    }
-
-    private fun updateNoStationView(){
-        station_name_tv.setTextColor(resources.getColor(R.color.m2_next_tv_color))
-        station_name_title_tv.text = resources.getString(R.string.m2_p_station_title_tv)
-        station_name_tv.text = resources.getString(R.string.m2_p_empty_tv)
-        remain_mt.text = resources.getString(R.string.m2_p_empty_remain_km_minute)
-    }
-
-    override fun createPresenter(): PM2DrivingPresenter {
-        return PM2DrivingPresenter(this)
-    }
-
-    fun updateAutoStatus(isAutoPilot: Boolean) {
-        if (isAutoPilot){
-            context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_p_white_color)) }
-            context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.auto_button_bg) }
-        }else{
-            context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_button_auto_tv_color)) }
-            context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) }
-        }
-    }
-
-    fun updateLineStations(stations: MutableList<PM2Station>){
-        var stationsList = mutableListOf<LatLng>()
-        for (i in stations.indices){
-            val station = stations[i]
-            var latLng = LatLng(station.gcjLat,station.gcjLon)
-            stationsList.add(latLng)
-        }
-        overMapView?.let {
-            it.drawSiteMarkers(stationsList,
-                BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.9f)
-        }
-    }
-
-    fun updateStationsInfo(stations: MutableList<PM2Station>, i: Int, isArrived: Boolean){
-        if (stations.size == 0) return
-        if (0<= i && i<stations.size){
-            station_name_tv.setTextColor(resources.getColor(R.color.m2_next_tv_color))
-            station_name_tv.text  = stations[i].name
-        }
-        if (isArrived){//到站
-            station_name_title_tv.text = resources.getString(R.string.m2_p_station_title_arrived_tv)
-            remain_mt.text = resources.getString(R.string.m2_p_empty_remain_km_minute)
-        }else{ //前往目的地中
-            station_name_title_tv.text = resources.getString(R.string.m2_p_station_title_tv)
-        }
-    }
-
-    /**
-     * 剩余里程和时间
-     */
-    fun updateRemainMT(meters: Long, timeInSecond: Long) { //米。秒
-        var disUnit = "公里"
-        var remainDis: String? = "0"
-
-        if (meters > 0) {
-            if (meters / 1000 < 1) {
-                disUnit = "米"
-                remainDis = meters.toFloat().roundToInt().toString()
-            } else {
-                disUnit = "公里"
-                remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000)
-            }
-        }
-
-        val time = ceil(timeInSecond / 60f).toInt()
-
-        "$remainDis$disUnit | $time 分钟".also { remain_mt.text = it }
-    }
-
-    private fun sendUpdateTimeTask() {
-        UiThreadHandler.postDelayed({
-            updateCurrentTime()
-        },LOOP_TIME_TEXT)
-    }
-
-    companion object {
-        private val TAG = PM2DrivingInfoFragment::class.java.simpleName
-        const val LOOP_TIME_TEXT = 10 * 1000L
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt
@@ -1,122 +0,0 @@
-package com.mogo.och.bus.passenger.ui
-
-import android.os.Bundle
-import com.mogo.commons.AbsMogoApplication
-import com.mogo.commons.mvp.MvpFragment
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMarkerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.map.marker.MogoMarkerOptions
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE
-import com.mogo.och.bus.passenger.presenter.PM2ADASPresenter
-import com.mogo.och.common.module.utils.OCHThreadPoolManager
-import kotlinx.android.synthetic.m2.p_m2_hpmap_fragment.*
-import java.util.*
-
-/**
- * @author: wangmingjun
- * @date: 2022/4/12
- */
-class PM2HPMapFragment :
-    MvpFragment<PM2HPMapFragment?, PM2ADASPresenter?>() {
-    /**
-     * 改变自动驾驶状态
-     *
-     * @param status 2 - running  1 - enable  2 - disable
-     */
-    override fun getLayoutId(): Int {
-        return R.layout.p_m2_hpmap_fragment
-    }
-
-    override fun getTagName(): String {
-        return TAG
-    }
-
-    override fun initViews() {
-    }
-
-    override fun initViews(savedInstanceState: Bundle?) {
-        super.initViews(savedInstanceState)
-        mapBizView.onCreate(savedInstanceState)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapBizView.onResume()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapBizView.onLowMemory()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapBizView.onSaveInstanceState(outState)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapBizView.onPause()
-    }
-
-    override fun onDestroyView() {
-        mapBizView.onDestroy()
-        super.onDestroyView()
-    }
-
-    override fun createPresenter(): PM2ADASPresenter {
-        return PM2ADASPresenter(this)
-    }
-
-    companion object {
-        private val TAG = PM2HPMapFragment::class.java.simpleName
-    }
-
-    fun setMapMaker(
-        uuid: String,
-        station: MutableList<Double>,
-    ) {
-        //开启线程执行起终点marker设置
-        val setMapMarkerRunnable = Runnable {
-            d("setMapMaker= " + Thread.currentThread().name,
-                uuid + "=latitude=" + station[1] + ",longitude=" + station[0])
-            val options = MogoMarkerOptions()
-                .owner(TYPE_MARKER_M2_LINE)
-                .anchor(0.5f, 0.5f)
-                .set3DMode(true)
-                .gps(true)
-                .controlAngle(true)
-                .icon3DRes(R.raw.star_marker)
-                .longitude(station[0])
-                .latitude(station[1])
-            val marker = Objects.requireNonNull(
-                getMarkerManager(AbsMogoApplication.getApp())
-            )?.addMarker(uuid, options)
-            val centerLine =
-                getMapUIController()!!
-                    .getCenterLineInfo(
-                        station[0], station[1], -1f
-                    )
-            if (null != centerLine && marker != null) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致
-                marker.setRotateAngle(centerLine.angle!!.toFloat())
-            }
-        }
-        OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
-    }
-
-    fun removeMapMaker(
-        uuid: String,
-    ) {
-        //开启线程移除起终点marker设置
-        val removeMapMarkerRunnable = Runnable {
-            d("RemoveMapMaker=" + Thread.currentThread().name, uuid)
-            Objects.requireNonNull(
-                getMarkerManager(AbsMogoApplication.getApp())
-            )?.removeMarkers(uuid)
-        }
-        OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable)
-    }
-
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
@@ -1,234 +0,0 @@
-package com.mogo.och.bus.passenger.ui.video
-
-import com.mogo.commons.mvp.MvpFragment
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.presenter.PM2VideoPresenter
-import com.mogo.och.bus.passenger.ui.widget.video.RotationItem
-import kotlinx.android.synthetic.m2.p_m2_video_fragment.*
-
-/**
- * @author: wangmingjun
- * @date: 2022/4/12
- */
-class PM2VideoFragment :
-    MvpFragment<PM2VideoFragment?, PM2VideoPresenter?>() {
-
-    private var arrayListOf = mutableListOf<RotationItem>()
-
-    override fun getLayoutId(): Int {
-        return R.layout.p_m2_video_fragment
-    }
-
-
-    override fun createPresenter(): PM2VideoPresenter {
-        return PM2VideoPresenter(this)
-    }
-
-    companion object {
-        private val TAG = PM2VideoFragment::class.java.simpleName
-    }
-
-    override fun getTagName(): String {
-        return TAG
-    }
-
-    override fun initViews() {
-        initResourceData()
-        imageVideoRotationView.setData(arrayListOf)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        imageVideoRotationView.setPause()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        imageVideoRotationView.setResume()
-    }
-
-    private fun initResourceData() {
-        arrayListOf.clear()
-        arrayListOf.add(
-            RotationItem(
-                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
-                1,
-                "",
-                "1"
-            )
-        )
-//        if (BuildConfig.FLAVOR.contains("dali")){ //大理 目前还都使用的mogo 的cos  https://img.zhidaohulian.com/fileServer/online_car_hailing/1678932482045/1080%2A565%20.mp4
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678932482045/1080%2A565%20.mp4",
-//                    1,
-//                    "",
-//                    "1"
-//                )
-//            )
-//        }else if (BuildConfig.FLAVOR.contains("yantai")){ //烟台
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
-//                    0,
-//                    "",
-//                    "1"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
-//                    0,
-//                    "",
-//                    "2"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
-//                    "3"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    0,
-//                    "",
-//                    "4"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    "5"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    "6"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
-//                    0,
-//                    "",
-//                    "7"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
-//                    0,
-//                    "",
-//                    "8"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
-//                    0,
-//                    "",
-//                    "9"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
-//                    "10"
-//                )
-//            )
-//        }else{ // mogo
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
-//                    0,
-//                    "",
-//                    "1"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
-//                    0,
-//                    "",
-//                    "2"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
-//                    "3"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    0,
-//                    "",
-//                    "4"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    "5"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
-//                    "6"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
-//                    0,
-//                    "",
-//                    "7"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
-//                    0,
-//                    "",
-//                    "8"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
-//                    0,
-//                    "",
-//                    "9"
-//                )
-//            )
-//            arrayListOf.add(
-//                RotationItem(
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
-//                    1,
-//                    "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
-//                    "10"
-//                )
-//            )
-//        }
-//
-        }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt
@@ -1,37 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
-import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m2.p_m2_view_blue_tooth.view.*
-
-/**
- * 魔戒蓝牙控件
- * 放置于StatusBar右侧位置
- * todo arrow
- */
-class M2BlueToothView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
-
-    init {
-        LayoutInflater.from(context).inflate(R.layout.p_m2_view_blue_tooth, this, true)
-    }
-
-    override fun mofangStatus(status: Boolean) {
-        ThreadUtils.runOnUiThread {
-            if (status) {
-                blueView.setImageResource(R.drawable.m2_blue_tooth_close)
-            } else {
-                blueView.setImageResource(R.drawable.m2_blue_tooth_open)
-            }
-        }
-    }
-
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt
@@ -1,179 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.LinearLayout
-import com.mogo.eagle.core.data.enums.DataSourceType
-import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m2.m2_p_traffic_light_view.view.*
-
-/**
- * bus乘客端：红绿灯view
- *
- * Created on 2022/3/14
- */
-class M2PTrafficLightView @JvmOverloads constructor(
-    context: Context?,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr), IMoGoTrafficLightListener {
-
-    companion object {
-        private const val TAG = "M2PTrafficLightView"
-    }
-
-    private var mCurrentLightId = TrafficLightEnum.BLACK
-
-    init {
-        init(context)
-    }
-
-    private fun init(context: Context?) {
-        LayoutInflater.from(context).inflate(R.layout.m2_p_traffic_light_view, this, true)
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        CallerTrafficLightListenerManager.addListener(TAG, this)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        CallerTrafficLightListenerManager.removeListener(TAG)
-    }
-
-    /**
-     * 展示红绿灯预警
-     *
-     * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
-     * @param lightSource 1:云端下发；2:自车感知
-     */
-    override fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) {
-        super.showTrafficLight(checkLightId, lightSource)
-        mCurrentLightId = checkLightId
-        updateTrafficLightIcon(checkLightId)
-    }
-
-    /**
-     * 关闭红绿灯预警展示，并重制灯态
-     */
-    override fun disableTrafficLight() {
-        super.disableTrafficLight()
-        UiThreadHandler.post {
-            mCurrentLightId = TrafficLightEnum.BLACK
-            this@M2PTrafficLightView.visibility = GONE
-        }
-    }
-
-    /**
-     * @param redNum 红灯倒计时
-     * @param yellowNum 黄灯倒计时
-     * @param greenNum 绿灯倒计时
-     */
-    override fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) {
-        super.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum)
-        resetView()
-        when (mCurrentLightId) {
-            TrafficLightEnum.RED -> changeCountdownRed(redNum)
-            TrafficLightEnum.YELLOW -> changeCountdownYellow(yellowNum)
-            TrafficLightEnum.GREEN -> changeCountdownGreen(greenNum)
-            else -> UiThreadHandler.post { m2_p_traffic_light_time_tv.text = "" }
-        }
-    }
-
-    override fun changeCountdownRed(redNum: Int) {
-        super.changeCountdownRed(redNum)
-        UiThreadHandler.post {
-            if (redNum > 0) {
-                resetView()
-                m2_p_traffic_light_time_tv.text = redNum.toString()
-            } else {
-                disableTrafficLightCountDown()
-                m2_p_traffic_light_time_tv.text = ""
-            }
-        }
-    }
-
-    override fun changeCountdownGreen(greenNum: Int) {
-        super.changeCountdownGreen(greenNum)
-        UiThreadHandler.post {
-            if (greenNum > 0) {
-                resetView()
-                m2_p_traffic_light_time_tv.text = greenNum.toString()
-            } else {
-                disableTrafficLightCountDown()
-                m2_p_traffic_light_time_tv.text = ""
-            }
-        }
-    }
-
-    override fun changeCountdownYellow(yellowNum: Int) {
-        super.changeCountdownYellow(yellowNum)
-        UiThreadHandler.post {
-            if (yellowNum > 0) {
-                resetView()
-                m2_p_traffic_light_time_tv.text = yellowNum.toString()
-            } else {
-                disableTrafficLightCountDown()
-                m2_p_traffic_light_time_tv.text = ""
-            }
-        }
-    }
-
-    /**
-     * 更新红绿灯icon
-     *
-     * @param lightId 0-都是默认，1-红，2-黄，3-绿
-     */
-    private fun updateTrafficLightIcon(lightId: TrafficLightEnum) {
-        UiThreadHandler.post {
-            when (lightId) {
-                TrafficLightEnum.RED -> {
-                    m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_red_nor)
-                    this@M2PTrafficLightView.visibility = VISIBLE
-                }
-                TrafficLightEnum.YELLOW -> {
-                    m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_yellow_nor)
-                    this@M2PTrafficLightView.visibility = VISIBLE
-                }
-                TrafficLightEnum.GREEN -> {
-                    m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_green_nor)
-                    this@M2PTrafficLightView.visibility = VISIBLE
-                }
-                else -> this@M2PTrafficLightView.visibility = GONE
-            }
-        }
-    }
-
-    override fun disableTrafficLightCountDown() {
-        super.disableTrafficLightCountDown()
-        UiThreadHandler.post {
-            val layoutParams = layoutParams
-            if (layoutParams is MarginLayoutParams) {
-                val lp = layoutParams
-                lp.width = resources.getDimension(R.dimen.dp_40).toInt()
-                setLayoutParams(lp)
-                m2_p_traffic_light_time_tv.visibility = GONE
-                m2_p_traffic_light_bg.layoutParams.width =
-                    resources.getDimension(R.dimen.dp_40).toInt()
-            }
-        }
-    }
-
-    private fun resetView() {
-        val layoutParams = layoutParams
-        if (layoutParams is MarginLayoutParams) {
-            val lp = layoutParams
-            lp.width = resources.getDimension(R.dimen.m2_p_light_width).toInt()
-            setLayoutParams(lp)
-            m2_p_traffic_light_time_tv.visibility = VISIBLE
-            m2_p_traffic_light_bg.layoutParams.width =
-                resources.getDimension(R.dimen.m2_p_light_width).toInt()
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
@@ -1,109 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget
-
-import android.annotation.*
-import android.content.Context
-import android.graphics.Color
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import chassis.ChassisStatesOuterClass
-import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
-import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
-import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
-import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystemListenerManager
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
-import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
-import com.mogo.eagle.core.utilcode.kotlin.*
-import com.mogo.eagle.core.utilcode.util.ClickUtils
-import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m2.p_m2_view_status_bar.view.*
-import kotlinx.coroutines.*
-import me.jessyan.autosize.utils.AutoSizeUtils
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/14
- */
-class M2StatusBarView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener,
-    IMoGoBatteryManagementSystemListener {
-
-    companion object {
-        const val TAG = "M2StatusBarView"
-    }
-
-    @Volatile
-    private var oldBmsSoc: Float = -1.0f
-
-    init {
-        LayoutInflater.from(context).inflate(R.layout.p_m2_view_status_bar, this, true)
-        setBackgroundColor(Color.parseColor("#80FFFFFF"))
-        isClickable = true
-        isFocusable = true
-    }
-
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        post {
-            val params: ViewGroup.LayoutParams = getLayoutParams()
-            params.height = AutoSizeUtils.dp2px(context,40f)
-            layoutParams = params
-        }
-        //添加view控制
-        CallerHmiViewControlListenerManager.addListener(TAG,this)
-        // 添加换肤监听
-        CallerSkinModeListenerManager.addListener(TAG, this)
-        //电量
-        CallerBatteryManagementSystemListenerManager.addListener(TAG,this)
-
-        progress?.also {
-            it.progress = 50
-        }
-        tv_power_cos?.also {
-            it.text = "50%"
-        }
-    }
-
-    override fun onSkinModeChange(skinMode: Int) {
-        when (skinMode) {
-            0 -> setStatusBarDarkOrLight(false)
-            1 -> setStatusBarDarkOrLight(true)
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        CallerHmiViewControlListenerManager.removeListener(TAG)
-        CallerSkinModeListenerManager.removeListener(TAG)
-        CallerDevaToolsManager.hideStatusBar()
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) {
-        if (ClickUtils.isClickTooFrequent(this,1000)) {
-            return
-        }
-        val bmsSoc = states.bmsSoc
-        try {
-            if (oldBmsSoc != bmsSoc ) {
-                scope.launch {
-                    if(bmsSoc >1){
-                        progress?.also { it.progress = bmsSoc.toInt() }
-                        tv_power_cos?.also { it.text = "${bmsSoc.toInt()}%" }
-                    }else{
-                        val power = (bmsSoc * 100).toInt()
-                        progress?.also { it.progress = power }
-                        tv_power_cos?.also {it.text = "$power%" }
-                    }
-                }
-            }
-        } finally {
-            oldBmsSoc = bmsSoc
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
@@ -1,16 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/13
- */
-class M2TurnLightView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : TurnLightViewStatus(context, attrs) {
-
-
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
@@ -1,127 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.content.Context
-import android.media.AudioManager
-import android.util.AttributeSet
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.shuyu.gsyvideoplayer.utils.Debuger
-import com.shuyu.gsyvideoplayer.utils.GSYVideoType
-import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/17
- * 隐藏所有控件的player
- */
-class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
-    constructor(context: Context?) : super(context)
-    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
-
-    init {
-        hideWidget()
-        GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL)
-        GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
-    }
-
-    override fun hideAllWidget() {
-        Logger.d(ImageAndVideoRotation.TAG, "hideAllWidget")
-//        hideWidget()
-    }
-
-    override fun changeUiToNormal() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToNormal-hide")
-        hideWidget()
-    }
-
-    override fun changeUiToPreparingShow() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToPreparingShow-hide")
-        hideWidget()
-    }
-
-    override fun changeUiToPlayingShow() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToPlayingShow")
-        setCacheImageViewGone()
-    }
-
-    override fun changeUiToPauseShow() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToPauseShow-hide")
-        startPlayLogic()
-//        hideWidget()
-    }
-
-    override fun changeUiToCompleteShow() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToCompleteShow")
-        setCacheImageViewGone()
-    }
-
-    override fun changeUiToPlayingBufferingShow() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToPlayingBufferingShow -hide")
-       hideWidget()
-    }
-
-    override fun changeUiToError() {
-        Logger.d(ImageAndVideoRotation.TAG, "changeUiToError-hide")
-        hideWidget()
-    }
-
-    private fun hideWidget(){
-        setViewShowState(mBottomContainer, INVISIBLE)
-        setViewShowState(mProgressBar, INVISIBLE)
-        setViewShowState(mCurrentTimeTextView, INVISIBLE)
-        setViewShowState(mTotalTimeTextView, INVISIBLE)
-        setViewShowState(mBottomProgressBar, INVISIBLE)
-        setViewShowState(mBackButton, INVISIBLE)
-        setViewShowState(mStartButton, INVISIBLE)
-
-        setViewShowState(mThumbImageViewLayout, VISIBLE)
-        setViewShowState(mThumbImageView, VISIBLE)
-
-        setViewShowState(mTopContainer, INVISIBLE)
-
-        setViewShowState(mLoadingProgressBar, INVISIBLE)
-        setViewShowState(
-            mLockScreen, INVISIBLE
-        )
-
-        setIsTouchWiget(false)
-        isFocusableInTouchMode = false
-    }
-
-    fun setCacheImageViewVisible() {
-        Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewVISIBLE")
-        setViewShowState(mThumbImageViewLayout, VISIBLE)
-//        setViewShowState(mThumbImageView, VISIBLE)
-    }
-
-    fun setCacheImageViewGone() {
-        Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewGONE")
-        setViewShowState(mThumbImageViewLayout, INVISIBLE)
-//        setViewShowState(mThumbImageView, INVISIBLE)
-    }
-
-    //失去焦点声音压低
-    override fun onLossTransientCanDuck() {
-//        setStreamVolume(0.2f)
-        setNeedMute(true)
-    }
-
-    //获取焦点声音恢复
-    override fun onGankAudio() {
-//        setStreamVolume(5.0f)
-        setNeedMute(false)
-    }
-
-    private fun setStreamVolume(percent: Float){
-        var mAudioManager = mContext?.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        var maxVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-        var volume = (percent * maxVolume).toInt()
-        if (volume < 0 ){
-            volume = 0
-        }
-        mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC,volume,0)
-    }
-
-    private fun setNeedMute(isMute: Boolean){
-        gsyVideoManager?.player?.setNeedMute(isMute)
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt
@@ -1,45 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import com.mogo.och.bus.passenger.R
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/6
- */
-class AdvanceImageView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : RelativeLayout(context, attrs) {
-
-    private var imageView: ImageView? = null
-
-    init {
-        initView()
-    }
-
-    private fun initView() {
-        imageView = ImageView(context)
-        imageView?.scaleType = ImageView.ScaleType.FIT_XY
-        addView(imageView, LayoutParams(-1, -1))
-    }
-
-    @SuppressLint("CheckResult")
-    fun setImagePath(path: String){
-        imageView?.setImageResource(R.drawable.m2_p_video_holder)
-        imageView?.let { Glide.with(context).asBitmap().load(path)
-            .apply(
-                RequestOptions().useUnlimitedSourceGeneratorsPool(true)
-                    .placeholder(R.drawable.m2_p_video_holder)
-                    .error(R.drawable.m2_p_video_holder)
-                    .fallback(R.drawable.m2_p_video_holder)
-                    .centerCrop()
-            )
-            .into(it) }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt
@@ -1,211 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-import androidx.viewpager.widget.PagerAdapter
-import androidx.viewpager.widget.ViewPager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.util.CountDownTimer
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/6
- */
-class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter(),
-    ViewPager.OnPageChangeListener {
-
-    private val mContext: Context = context
-    private val mViewPager: ViewPager = viewPager
-
-    private var dataList = mutableListOf<RotationItem>()
-    private var viewList = mutableListOf<View>()
-
-    private var lastPosition = -1
-
-    private var current = 0
-    private val time = 5000
-    private var pause = false
-    private var countDownTimer: CountDownTimer? = null
-
-    fun setData(list: MutableList<RotationItem>) {
-        if (list.isEmpty()) return
-        dataList.addAll(list)
-
-        viewList.clear()
-
-        list.forEach {
-            addView(it)
-        }
-
-        mViewPager.addOnPageChangeListener(this)
-
-        notifyDataSetChanged()
-
-        mViewPager.currentItem = 0
-
-        if (viewList.size > 0) {
-            if (viewList[mViewPager.currentItem] is AdvanceVideoView) {//有人反应第一个是视频不播放这边优化了一下
-                Logger.d(ImageAndVideoRotation.TAG, "第一个是视频")
-                val video = viewList[mViewPager.currentItem] as AdvanceVideoView
-                video.setVideo(gsySampleCallBack)
-
-            } else if (viewList[mViewPager.currentItem] is AdvanceImageView) {
-                Logger.d(ImageAndVideoRotation.TAG, "startTimer()_1")
-                current = 0//换页重新计算时间
-                startTimer()
-            }
-        }
-    }
-
-    override fun getCount(): Int {
-        return dataList.size
-    }
-
-    override fun isViewFromObject(view: View, `object`: Any): Boolean {
-        return view === `object`
-    }
-
-    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
-        container.removeView(viewList[position])
-    }
-
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        val view: View = viewList[position]
-        container.addView(view)
-        return view
-
-    }
-
-    override fun getItemPosition(`object`: Any): Int {
-        return POSITION_NONE
-    }
-
-    private fun addView(item: RotationItem) {
-        if (item.type == 1) { // 表示视频
-            val videoView = AdvanceVideoView(mContext)
-            videoView.setVideoPath(item.path,item.cacheImgPath)
-            viewList.add(videoView)
-        } else {  // 表示图片
-            val imageView = AdvanceImageView(mContext)
-            imageView.setImagePath(item.path)
-            viewList.add(imageView)
-        }
-    }
-
-    fun setPause() {
-        pause = true
-        if (viewList.size > 0 && viewList[mViewPager.currentItem] is AdvanceVideoView) {
-            val videoView = viewList[mViewPager.currentItem] as AdvanceVideoView
-            videoView.setPause()
-        }
-    }
-
-    fun setResume() {
-        pause = false
-        if (viewList.size > 0 && viewList[mViewPager.currentItem] is AdvanceVideoView) {
-            val videoView = viewList[mViewPager.currentItem] as AdvanceVideoView
-            videoView.setResume()
-        }
-    }
-
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
-    }
-
-    override fun onPageSelected(position: Int) {
-    }
-
-    override fun onPageScrollStateChanged(state: Int) {
-        // 由于viewpager的预加载机制onPageSelected这里面加载videoview 放的跟玩一样  等操作完成后再播放videoview就香了  很丝滑
-        if (state == 0) { //静止，什么都没做
-            val currentItem = mViewPager.currentItem
-            Logger.d(ImageAndVideoRotation.TAG,
-                "state = $state currentItem = $currentItem lastPosition = $lastPosition")
-
-            if (viewList.size > 1) { //多于1，才会循环跳转
-
-                if (viewList[mViewPager.currentItem] is AdvanceVideoView) {
-
-                    val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView)
-                    videoView.setCacheImageViewVisible()
-                    videoView.setVideo(gsySampleCallBack)
-
-                } else if (viewList[mViewPager.currentItem] is AdvanceImageView) {
-                    Logger.d(ImageAndVideoRotation.TAG, "startTimer()")
-                    current = 0//换页重新计算时间
-                    startTimer()
-                }
-                lastPosition = mViewPager.currentItem
-            }
-        }
-    }
-
-    private var gsySampleCallBack = object : GSYSampleCallBack() {
-
-        override fun onPrepared(url: String?, vararg objects: Any?) {
-            Logger.d(ImageAndVideoRotation.TAG, "onPrepared--$url")
-        }
-
-        override fun onAutoComplete(url: String?, vararg objects: Any?) {
-            Logger.d(ImageAndVideoRotation.TAG, "onAutoComplete()-$url")
-            if (viewList[mViewPager.currentItem] is AdvanceVideoView){
-                val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView)
-                if (viewList.size == 1){
-                    videoView.startPlay(url)
-                }else{
-                    videoView.onVideoReset()
-                    goNextItemView()
-                }
-            }
-        }
-
-        override fun onPlayError(url: String?, vararg objects: Any?) {
-            super.onPlayError(url, *objects)
-            Logger.d(ImageAndVideoRotation.TAG, "onPlayError()-$url")
-            if (viewList[mViewPager.currentItem] is AdvanceVideoView){
-                val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView)
-                videoView.onVideoReset()
-//                videoView.setCacheImageViewVisible()
-                videoView.clearLocalErrorVideo()
-                goNextItemView()
-            }
-        }
-    }
-
-    private fun startTimer() {
-        if (countDownTimer != null){
-            countDownTimer?.cancel()
-            countDownTimer = null
-        }
-        countDownTimer = object : CountDownTimer(5000,1000){
-            override fun onTick(millisUntilFinished: Long) {
-                d(SceneConstant.M_BUS_P + "startTimer", "倒计时秒 = ${millisUntilFinished/1000}" )
-            }
-
-            override fun onFinish() {
-                d(ImageAndVideoRotation.TAG+ "startTimer", "5s到，跳转")
-                goNextItemView()
-            }
-
-        }.start()
-    }
-
-    /**
-     * view 跳转
-     */
-    private fun goNextItemView() {
-        if (mViewPager.currentItem == viewList.size - 1) {//已经到最后一个
-            mViewPager.post {
-                mViewPager.setCurrentItem(0, true)
-            }
-        } else {
-            mViewPager.post {
-                mViewPager.setCurrentItem(mViewPager.currentItem + 1, true)
-            }
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -1,248 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.net.Uri
-import android.util.AttributeSet
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
-import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
-import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.eagle.core.utilcode.util.FileUtils
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
-import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
-import java.io.File
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/8
- */
-class AdvanceVideoView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : RelativeLayout(context, attrs) {
-
-    private var videoRelativeLayout: RelativeLayout? = null
-    private var cacheImage: ImageView? = null
-    private var videoViewPlayer: AdvanceGSYVideoPlayer? = null
-    private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null
-    private var mOnCompletionListener: GSYSampleCallBack? = null
-    private var downloadVideoName = ""
-    private var fileNetPath: String? = ""
-    private var cacheImageUrl: String? = ""
-    private var mVideoDirPath: String? = ""
-
-    init {
-        mVideoDirPath = context.filesDir.absolutePath+ File.separator + "video" + File.separator
-//        mVideoDirPath = Config.downLoadPath
-        initView()
-    }
-
-    private fun initView() {
-        initVideoView()
-        initCacheImgView()
-    }
-
-    private fun initCacheImgView() {
-        cacheImage = ImageView(context)
-        cacheImage?.scaleType = ImageView.ScaleType.FIT_XY
-//        addView(cacheImage, LayoutParams(-1, -1))
-    }
-
-    private fun initVideoView() {
-        videoRelativeLayout = RelativeLayout(context)
-        addView(videoRelativeLayout, LayoutParams(-1, -1))
-
-        if (videoViewPlayer === null) {
-            //视频播放控件
-            videoViewPlayer = AdvanceGSYVideoPlayer(context)
-        }
-
-        var layoutParams = LayoutParams(-1, -1)
-        //设置videoview占满父view播放
-        layoutParams.addRule(ALIGN_PARENT_LEFT)
-        layoutParams.addRule(ALIGN_PARENT_RIGHT)
-        layoutParams.addRule(ALIGN_PARENT_TOP)
-        layoutParams.addRule(ALIGN_PARENT_BOTTOM)
-
-        videoRelativeLayout?.addView(videoViewPlayer, layoutParams)
-    }
-
-    fun setVideoPath(path: String,cacheImageUrl: String) {
-        // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v
-        // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4
-        this.fileNetPath = path
-        this.cacheImageUrl = cacheImageUrl
-        val pathList = path.split("/")
-        if (pathList.isNotEmpty()){
-            this.downloadVideoName = pathList[pathList.size - 1]
-        }
-    }
-
-    private fun loadCacheImg() {
-        //        BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*
-//        OCHThreadPoolManager.getsInstance().execute {
-//            var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath)
-            Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
-//            ThreadUtils.runOnUiThread {
-//                Logger.d(ImageAndVideoRotation.TAG, "bitmap加载")
-        cacheImage?.setImageResource(R.drawable.m2_p_video_holder)
-//        cacheImage?.let { //暂时去掉加载首帧图，加载视频时，用本地默认图
-//                    Glide.with(context).asBitmap().load(cacheImageUrl)
-//                        .apply(
-//                            RequestOptions().useUnlimitedSourceGeneratorsPool(true)
-//                                .placeholder(R.drawable.m2_p_video_holder)
-//                                .error(R.drawable.m2_p_video_holder)
-//                                .fallback(R.drawable.m2_p_video_holder)
-//                                .centerCrop()
-//                        )
-//                        .into(it)
-//                }
-        videoViewPlayer?.thumbImageView = cacheImage
-//        setCacheImageViewVisible()
-//            }
-//        }
-    }
-
-    fun clearLocalErrorVideo(){
-        if (downloadVideoName.isNotEmpty()
-            && FileUtils.isFileExists(mVideoDirPath + downloadVideoName)){
-            FileUtils.delete(mVideoDirPath + downloadVideoName)
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    fun setCacheImageViewVisible() {
-        UiThreadHandler.post {
-//            cacheImage?.visibility = VISIBLE
-            videoViewPlayer?.setCacheImageViewVisible()
-        }
-    }
-
-    fun setCacheImageViewGone() {
-        UiThreadHandler.post {
-//            cacheImage?.visibility = GONE
-            videoViewPlayer?.setCacheImageViewGone()
-        }
-
-    }
-
-    fun setVideo(onCompletionListener: GSYSampleCallBack) {
-        loadCacheImg()
-        Logger.d(ImageAndVideoRotation.TAG, "setVideo")
-        mOnCompletionListener = onCompletionListener
-        //判断是否已经下载
-        if (downloadVideoName.isNotEmpty()){
-            Logger.d(ImageAndVideoRotation.TAG,
-                "video local url = $mVideoDirPath$downloadVideoName"
-            )
-            if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
-                Logger.d(ImageAndVideoRotation.TAG, "have cache startPlay")
-                startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
-                return
-            }
-            startDownLoadVideo()
-        }
-    }
-
-    private fun startDownLoadVideo(){
-        //下载视频， 下载成功后再播放
-        Logger.d(ImageAndVideoRotation.TAG, "startDownLoadVideo")
-        FileUtils.createFileDir(mVideoDirPath)
-        DownloadUtils.downLoad(context,fileNetPath,mVideoDirPath
-            ,downloadVideoName,5,downListener)
-    }
-
-    fun startPlay(localVideoPath: String?){
-        if (localVideoPath === "") return
-        try {
-            Logger.d(ImageAndVideoRotation.TAG, "startPlay")
-            gsyVideoOptionBuilder = GSYVideoOptionBuilder()
-            gsyVideoOptionBuilder
-//                ?.setUrl("file:///mnt/sdcard/downloads/$downloadVideoName")
-                ?.setUrl(localVideoPath) //  "/data/user/0/com.mogo.launcher.f/files/video/"
-                ?.setPlayTag(downloadVideoName)
-                ?.setCacheWithPlay(false)
-                ?.setThumbPlay(false)
-                ?.build(videoViewPlayer)
-
-            videoViewPlayer?.isFocusableInTouchMode = false
-            videoViewPlayer?.setVideoAllCallBack(mOnCompletionListener)
-            videoViewPlayer?.startPlayLogic()
-        }catch (e: Exception){
-            Logger.d(ImageAndVideoRotation.TAG, "startPlay e = ${e.message}")
-        }
-    }
-
-    fun onVideoReset(){
-        videoViewPlayer?.onVideoReset()
-        mOnCompletionListener = null
-    }
-
-    fun setPause() {
-        if (videoViewPlayer !== null) {
-            videoViewPlayer?.onVideoPause()
-        }
-    }
-
-    fun setResume() {
-        if (videoViewPlayer !== null) {
-            videoViewPlayer?.onVideoResume()
-        }
-    }
-
-    private val downListener = object : IDownload{
-        override fun onStart(url: String?) {
-            setCacheImageViewVisible()
-            Logger.d(ImageAndVideoRotation.TAG, "download-onStart")
-        }
-
-        override fun onPause(url: String?, threadBean: ThreadBean?) {
-            Logger.d(ImageAndVideoRotation.TAG, "download-onPause")
-//            UiThreadHandler.postDelayed(Runnable {
-//                startDownLoadVideo()
-//            },DOWNLOAD_DELAY)
-            // todo 测试下网络断掉是否会走onpause，且网络回复也不会继续下载
-        }
-
-        override fun onProgress(url: String?, length: Int) {
-            Logger.d(ImageAndVideoRotation.TAG, "download-onProgress== $length")
-        }
-
-        override fun onFinished(url: String?, threadBean: ThreadBean?) {
-            Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url")
-            if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
-                //下载完成
-                ThreadUtils.runOnUiThread {
-                    startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
-                }
-            }else{//如果当前文件不存在再次去下载当前的
-                Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = not current" +
-                        ",currentUrl = $fileNetPath ")
-                if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
-                    Logger.d(ImageAndVideoRotation.TAG, "have download startPlay")
-                    ThreadUtils.runOnUiThread {
-                        startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
-                    }
-                    return
-                }else{
-                    startDownLoadVideo()
-                }
-            }
-        }
-
-        override fun onError(url: String?, errorMsg: String?) {
-            Logger.d(ImageAndVideoRotation.TAG, "download-onError-$errorMsg")
-            //出错再次下载
-            if (errorMsg != null) {
-                if (errorMsg.startsWith("initFailed")){
-                    startDownLoadVideo()
-                }
-            }
-        }
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt
@@ -1,24 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.MotionEvent
-import androidx.viewpager.widget.ViewPager
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/21
- */
-class AdvanceViewPager: ViewPager{
-
-    constructor(context: Context) : super(context)
-    constructor(context: Context,attrs: AttributeSet?) : super(context,attrs)
-
-    override fun onTouchEvent(ev: MotionEvent?): Boolean {
-        return false
-    }
-
-    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
-        return false
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt
@@ -1,47 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.RelativeLayout
-import androidx.viewpager.widget.ViewPager
-/**
- * @author: wangmingjun
- * @date: 2023/2/6
- */
-class ImageAndVideoRotation @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : RelativeLayout(context, attrs) {
-
-    private var viewPager: AdvanceViewPager? = null
-    private var pagerAdapter: AdvancePagerAdapter? = null
-
-    companion object {
-        const val TAG = "ImageAndVideoRotation"
-    }
-
-    init {
-        initView()
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun initView() {
-        viewPager = AdvanceViewPager(context)
-        pagerAdapter = AdvancePagerAdapter(context, viewPager!!)
-        viewPager?.adapter = pagerAdapter
-
-        addView(viewPager, LayoutParams(-1, -1))
-    }
-
-    fun setData(list: MutableList<RotationItem>){
-        pagerAdapter?.setData(list)
-    }
-
-    fun setPause(){
-        pagerAdapter?.setPause()
-    }
-
-    fun setResume(){
-        pagerAdapter?.setResume()
-    }
-}
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/RotationItem.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/RotationItem.kt
@@ -1,12 +0,0 @@
-package com.mogo.och.bus.passenger.ui.widget.video
-
-/**
- * @author: wangmingjun
- * @date: 2023/2/6
- * type:0  图片
- * type:1 视频
- */
-data class RotationItem(var path: String,
-                        var type: Int,
-                        var cacheImgPath: String,
-                        var title: String)
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/clock_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/clock_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_line_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_line_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_time_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/img_time_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_dashed_line.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_dashed_line.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke android:color="@color/bus_dashed_line_color"
-        android:width="1dp" android:dashGap="4dp" android:dashWidth="4dp"/>
-    <size android:height="1dp"/>
-</shape>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_driving_selector.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_driving_selector.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <gradient android:angle="180" android:endColor="#A2C3EB" android:centerColor="#A2CAEB" android:startColor="#00C0E1F0" />
-        </shape>
-    </item>
-</selector>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="@dimen/dp_66" android:height="@dimen/dp_38"/>
-    <solid android:color="@color/m2_button_un_auto_bg_color"/>
-    <corners android:radius="@dimen/dp_20"/>
-</shape>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="#ff000000"/>
-    <corners android:radius="@dimen/dp_60"/>
-</shape>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient android:centerColor="@color/m2_pnc_bg_color"/>
-</shape>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/m2_button_un_auto_bg_color" />
-    <corners android:radius="@dimen/dp_18" />
-</shape>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_light_green_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_light_green_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_light_red_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_light_red_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_lightyellow_nor.png
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bus_lightyellow_nor.png
--- a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="5dp"/>
-                <solid android:color="#A3BDF2" />
-        </shape>
-    </item>
-    <item android:id="@android:id/secondaryProgress">
-        <clip>
-            <shape>
-                <corners android:radius="5dp"/>
-                <solid android:color="#66FFFFFF" />
-            </shape>
-        </clip>
-    </item>
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%">
-            <shape android:shape="rectangle">
-                <corners android:radius="5dp"/>
-                <gradient android:startColor="#56C59C" android:endColor="#56EFA0"/>
-            </shape>
-        </scale>
-    </item>
-</layer-list>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/m2_p_light_width"
-    android:layout_height="@dimen/m2_p_light_height"
-    android:visibility="visible">
-
-    <ImageView
-        android:id="@+id/m2_p_traffic_light_bg"
-        android:layout_width="@dimen/m2_p_light_width"
-        android:layout_height="@dimen/m2_p_light_height"
-        android:background="@drawable/bg_p_m2_auto"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/m2_p_traffic_light_iv"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:scaleType="fitXY"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <TextView
-        android:id="@+id/m2_p_traffic_light_time_tv"
-        android:layout_width="@dimen/dp_12"
-        android:layout_height="match_parent"
-        android:textSize="@dimen/dp_22"
-        android:textStyle="bold"
-        android:textColor="@color/m2_light_tv_color"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:gravity="center" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@drawable/bg_driving_selector">
-
-        <!-- 全览地图带站点-->
-        <com.mogo.eagle.core.function.view.OverMapView
-            android:id="@+id/overMapView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:mapStyleExtraPath="@string/m2_over_map_style_extra_path"
-            app:mapStylePath="@string/m2_over_map_style_path"
-            app:isClearArrived="true"
-            app:resetDrawableMarginRight="@dimen/dp_34"
-            app:resetDrawableMarginBottom="@dimen/dp_54"
-            app:carDrawable = "@drawable/m2_map_car_icon"
-            app:startPointDrawable="@drawable/m2_map_start_icon"
-            app:endPointDrawable="@drawable/m2_map_end_icon"
-            app:leftPadding="400"
-            />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_drive_bg"
-            android:layout_width="@dimen/dp_350"
-            android:layout_height="@dimen/dp_210"
-            android:layout_marginTop="@dimen/dp_36"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:scaleType="fitXY"
-            android:src="@drawable/img_drive_bg"/>
-
-        <!-- 行车卡片-->
-        <TextView
-            android:id="@+id/speed_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="--"
-            android:textColor="@color/m2_p_speed_tv_color"
-            android:textSize="@dimen/dp_56"
-            android:textStyle="bold"
-            android:layout_marginTop="@dimen/dp_36"
-            app:layout_constraintLeft_toLeftOf="@+id/img_drive_bg"
-            android:layout_marginLeft="@dimen/dp_48"
-            app:layout_constraintTop_toTopOf="@+id/img_drive_bg"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_8"
-            android:layout_marginBottom="@dimen/dp_12"
-            android:textSize="@dimen/dp_18"
-            android:textColor="@color/m2_line_during_tv_color"
-            android:text="@string/m2_p_speed_unit_txt"
-            app:layout_constraintBottom_toBottomOf="@+id/speed_tv"
-            app:layout_constraintLeft_toRightOf="@+id/speed_tv" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/auto_tv"
-            android:layout_width="@dimen/dp_66"
-            android:layout_height="@dimen/dp_38"
-            android:background="@drawable/bg_p_m2_auto"
-            android:layout_marginTop="@dimen/dp_8"
-            android:text="@string/m2_p_auto_tv"
-            android:textSize="@dimen/dp_18"
-            android:gravity="center"
-            android:textColor="@color/m2_button_auto_tv_color"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            app:layout_constraintTop_toBottomOf="@+id/speed_tv" />
-
-        <!-- 转向灯  IMoGoChassisLamplightListener-->
-        <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
-            android:id="@+id/turn_light_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_12"
-            app:layout_constraintLeft_toRightOf="@+id/auto_tv"
-            app:layout_constraintTop_toTopOf="@+id/auto_tv"
-            app:visible="true"
-            app:day_light_mode="true"/>
-
-        <!-- 红绿灯-->
-        <com.mogo.och.bus.passenger.ui.widget.M2PTrafficLightView
-            android:id="@+id/traffic_light_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_12"
-            app:layout_constraintLeft_toRightOf="@+id/turn_light_view"
-            app:layout_constraintTop_toTopOf="@+id/auto_tv" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_line_bg"
-            android:layout_width="@dimen/dp_350"
-            android:layout_height="@dimen/dp_210"
-            android:layout_marginTop="@dimen/dp_12"
-            app:layout_constraintTop_toBottomOf="@+id/auto_tv"
-            app:layout_constraintLeft_toLeftOf="@+id/img_drive_bg"
-            android:scaleType="fitXY"
-            android:src="@drawable/img_line_bg"/>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_line_location_bg"
-            android:layout_width="@dimen/dp_77"
-            android:layout_height="@dimen/dp_96"
-            android:layout_marginRight="@dimen/dp_60"
-            android:scaleType="fitXY"
-            app:layout_constraintTop_toTopOf="@+id/img_line_bg"
-            app:layout_constraintBottom_toBottomOf="@+id/img_line_bg"
-            app:layout_constraintRight_toRightOf="@+id/img_line_bg"
-            android:src="@drawable/m2_line_location_bg"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/station_name_title_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/m2_p_station_title_tv"
-            android:textSize="@dimen/dp_18"
-            app:layout_constraintTop_toTopOf="@+id/img_line_location_bg"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_next_tv_color"/>
-
-        <com.mogo.och.common.module.wigets.MarqueeTextView
-            android:id="@+id/station_name_tv"
-            android:layout_width="@dimen/dp_240"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
-            app:customGap="0.2"
-            app:useCustomGap="true"
-            android:text="@string/m2_p_empty_tv"
-            android:textSize="@dimen/dp_22"
-            android:layout_marginTop="@dimen/dp_8"
-            app:layout_constraintTop_toBottomOf="@+id/station_name_title_tv"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_line_name_tv_color"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/remain_mt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/m2_p_empty_remain_km_minute"
-            android:textSize="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_8"
-            app:layout_constraintBottom_toBottomOf="@+id/img_line_location_bg"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_next_tv_color"/>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/img_time_bg"
-            android:layout_width="@dimen/dp_350"
-            android:layout_height="@dimen/dp_210"
-            android:layout_marginTop="@dimen/dp_16"
-            app:layout_constraintTop_toBottomOf="@+id/remain_mt"
-            app:layout_constraintLeft_toLeftOf="@+id/img_drive_bg"
-            android:scaleType="fitXY"
-            android:src="@drawable/img_time_bg"/>
-
-        <View
-            android:id="@+id/dashed_line"
-            android:layout_width="@dimen/dp_251"
-            android:layout_height="@dimen/dp_10"
-            android:background="@drawable/bg_dashed_line"
-            android:layout_marginTop="@dimen/dp_104"
-            app:layout_constraintTop_toTopOf="@+id/img_time_bg"
-            app:layout_constraintStart_toStartOf="@+id/speed_tv"
-            app:layout_constraintEnd_toEndOf="@+id/img_line_location_bg"/>
-
-        <TextView
-            android:id="@+id/no_line_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/m2_p_no_line"
-            android:textSize="@dimen/dp_22"
-            android:layout_marginTop="@dimen/dp_28"
-            app:layout_constraintTop_toTopOf="@+id/img_time_bg"
-            app:layout_constraintBottom_toBottomOf="@+id/dashed_line"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_next_tv_color"/>
-
-
-        <com.mogo.och.common.module.wigets.MarqueeTextView
-            android:id="@+id/line_name_tv"
-            android:layout_width="@dimen/dp_240"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
-            app:customGap="0.2"
-            app:useCustomGap="true"
-            android:layout_marginTop="@dimen/dp_40"
-            android:textSize="@dimen/dp_22"
-            app:layout_constraintTop_toTopOf="@+id/img_time_bg"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_line_name_tv_color"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/line_during_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_4"
-            android:textSize="@dimen/dp_16"
-            app:layout_constraintLeft_toLeftOf="@+id/line_name_tv"
-            app:layout_constraintTop_toBottomOf="@+id/line_name_tv"
-            android:textColor="@color/m2_line_during_tv_color"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/current_time_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/dp_36"
-            android:textStyle="bold"
-            android:text="--"
-            app:layout_constraintTop_toBottomOf="@+id/dashed_line"
-            app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-            android:textColor="@color/m2_current_time_tv_color"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/current_weekday_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_10"
-            app:layout_constraintLeft_toRightOf="@+id/current_time_tv"
-            app:layout_constraintBottom_toBottomOf="@+id/current_time_tv"
-            android:layout_marginBottom="@dimen/dp_6"
-            android:textSize="@dimen/dp_16"
-            android:text="--"
-            android:textColor="@color/m2_text_time_tv_color"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- 行车卡片--><!-- 全览地图带站点-->
-    <FrameLayout
-        android:id="@+id/driving_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintHeight_percent="0.295"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/hd_map_fragment"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-    <!-- 高精地图-->
-    <FrameLayout
-        android:id="@+id/hd_map_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintHeight_percent="0.415"
-        app:layout_constraintTop_toBottomOf="@+id/driving_fragment"
-        app:layout_constraintBottom_toTopOf="@+id/video_fragment"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-
-    <!-- 图片或视频广告-->
-
-    <FrameLayout
-        android:id="@+id/video_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintHeight_percent="0.290"
-        app:layout_constraintTop_toBottomOf="@+id/hd_map_fragment"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- 高精地图 -->
-
-    <com.mogo.eagle.core.function.view.MapBizView
-        android:id="@+id/mapBizView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <!--    消息盒子气泡-->
-
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.MBoxBubbleView
-        android:id="@+id/box_bubble_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="@dimen/dp_16"
-        android:layout_marginLeft="@dimen/dp_26"/>
-
-    <!--pnc行为决策-->
-    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
-        android:id="@+id/pnc_actions_view"
-        android:layout_width="@dimen/dp_231"
-        android:layout_height="@dimen/dp_36"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:background_resource="@drawable/bg_pnc" />
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_video_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_video_fragment.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- 图片或视频广告-->
-
-    <com.mogo.och.bus.passenger.ui.widget.video.ImageAndVideoRotation
-        android:id="@+id/imageVideoRotationView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_video_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_video_view.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="MissingDefaultResource">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_18"
-    android:layout_height="@dimen/dp_26">
-
-    <ImageView
-        android:id="@+id/blueView"
-        android:layout_width="@dimen/dp_18"
-        android:layout_height="@dimen/dp_26"
-        android:scaleType="fitXY"
-        android:src="@drawable/m2_blue_tooth_open"
-        tools:ignore="ContentDescription" />
-
-</RelativeLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_40"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
-    tools:ignore="MissingDefaultResource">
-
-    <!--Wifi状态-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
-        android:id="@+id/wifiStateView"
-        android:layout_width="@dimen/dp_28"
-        android:layout_height="@dimen/dp_28"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_50" />
-
-    <!--魔方连接状态 蓝牙-->
-    <com.mogo.och.bus.passenger.ui.widget.M2BlueToothView
-        android:id="@+id/blueToothView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/wifiStateView"
-        android:layout_width="@dimen/dp_15"
-        android:layout_height="@dimen/dp_22"
-        android:src="@drawable/m2_blue_tooth_open"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_32" />
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="@dimen/dp_115"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_40"
-        android:layout_marginEnd="@dimen/dp_7"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_power_cos"
-        android:maxHeight="@dimen/dp_8"
-        android:minHeight="@dimen/dp_8"
-        android:layout_marginRight="4dp"
-        android:background="@null"
-        android:progressDrawable="@drawable/m2_power_seekbar_style" />
-
-    <TextView
-        android:id="@+id/tv_power_cos"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:textSize="@dimen/dp_18"
-        android:textColor="@color/m2_power_tv_color"
-        android:layout_marginRight="@dimen/dp_50"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <ImageView
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:src="@drawable/m2_status_bar_logo"
-        android:scaleType="fitXY"
-        android:layout_width="@dimen/dp_96"
-        android:layout_height="@dimen/dp_28"/>
-
-
-
-</merge>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/dp_66"
-    android:layout_height="@dimen/dp_38"
-    android:visibility="visible">
-
-    <FrameLayout
-        android:id="@+id/turn_light_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:background="@drawable/brakelight_background_daytime"
-        android:layout_gravity="top|center_horizontal"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <ImageView
-            android:id="@+id/left_nor_image"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_26"
-            android:layout_gravity="left|center_vertical"
-            android:layout_marginLeft="@dimen/dp_5"
-            android:src="@drawable/m2_zuozhuan_un_open" />
-
-        <ImageView
-            android:id="@+id/right_nor_image"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_26"
-            android:layout_gravity="right|center_vertical"
-            android:layout_marginRight="@dimen/dp_5"
-            android:src="@drawable/m2_youzhuan_un_open" />
-
-        <ImageView
-            android:id="@+id/left_select_image"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_26"
-            android:layout_gravity="left|top"
-            android:layout_marginLeft="@dimen/dp_5"
-            android:layout_marginTop="2dp"
-            android:src="@drawable/m2_zuozhuan_open"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/right_select_image"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_26"
-            android:layout_gravity="right|center_vertical"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="5dp"
-            android:src="@drawable/m2_youzhuan_open"
-            android:visibility="gone" />
-    </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/raw/station_marker.nt3d
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/raw/station_marker.nt3d
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="m2_p_white_color">#FFFFFF</color>
- <color name="m2_p_speed_tv_color">#0B1E38</color>
- <color name="m2_button_auto_tv_color">#2D3E5F</color>
-<!-- <color name="m2_button_un_auto_bg_color">#B3C0D4ED</color>-->
- <color name="m2_button_un_auto_bg_color">#BBDAFB</color>
- <color name="m2_line_name_tv_color">#0B1E38</color>
- <color name="m2_line_during_tv_color">#5D7199</color>
- <color name="m2_current_time_tv_color">#0B1E38</color>
- <color name="m2_no_line_tv_color">#6B7EA6</color>
- <color name="m2_light_tv_color">#2D3E5F</color>
- <color name="m2_pnc_bg_color">#A5D8FF</color>
- <color name="m2_power_tv_color">#1B2546</color>
- <color name="m2_next_tv_color">#23355D</color>
- <color name="m2_text_time_tv_color">#374E7F</color>
-
- <color name="bus_traffic_light_red_color_up">#FFFFA28B</color>
- <color name="bus_traffic_light_red_color_down">#FFDA1100</color>
- <color name="bus_traffic_light_green_color_up">#FF60FFD3</color>
- <color name="bus_traffic_light_green_color_down">#FF006D43</color>
- <color name="bus_traffic_light_yellow_color_up">#FFFFE198</color>
- <color name="bus_traffic_light_yellow_color_down">#FFFF9B00</color>
- <color name="bus_arrived_btn_un_clickable_color">#59FFFFFF</color>
- <color name="bus_dashed_line_color">#8895B7</color>
-</resources>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/dimens.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="m2_p_light_width">60dp</dimen>
-    <dimen name="m2_p_light_height">40dp</dimen>
-</resources>
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="m2_p_speed_unit_txt">KM/H</string>
-    <string name="bus_p_no_out">您已收车</string>
-    <string name="m2_p_no_line">暂无路线</string>
-    <string name="bus_p_start_station_txt_tag">起</string>
-    <string name="bus_p_end_station_txt_tag">终</string>
-    <string name="bus_p_cur_station_title">到达站：</string>
-    <string name="bus_p_cur_next_station_title">下一站：</string>
-    <string name="bus_p_cur_station_title_init">始发站：</string>
-    <string name="bus_p_cur_station_arrived_tip">请携带好随身物品下车。</string>
-    <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>
-
-    <string name="m2_over_map_style_path">m2_map_style.data</string>
-    <string name="m2_over_map_style_extra_path">m2_map_style_extra.data</string>
-    <string name="m2_p_auto_tv">Auto</string>
-    <string name="m2_p_station_title_tv">下一站：</string>
-    <string name="m2_p_station_title_arrived_tv">已到站：</string>
-    <string name="m2_p_empty_tv">暂无站点</string>
-    <string name="m2_p_empty_remain_km_minute">—公里 | —分钟</string>
-
-
-</resources>
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
@@ -1,12 +0,0 @@
-package com.mogo.och.bus.constant
-
-import com.mogo.commons.debug.DebugConfig
-
-/**
- * Created on 2021/12/6
- */
-class URLConst {
-    companion object {
-
-    }
-}
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/IBascApiService.java
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/IBascApiService.java
@@ -1,129 +0,0 @@
-package com.mogo.och.bus.net;
-import com.mogo.eagle.core.data.BaseData;
-import com.mogo.och.bus.bean.BusCloseTaskRequest;
-import com.mogo.och.bus.bean.BusOrdersResponse;
-import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
-import com.mogo.och.bus.bean.BusQueryLinesResponse;
-import com.mogo.och.bus.bean.BusRoutesResponse;
-import com.mogo.och.bus.bean.BusQueryLineStationsRequest;
-import com.mogo.och.bus.bean.QueryLeaveAwayPassengersRequest;
-import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse;
-import com.mogo.och.bus.bean.BusResetDrivingLineRequest;
-import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest;
-
-import io.reactivex.Observable;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Query;
-
-/**
- * 小巴车相关接口
- *
- * @author tongchenfei
- * <p>
- * wiki: http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48970072
- */
-public interface IBascApiService {
-    /**
-     * 查询当前运行任务
-     *
-     * @param request 请求参数
-     * @return 接口返回数据
-     */
-    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/business/v1/driver/lineDataWithDriver/query" )
-    Observable<BusRoutesResponse> queryBusRoutes(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusQueryLineStationsRequest request);
-
-    /**
-     * @param request 请求参数{"destLine":1,"sn":"F803EB2046PZD00229"} 这个接口是重置bus线路的， 不是重置线路中站点的
-     * @return 返回值是重置后的车站列表
-     * 开始路线
-     */
-    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/flow/v1/driver/startTask" )
-    Observable<BusRoutesResponse> switchLine(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request);
-
-    /**
-     * 离站，通知服务器
-     * @param request
-     * @return
-     */
-    @Headers({"Content-Type:application/json;charset=UTF-8"})
-    @POST("/och-shuttle-cabin/api/flow/v1/driver/leave")
-    Observable<BaseData> leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusUpdateSiteStatusRequest request);
-
-    /**
-     * 到站 更新到站信息
-     * @param request
-     * @return
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-    @POST("/och-shuttle-cabin/api/flow/v1/driver/arrive")
-    Observable<BaseData> arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusUpdateSiteStatusRequest request);
-
-
-    /**
-     * 到站查询下车乘客
-     * @param request
-     * @return
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-    @POST("/och-shuttle-cabin/api/business/v1/driver/siteArrivedOrders")
-    Observable< QueryLeaveAwayPassengersResponse > queryStationLeaveAwayPassengers(@Header ("appId") String appId,@Header("ticket") String ticket,@Body QueryLeaveAwayPassengersRequest request);
-
-    /**
-     *
-     * @param appId
-     * @param ticket
-     * @param sn
-     * @return todo 修改结构
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-    @GET("/och-shuttle-cabin/api/business/v1/driver/servicingOrders/query")
-    Observable<BusOrdersResponse> queryBusOrders(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
-
-    /**
-     * 查询车辆配置的所有路线
-     * @param appId
-     * @param ticket
-     * @param sn
-     * @return
-     */
-    @GET("/och-shuttle-cabin/api/business/v1/driver/bindLine/query")
-    Observable<BusQueryLinesResponse> queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
-
-    /**
-     * 查询路线当天的任务
-     * @param appId
-     * @param ticket
-     * @param lineId 线路id
-     * @return
-     */
-    @GET("/och-shuttle-cabin/api/business/v1/driver/task/query")
-    Observable<BusQueryLineTaskResponse> queryBusTaskByLineId(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("lineId") String lineId);
-
-    /**
-     * 中止任务
-     * @param appId
-     * @param ticket
-     * @param data
-     * @return
-     */
-    @POST("/och-shuttle-cabin/api/flow/v1/driver/abortTask")
-    Observable<BaseData> abortTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data);
-
-    /**
-     * 任务正常跑完结束
-     * @param appId
-     * @param ticket
-     * @param data
-     * @return
-     */
-    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @POST("/och-shuttle-cabin/api/flow/v1/driver/endTask")
-    Observable<BaseData> endTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data);
-}
-
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/OrderServiceManager.kt
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/OrderServiceManager.kt
@@ -1,203 +0,0 @@
-package com.mogo.och.bus.net
-
-import android.content.Context
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.bus.bean.*
-import com.mogo.och.common.module.biz.constant.OchCommonConst
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
-import com.mogo.och.common.module.biz.network.interceptor.transformTry
-
-/**
- * @author: wangmingjun
- * @date: 2021/10/20
- */
-object OrderServiceManager {
-
-    private val mService: IBascApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(
-        IBascApiService::class.java
-    )
-
-
-    /**
-     * 查询小巴车当前任务
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryBusRoutes(context: Context, callback: OchCommonServiceCallback<BusRoutesResponse>?) {
-        //获取当前高德坐标
-        mService.queryBusRoutes(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusQueryLineStationsRequest()
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusRoutes"))
-    }
-
-    /**
-     * 重置线路站点
-     * @param context
-     * @param taskId
-     * @param callback
-     */
-    @JvmStatic
-    fun switchLine(
-        context: Context,
-        taskId: Int,
-        callback: OchCommonServiceCallback<BusRoutesResponse>?
-    ) {
-        mService.switchLine(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusResetDrivingLineRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "switchLine"))
-    }
-
-    /**
-     * 中断当前任务
-     * @param context
-     * @param taskId
-     * @param callback
-     */
-    @JvmStatic
-    fun abortTask(context: Context, taskId: Int, callback: OchCommonServiceCallback<BaseData>?) {
-        mService.abortTask(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusCloseTaskRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "abortTask"))
-    }
-
-    /**
-     * 正常结束任务
-     * @param context
-     * @param taskId
-     * @param callback
-     */
-    @JvmStatic
-    fun endTask(context: Context, taskId: Int, callback: OchCommonServiceCallback<BaseData>?) {
-        mService.endTask(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusCloseTaskRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "endTask"))
-    }
-
-    /**
-     * 离站上报
-     * @param context
-     * @param seq
-     * @param siteId
-     * @param callback
-     */
-    @JvmStatic
-    fun leaveStation(
-        context: Context,
-        seq: Int,
-        siteId: Int,
-        taskId: Int,
-        callback: OchCommonServiceCallback<BaseData>?
-    ) {
-        mService.leaveStation(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusUpdateSiteStatusRequest(taskId, siteId, seq)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "leaveStation"))
-    }
-
-    /**
-     * 到站更新站点状态
-     * @param context
-     * @param seq
-     * @param siteId
-     * @param callback
-     */
-    @JvmStatic
-    fun arriveSiteStation(
-        context: Context, seq: Int, siteId: Int, taskId: Int,
-        callback: OchCommonServiceCallback<BaseData>?
-    ) {
-        mService.arriveSiteStation(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusUpdateSiteStatusRequest(taskId, siteId, seq)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "arriveSiteStation"))
-    }
-
-    /**
-     * 查询下车乘客
-     * @param context
-     * @param seq
-     * @param siteId
-     * @param callback
-     */
-    @JvmStatic
-    fun queryStationLeaveAwayPassengers(
-        context: Context,
-        seq: Int,
-        siteId: Int,
-        callback: OchCommonServiceCallback<QueryLeaveAwayPassengersResponse>?
-    ) {
-        mService.queryStationLeaveAwayPassengers(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            QueryLeaveAwayPassengersRequest(seq, siteId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryStationLeaveAwayPassengers"))
-    }
-
-    /**
-     * 查询小巴车订单
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryBusOrders(context: Context, callback: OchCommonServiceCallback<BusOrdersResponse>?) {
-        mService.queryBusOrders(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders"))
-    }
-    @JvmStatic
-    fun queryBusLines(context: Context, callback: OchCommonServiceCallback<BusQueryLinesResponse>?) {
-        mService.queryBusLines(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
-    }
-    @JvmStatic
-    fun queryBusTaskByLineId(
-        context: Context,
-        lineId: String?,
-        callback: OchCommonServiceCallback<BusQueryLineTaskResponse>?
-    ) {
-        mService.queryBusTaskByLineId(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            lineId
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
-    }
-}
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt
@@ -1,107 +0,0 @@
-package com.mogo.och.bus.net.login
-
-import android.content.Context
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.och.common.module.biz.bean.TaxiLoginSmsReqBean
-import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean
-import com.mogo.och.common.module.biz.bean.TaxiLoginRespBean
-import com.mogo.och.common.module.biz.bean.TaxiLogoutReqBean
-import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean
-import com.mogo.och.common.module.biz.constant.OchCommonConst
-import com.mogo.cloud.passport.MoGoAiCloudClient
-import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
-import com.mogo.och.common.module.biz.network.interceptor.transformTry
-
-/**
- * Created by pangfan on 2021/8/19
- */
-object OchCommonServiceManager {
-
-    private const val TAG = "OchCommonServiceManager"
-
-    private val mLoginServiceApi: OchLoginServiceApi =
-        MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(
-            OchLoginServiceApi::class.java
-        )
-
-    /**
-     * 获取手机验证码
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun getPhoneCode(
-        context: Context, phone: String?,
-        callback: OchCommonServiceCallback<BaseData>?
-    ) {
-        mLoginServiceApi.getPhoneCode(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLoginSmsReqBean(phone)
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode"))
-    }
-
-    /**
-     * 通过验证码登录
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun gotoLoginBycode(
-        context: Context, phone: String?, code: String?,
-        location4Login: TaxiLoginReqBean.Location4Login?,
-        callback: OchCommonServiceCallback<TaxiLoginRespBean>?
-    ) {
-        val sn = MoGoAiCloudClientConfig.getInstance().sn
-        mLoginServiceApi.gotoLoginBycode4Bus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLoginReqBean(phone, code, sn, location4Login)
-        ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode"))
-    }
-
-    /**
-     * 登出
-     */
-    @JvmStatic
-    fun logout(
-        context: Context,
-        location4Login: TaxiLogoutReqBean.Location4Login?,
-        callback: OchCommonServiceCallback<BaseData>?
-    ) {
-        mLoginServiceApi.logout4Bus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login)
-        ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout"))
-    }
-
-    /**
-     * 接单状态和登录状态查询
-     *
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverServiceStatus(
-        context: Context,
-        callback: OchCommonServiceCallback<DriverStatusQueryRespBean>?
-    ) {
-        if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) {
-            callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等")
-            MoGoAiCloudClient.getInstance().refreshToken()
-            return
-        }
-        mLoginServiceApi.queryDriverServiceStatusAndLoginStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus"))
-    }
-
-}
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java
@@ -1,65 +0,0 @@
-package com.mogo.och.bus.net.login;
-
-import com.mogo.eagle.core.data.BaseData;
-import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
-import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean;
-import com.mogo.och.common.module.biz.bean.TaxiLoginRespBean;
-import com.mogo.och.common.module.biz.bean.TaxiLoginSmsReqBean;
-import com.mogo.och.common.module.biz.bean.TaxiLogoutReqBean;
-
-import io.reactivex.Observable;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-/**
- * Created by pangfan on 2021/8/19
- * <p>
- * 网约车-出租车接口定义
- */
-interface OchLoginServiceApi {
-    /**
-     * 获取手机验证码
-     *
-     * @return
-     */
-    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/sms/v1/driver/sendSms" )
-    Observable<DriverStatusQueryRespBean> getPhoneCode(@Header("appId") String appId
-            , @Header("ticket") String ticket, @Body TaxiLoginSmsReqBean data);
-
-    /**
-     * 通过验证码登录
-     * @param appId
-     * @param ticket
-     * @param data
-     * @return
-     */
-    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/flow/v1/driver/startOperation" )
-    Observable<TaxiLoginRespBean> gotoLoginBycode4Bus(@Header("appId") String appId
-            , @Header("ticket") String ticket, @Body TaxiLoginReqBean data);
-
-    /**
-     * 登出接口
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-    @POST("/och-shuttle-cabin/api/flow/v1/driver/endOperation")
-    Observable<BaseData> logout4Bus(@Header("appId") String appId, @Header("ticket") String ticket,
-                                    @Body TaxiLogoutReqBean data);
-
-    /**
-     * 接单状态和登录状态查询 出租车司机端、小巴车司机端、小巴车乘客端
-     * @param sn
-     * @return
-     */
-    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @GET( "/och-shuttle-cabin/api/business/v1/driver/loginStatus")
-    Observable<DriverStatusQueryRespBean> queryDriverServiceStatusAndLoginStatus(@Header("appId") String appId
-            , @Header("ticket") String ticket, @Query("sn") String sn);
-
-}
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusStationBean.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusStationBean.java
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java
@@ -1,5 +1,7 @@
 package com.mogo.och.bus.callback;

+import com.mogo.och.bus.bean.BusStationBean;
+
 import java.util.List;

 /**
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -25,6 +25,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.och.bus.R;
+import com.mogo.och.bus.bean.BusStationBean;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.net.login.LoginBusImpl;
 import com.mogo.och.bus.presenter.BusPresenter;
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
 import com.mogo.och.bus.bean.BusQueryLinesResponse;
+import com.mogo.och.bus.bean.BusRoutesResponse;
 import com.mogo.och.bus.callback.IBusLinesCallback;
 import com.mogo.och.bus.net.OrderServiceManager;
 import com.mogo.och.bus.ui.BusSwitchLineActivity;
--- a/Show More
+++ b/Show More