[6.2.6]

[bus_p_m2] [页面创建完成]
2023-12-06 20:42:31 +08:00
parent 51c16b55d4
commit 4e32d0bd29
103 changed files with 4345 additions and 111 deletions
--- a/OCH/bus/passenger/src/m2/AndroidManifest.xml
+++ b/OCH/bus/passenger/src/m2/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.mogo.och.bus.passenger">
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <application>
+        <activity android:name="com.mogo.eagle.core.function.main.MainLauncherActivity"
+            android:screenOrientation="portrait"
+            tools:replace="android:screenOrientation"/>
+    </application>
+</manifest>
--- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt
+++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt
@@ -0,0 +1,105 @@
+package com.mogo.och.bus.passenger
+
+import android.content.Context
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
+import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils
+import com.mogo.och.bus.passenger.constant.BusPassengerConst
+import com.mogo.och.bus.passenger.passenger.ui.PM2BaseFragment
+import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment
+import com.mogo.och.common.module.wigets.video.VideoPlayerActivity
+
+/**
+ * 网约车-Bus-乘客端
+ *
+ * Created on 2022/3/29
+ */
+@Route(path = BusPassengerConst.PATH)
+class MogoOCHShuttlePassenger : IMoGoFunctionProvider {
+    private var mActivity: FragmentActivity? = null
+    private var mContainerId = 0
+    private var mPM2Fragment: Fragment? = null
+
+    override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
+        mActivity = activity
+        mContainerId = containerId!!
+        showFragment()
+        if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            mActivity?.let {
+                MultiDisplayUtils.startActWithSecond(it, VideoPlayerActivity::class.java)
+            }
+        }
+        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模式")
+        stepInDayMode() //白天模式 状态栏字体颜色变黑
+    }
+
+    private fun showFragment() {
+        val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager
+        if (mPM2Fragment == null) {
+
+            d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
+
+            val fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG)
+
+            mPM2Fragment = if (fragmentByTag is Fragment){
+                fragmentByTag
+            }else{
+                if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+                    PM2BaseFragment()
+                }else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+                    BusPassengerRouteFragment()
+                }else{
+                    BusPassengerRouteFragment()
+                }
+
+            }
+
+            if (!mPM2Fragment?.isAdded!!){
+                supportFragmentManager?.beginTransaction()
+                    ?.add(mContainerId, mPM2Fragment!!, PM2BaseFragment.TAG)?.commitAllowingStateLoss()
+            }
+            return
+        }
+        d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
+        supportFragmentManager?.beginTransaction()?.show(mPM2Fragment!!)
+            ?.commitAllowingStateLoss()
+    }
+
+    private fun hideFragment() {
+        if (mPM2Fragment != null) {
+            mActivity?.supportFragmentManager?.beginTransaction()?.hide(mPM2Fragment!!)
+                ?.commitAllowingStateLoss()
+        }
+    }
+
+    companion object {
+        private val TAG = MogoOCHShuttlePassenger::class.java.simpleName
+    }
+
+}
--- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
+++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
@@ -1,104 +0,0 @@
-package com.mogo.och.bus.passenger;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
-import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils;
-import com.mogo.och.bus.passenger.constant.BusPassengerConst;
-import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
-import com.mogo.och.common.module.wigets.video.VideoPlayerActivity;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * 网约车-Bus-乘客端
- *
- * Created on 2022/3/29
- */
-@Route(path = BusPassengerConst.PATH)
-public class MogoOCHBusPassenger implements IMoGoFunctionProvider {
-    private static final String TAG = MogoOCHBusPassenger.class.getSimpleName();
-
-    private FragmentActivity mActivity;
-    private int mContainerId;
-    private BusPassengerRouteFragment mPassengerFragment;
-
-    @Nullable
-    @Override
-    public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) {
-        this.mActivity = activity;
-        this.mContainerId = containerId;
-        showFragment();
-
-        if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode) && activity != null) {
-            MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class);
-        }
-
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public String getFunctionName() {
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        if (mActivity == null) return;
-        mActivity.finish();
-    }
-
-    @Override
-    public void init(Context context) {
-    }
-
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private void stepIntoVrMode() {
-        CallerLogger.d( M_BUS_P + TAG, "进入vr模式" );
-        CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑
-    }
-
-    private void showFragment() {
-        FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
-        if(mPassengerFragment == null){
-            CallerLogger.d(M_BUS_P + TAG, "准备add fragment======");
-            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG);
-            if (fragmentByTag instanceof BusPassengerRouteFragment){
-                mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag;
-            }else {
-                mPassengerFragment = new BusPassengerRouteFragment();
-            }
-            if (!mPassengerFragment.isAdded()){
-                supportFragmentManager.beginTransaction().add(mContainerId, mPassengerFragment,BusPassengerRouteFragment.TAG).commitAllowingStateLoss();
-            }
-            return;
-        }
-
-        CallerLogger.d(M_BUS_P + TAG, "准备show fragment");
-        supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
-    }
-
-    private void hideFragment(){
-        if (mPassengerFragment != null){
-            mActivity.getSupportFragmentManager().beginTransaction().hide(mPassengerFragment).commitAllowingStateLoss();
-        }
-    }
-
-}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2OperationStatusResponse.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2OperationStatusResponse.java
@@ -0,0 +1,21 @@
+package com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2QueryLineRequest.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2QueryLineRequest.java
@@ -0,0 +1,16 @@
+package com.mogo.och.bus.passenger.passenger.bean;
+
+public
+/**
+ * @author congtaowang
+ * @since 2021/3/22
+ *
+ * 根据车机行驶线路站点信息
+ */
+class PM2QueryLineRequest {
+
+    private String sn;
+    public PM2QueryLineRequest(String sn) {
+        this.sn = sn;
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResponse.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResponse.java
@@ -0,0 +1,29 @@
+package com.mogo.och.bus.passenger.passenger.bean;
+
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.och.data.bean.BusRoutesResult;
+
+/**
+ * 网约车小巴路线接口请求响应结果 返回的是对应司机屏的线路信息
+ *
+ * @author tongchenfei
+ */
+public class PM2RoutesResponse extends BaseData {
+    private BusRoutesResult data;
+
+    public BusRoutesResult getResult() {
+        return data;
+    }
+
+    public void setResult(BusRoutesResult data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "OchBusRoutesResponse{" +
+                "data=" + data +
+                '}';
+    }
+
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResult.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResult.java
@@ -0,0 +1,79 @@
+package com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2Station.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2Station.java
@@ -0,0 +1,173 @@
+package com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/ADASCallback.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/ADASCallback.kt
@@ -0,0 +1,10 @@
+package com.mogo.och.bus.passenger.passenger.callback
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/15
+ */
+interface ADASCallback {
+    fun updateHDMapStations(stations: MutableList<MutableList<Double>>)
+    fun removeHDMapStations()
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/AutoPilotStatusCallback.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/AutoPilotStatusCallback.kt
@@ -0,0 +1,14 @@
+package com.mogo.och.bus.passenger.passenger.callback
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/13
+ */
+interface AutoPilotStatusCallback {
+    /**
+     * false: 未开启自驾， true ： 开启自驾
+     */
+    fun updateAutoStatus(isOpen: Boolean)
+
+    fun updateAutoStatus(status: Int)
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/DrivingInfoCallback.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/DrivingInfoCallback.kt
@@ -0,0 +1,19 @@
+package com.mogo.och.bus.passenger.passenger.callback
+
+import com.mogo.och.data.bean.BusStationBean
+
+/**
+ * @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<BusStationBean>)
+    fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean)
+    fun clearCustomPolyline()
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/constant/M2Const.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/constant/M2Const.kt
@@ -0,0 +1,16 @@
+package com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ADASModel.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ADASModel.kt
@@ -0,0 +1,45 @@
+package com.mogo.och.bus.passenger.passenger.model
+
+import android.content.Context
+import com.mogo.och.bus.passenger.passenger.callback.ADASCallback
+import com.mogo.och.data.bean.BusStationBean
+
+/**
+ * @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<BusStationBean>){
+        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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt
@@ -0,0 +1,638 @@
+package com.mogo.och.bus.passenger.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.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.function.call.telematic.CallerTelematicManager.sendMsgToServer
+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.constant.BusPassengerConst
+import com.mogo.och.bus.passenger.passenger.callback.AutoPilotStatusCallback
+import com.mogo.och.bus.passenger.passenger.callback.DrivingInfoCallback
+import com.mogo.och.bus.passenger.passenger.model.PM2ServiceManager.driverAppSn
+import com.mogo.och.bus.passenger.passenger.network.PM2ModelLoopManager
+import com.mogo.och.common.module.bean.dpmsg.*
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox
+import com.mogo.och.common.module.biz.constant.OchCommonConst
+import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
+import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.common.module.utils.DateTimeUtil
+import com.mogo.och.common.module.utils.RxUtils
+import com.mogo.och.data.bean.BusRoutesResult
+import com.mogo.och.data.bean.BusStationBean
+import com.mogo.och.data.bean.BusTransferData
+import io.reactivex.disposables.Disposable
+import mogo.telematics.pad.MessagePad
+import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse
+import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse
+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: BusRoutesResult? = null
+
+    private var mCurrentAutoStatus = -1
+
+    var mStations = mutableListOf<BusStationBean>()
+    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
+
+    @Volatile
+    private var globalPathTruncation: Disposable? = 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()
+        queryDriverByLocalDriver()
+        queryDriverOperationStatus()
+        startOrStopOrderLoop(true)
+    }
+
+    private fun queryDriverByLocalDriver() {
+        //本地去请求司机端
+        val msg = TaskDetailsMsg("task")
+        sendMsgToServer(GsonUtils.toJson(msg))
+    }
+
+    private fun initListener() {
+        //自动驾驶状态监听
+        CallerAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener)
+
+        // 定位监听
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 10,mMapLocationListener)
+
+        //司乘屏通信监听
+        CallerTelematicListenerManager.addListener(TAG,mReceivedMsgListener)
+
+        //自动驾驶轨迹监听
+        CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener)
+
+        //网络监听
+        IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
+
+    }
+
+    private fun sendMsgToServer(msg: String) {
+        sendMsgToServer(
+            OchCommonConst.BUSINESS_STRING,
+            GsonUtils.toJson(msg).toByteArray()
+        )
+    }
+
+    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 baseMsg = GsonUtils.fromJson(String(byteArray), BaseDPMsg::class.java)
+                    Logger.d(
+                        SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(baseMsg)
+                    )
+
+                    if (baseMsg != null && baseMsg.type == DPMsgType.TYPE_COMMON.type) {
+                        val msg = GsonUtils.fromJson(String(byteArray), AppConnectMsg::class.java)
+
+                        if (msg != null && msg.isPlay){ //播报
+                            speakTTS(msg.msg)
+                        }
+
+                        if (msg != null && msg.isViewShow) { //消息盒子显示内容
+                           pushAppOperationalMsgBox(
+                                DateTimeUtil.getCurrentTimeStamp(),msg.msg)
+                        }
+                    }else if (baseMsg != null && baseMsg.type == DPMsgType.TYPE_TASK_DETAILS.type) {
+                        val msg = GsonUtils.fromJson(String(byteArray), TaskDetailsMsg::class.java)
+                        Logger.d(
+                            SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(msg)
+                        )
+                        if (msg == null || msg.msg?.isEmpty() == true) {
+                            updateLocalOrder()
+                            return
+                        }
+                        val result = GsonUtils.fromJson(msg.msg, BusTransferData::class.java)
+                        mDrivingInfoCallback?.changeOperationStatus(result.loginStatus == 1)
+                        if (result != null && result.routesResult == null){
+                            updateLocalOrder()
+                        }
+
+                        if (routesResult == null ||
+                            (result != null && result.routesResult?.writeVersion!! > routesResult!!.writeVersion)) {
+                            routesResult = result.routesResult
+                            updatePassengerRouteInfo(routesResult!!)
+                        }
+
+                    }
+                }
+            }
+        }
+
+    @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{
+
+        @Synchronized
+        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)
+
+                if (globalPathTruncation != null && !globalPathTruncation!!.isDisposed) {
+                    d(SceneConstant.M_BUS_P + TAG, "1s内不可以接受轨迹")
+                    return@let
+                }
+
+                globalPathTruncation = RxUtils.createSubscribe(1_000) {
+                    d(SceneConstant.M_BUS_P + TAG, "可以接受轨迹")
+                }
+                d(SceneConstant.M_BUS_P + TAG, "接受轨迹中")
+                it.wayPointsList?.let {list->
+                    updateRoutePoints(list)
+                }
+            }
+        }
+
+    }
+
+    @Synchronized
+    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)
+
+        if (isGoingToNextStation){
+            mTwoStationsRouts.clear()
+            startRemainRouteInfo()
+        }
+    }
+
+    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 onAutopilotStatusResponse(state: Int) {
+                super.onAutopilotStatusResponse(state)
+                d(SceneConstant.M_BUS_P+ TAG, "onAutopilotStatusResponse ===== $state")
+                if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != state){
+                    //美化模式下且行程中
+                    if (FunctionBuildConfig.isDemoMode &&
+                        mNextStationIndex>= 0 && mNextStationIndex <= mStations.size - 1
+                        && isGoingToNextStation){
+                        mAutoStatusCallback?.updateAutoStatus(true)
+                    }else{//非美化模式下
+                        mAutoStatusCallback?.updateAutoStatus(false)
+                    }
+                }else{//自驾状态 2
+                    mAutoStatusCallback?.updateAutoStatus(true)
+                }
+            }
+
+        }
+
+    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()
+                        queryDriverByLocalDriver()
+                    }
+
+                    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
+                        }
+
+                        if (routesResult != null &&
+                            routesResult!!.writeVersion < data.result.writeVersion
+                        ) {
+                            routesResult = data.result
+                        }
+
+                        if (routesResult == null) {
+                            routesResult = data.result
+                        }
+                        updatePassengerRouteInfo(data.result)
+                    }
+
+                    override fun onError() {
+                        d(
+                            SceneConstant.M_BUS_P + TAG,
+                            "queryDriverSiteByCoordinate = onError ="
+                                    + ", sn = " + driverAppSn
+                        )
+                        queryDriverByLocalDriver()
+                    }
+
+                    override fun onFail(code: Int, msg: String?) {
+                        d(SceneConstant.M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg)
+                        if (code == 1003) {
+                            queryDriverOperationDelay()
+                        }
+                        if (driverAppSn.isEmpty()) {
+                            return
+                        }
+                        if (code == 1003) {
+                            routesResult = null
+                            isGoingToNextStation = false
+                            startOrStopCalculateRouteInfo(false)
+                            return
+                        }
+                    }
+
+                })
+        }
+    }
+
+    private fun updateLocalOrder(){
+        mRoutePoints.clear()
+        routesResult = null
+        mNextStationIndex = 0
+        isGoingToNextStation = false
+        startOrStopCalculateRouteInfo(false)
+        mDrivingInfoCallback?.showNoTaskView(true)
+    }
+
+    private fun updatePassengerRouteInfo(result: BusRoutesResult) {
+
+        if (result == null) {
+            updateLocalOrder()
+            return
+        }
+
+        if (routesResult != null && routesResult!!.lineId != result.lineId){
+            d(SceneConstant.M_BUS_P+ TAG, "lineId change= clearCustomPolyline")
+            mDrivingInfoCallback?.clearCustomPolyline()
+        }
+
+        d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= update")
+        routesResult = result
+
+        mDrivingInfoCallback?.updateLine(result.name, result.runningDur)
+            if (result.sites != null) {
+                mDrivingInfoCallback?.showNoTaskView(false)
+                val stations: List<BusStationBean> = result.sites
+                mStations.clear()
+                mStations.addAll(stations)
+                mDrivingInfoCallback?.updateLineStations(mStations)
+                for (i in stations.indices) {
+                    val station: BusStationBean = stations[i]
+                    if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED
+                        && station.isLeaving && i + 1 < stations.size) {
+                        mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<BusStationBean>, i + 1, false)
+                        d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
+//                        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) {
+                        d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
+                        d(SceneConstant.M_BUS_P+ TAG,"och-rotting--arrived ")
+                        mPreRouteIndex = 0
+                        isGoingToNextStation = false
+                        startOrStopCalculateRouteInfo(false)
+                        mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<BusStationBean>, i, true)
+                        return
+                    }else{
+//                        d(SceneConstant.M_BUS_P+TAG,"och-rotting--BusStationBean = " + GsonUtils.toJson(station))
+                    }
+                }
+            }
+
+    }
+
+    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(){
+        //计算当前位置和下一站的剩余点集合
+        //计算剩余点总里程和时间
+        d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size)
+        //计算当前位置和下一站的剩余点集合
+        //计算剩余点总里程和时间
+        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: BusStationBean = 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: BusStationBean = mStations[mNextStationIndex]
+                    val stationCur: BusStationBean = 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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt
@@ -0,0 +1,77 @@
+package com.mogo.och.bus.passenger.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.passenger.bean.PM2OperationStatusResponse
+import com.mogo.och.bus.passenger.passenger.bean.PM2QueryLineRequest
+import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse
+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
+import com.mogo.och.bus.passenger.passenger.network.PM2ServiceApi
+
+/**
+ * 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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ModelLoopManager.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ModelLoopManager.kt
@@ -0,0 +1,127 @@
+package com.mogo.och.bus.passenger.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.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ServiceApi.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ServiceApi.java
@@ -0,0 +1,40 @@
+package com.mogo.och.bus.passenger.passenger.network;
+
+import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse;
+import com.mogo.och.bus.passenger.passenger.bean.PM2QueryLineRequest;
+import com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2ADASPresenter.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2ADASPresenter.kt
@@ -0,0 +1,41 @@
+package com.mogo.och.bus.passenger.passenger.presenter
+
+import androidx.lifecycle.LifecycleOwner
+import com.mogo.commons.mvp.Presenter
+import com.mogo.och.bus.passenger.passenger.callback.ADASCallback
+import com.mogo.och.bus.passenger.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER
+import com.mogo.och.bus.passenger.passenger.model.PM2ADASModel
+import com.mogo.och.bus.passenger.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+i,stations[i])
+        }
+
+    }
+
+    override fun removeHDMapStations() {
+        mView?.removeMapMaker(M2_MAP_STATION_MAKER)
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2DrivingPresenter.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2DrivingPresenter.kt
@@ -0,0 +1,143 @@
+package com.mogo.och.bus.passenger.passenger.presenter
+
+import androidx.lifecycle.LifecycleOwner
+import com.amap.api.maps.model.LatLng
+import com.mogo.commons.mvp.Presenter
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.bus.passenger.passenger.callback.AutoPilotStatusCallback
+import com.mogo.och.bus.passenger.passenger.callback.DrivingInfoCallback
+import com.mogo.och.bus.passenger.passenger.model.PM2ADASModel
+import com.mogo.och.bus.passenger.passenger.model.PM2DrivingModel
+import com.mogo.och.bus.passenger.passenger.ui.PM2DrivingInfoFragment
+import com.mogo.och.data.bean.BusStationBean
+
+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<BusStationBean>) {
+
+        val stationsList = mutableListOf<LatLng>()
+        val stationsListPass = mutableListOf<LatLng>()
+        var startStation: LatLng? = null
+        var endStation: LatLng? = null
+
+        for (i in stations.indices){
+            val station = stations[i]
+            val latLng = LatLng(station.gcjLat,station.gcjLon)
+            if(i==0){
+                startStation = latLng
+                    continue
+            }
+            if(i==stations.size-1){
+                endStation = latLng
+                continue
+            }
+            if(station.drivingStatus==1){//行驶信息，0初始值；1已经过；2当前站；3未到站
+                stationsListPass.add(latLng)
+            }else if(station.drivingStatus==2){
+                if(station.isLeaving){
+                    stationsListPass.add(latLng)
+                }else{
+                    stationsList.add(latLng)
+                }
+            }else{
+                stationsList.add(latLng)
+            }
+
+        }
+
+        ThreadUtils.runOnUiThread {
+            mView?.updateLineStations(stationsList,stationsListPass,startStation,endStation)
+        }
+        PM2ADASModel.INSTANCE.updateHDMapStations(stations)
+    }
+
+    override fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean) {
+        ThreadUtils.runOnUiThread {
+            mView?.updateStationsInfo(stations,i,isArrived)
+        }
+    }
+
+    override fun clearCustomPolyline() {
+        ThreadUtils.runOnUiThread {
+            mView?.clearCustomPolyline()
+        }
+    }
+
+    override fun updateAutoStatus(isOpen: Boolean) {
+        ThreadUtils.runOnUiThread {
+            mView?.updateAutoStatus(isOpen)
+        }
+    }
+
+    override fun updateAutoStatus(status: Int) {
+
+    }
+
+
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2Presenter.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2Presenter.kt
@@ -0,0 +1,7 @@
+package com.mogo.och.bus.passenger.passenger.presenter
+
+import com.mogo.commons.mvp.Presenter
+import com.mogo.och.bus.passenger.passenger.ui.PM2BaseFragment
+
+class PM2Presenter(view: PM2BaseFragment?) :
+    Presenter<PM2BaseFragment?>(view)
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2VideoPresenter.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2VideoPresenter.kt
@@ -0,0 +1,7 @@
+package com.mogo.och.bus.passenger.passenger.presenter
+
+import com.mogo.commons.mvp.Presenter
+import com.mogo.och.bus.passenger.passenger.ui.video.PM2VideoFragment
+
+class PM2VideoPresenter(view: PM2VideoFragment?) :
+    Presenter<PM2VideoFragment?>(view)
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java
@@ -0,0 +1,33 @@
+package com.mogo.och.bus.passenger.passenger.provider;
+
+import android.content.Context;
+import android.view.View;
+
+import com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt
@@ -0,0 +1,70 @@
+package com.mogo.och.bus.passenger.passenger.ui
+
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.passenger.presenter.PM2Presenter
+import com.mogo.och.bus.passenger.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.bus_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 {
+        public val TAG = PM2BaseFragment::class.java.simpleName
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt
@@ -0,0 +1,300 @@
+package com.mogo.och.bus.passenger.passenger.ui
+
+import android.graphics.BitmapFactory
+import android.graphics.drawable.AnimationDrawable
+import android.os.Bundle
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.amap.api.maps.model.LatLng
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.function.view.SiteMarkerBean
+import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.passenger.presenter.PM2DrivingPresenter
+import com.mogo.och.common.module.utils.DateTimeUtil.*
+import com.mogo.och.common.module.utils.NumberFormatUtil
+import com.mogo.och.data.bean.BusStationBean
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.auto_tv
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.clg_distance_left_time
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.group_not_select_line
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.group_stationinfo
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.iv_animal_list
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.line_during_tv
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.line_name_tv
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.overMapView
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.speed_tv
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.station_name_tv
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_arrived_notice
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_distance
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_left_time
+import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_next_station_title
+
+import me.jessyan.autosize.utils.AutoSizeUtils
+import kotlin.math.ceil
+import kotlin.math.roundToInt
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/4/12
+ */
+class PM2DrivingInfoFragment :
+    MvpFragment<PM2DrivingInfoFragment?, PM2DrivingPresenter?>() {
+
+    val stationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_staton_icon)
+    val stationPassIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_staton_arrived_icon)
+    val startStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_start_icon)
+    val endStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_end_icon)
+
+    /**
+     * 改变自动驾驶状态
+     *
+     * @param status 2 - running  1 - enable  2 - disable
+     */
+    override fun getLayoutId(): Int {
+        return R.layout.bus_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.bus_p_m2_line_name_tv_color))
+        station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_line_name_tv_color))
+        speed_tv.setVertrial(true)
+        val intArrayOf = intArrayOf(
+            requireContext().resources.getColor(R.color.bus_p_m2_color_43cefe),
+            requireContext().resources.getColor(R.color.bus_p_m2_color_1466fb)
+        )
+        speed_tv.setmColorList(intArrayOf)
+
+//        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()
+//        }
+    }
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        overMapView?.let {
+            it.onCreateView(savedInstanceState)
+            val radius = AutoSizeUtils.dp2px(requireContext(), 16f)
+            it.outlineProvider = TextureVideoViewOutlineProvider(radius.toFloat())
+            it.clipToOutline = true
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        overMapView?.let{
+            it.onResume()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        overMapView?.let{
+            it.onPause()
+        }
+    }
+
+    override fun onDestroy() {
+        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
+    }
+
+    fun changeOperationStatus(status:Boolean){
+        if (!status){
+            updateNoOrderUI()
+        }
+    }
+
+    fun showNoTaskView(haveTask: Boolean){
+        setLineInfoView(haveTask)
+    }
+
+    private fun setLineInfoView(isShow: Boolean){
+        if (!isShow){
+            updateNoOrderUI()
+        }
+    }
+
+    private fun updateNoOrderUI() {
+        line_name_tv.text = resources.getString(R.string.bus_p_m2_not_select_line_content)
+        updateNoStationView()
+        overMapView?.let {
+            it.clearSiteMarkers()
+        }
+        clearCustomPolyline()
+    }
+
+    fun clearCustomPolyline(){
+        overMapView?.let {
+            it.clearCustomPolyline()
+        }
+    }
+    private fun updateNoStationView(){
+        station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_next_tv_color))
+        station_name_tv.text = resources.getString(R.string.bus_p_m2_empty_tv)
+        tv_distance.text = resources.getString(R.string.bus_p_m2_empty_remain_km)
+        tv_left_time.text = resources.getString(R.string.bus_p_m2_empty_remain_minute)
+        noLineShow()
+    }
+
+    override fun createPresenter(): PM2DrivingPresenter {
+        return PM2DrivingPresenter(this)
+    }
+
+    fun updateAutoStatus(isAutoPilot: Boolean) {
+        if (isAutoPilot){
+            context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.bus_p_m2_white_color)) }
+            context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bus_p_m2_auto_button_bg) }
+        }else{
+            context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.bus_p_m2_color_7094ad)) }
+            context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bus_p_m2_bg_p_m2_auto) }
+        }
+    }
+
+    fun updateLineStations(
+        stations: MutableList<LatLng>,
+        stationsPass: MutableList<LatLng>,
+        startStation: LatLng?,
+        endStation: LatLng?
+    ){
+        overMapView?.let {
+            val stationsList: MutableList<SiteMarkerBean> = mutableListOf()
+            startStation?.let { start->
+                stationsList.add(SiteMarkerBean(start,startStationIcon,0.5f,0.5f))
+            }
+            for (stationsPass in stationsPass) {
+                stationsList.add(SiteMarkerBean(stationsPass,stationPassIcon,0.5f,0.5f))
+            }
+            for (stationsPass in stations) {
+                stationsList.add(SiteMarkerBean(stationsPass,stationIcon,0.5f,0.5f))
+            }
+            endStation?.let {end->
+                stationsList.add(SiteMarkerBean(end,endStationIcon,0.5f,0.5f))
+            }
+            it.drawSiteMarkers(stationsList)
+        }
+    }
+
+    fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean){
+        if (stations.size == 0) return
+        if (0<= i && i<stations.size){
+            station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_next_tv_color))
+            station_name_tv.text  = stations[i].name
+        }
+        if (isArrived){//到站
+            tv_distance.text = resources.getString(R.string.bus_p_m2_empty_remain_km)
+            tv_left_time.text = resources.getString(R.string.bus_p_m2_empty_remain_minute)
+            tv_next_station_title.text = resources.getString(R.string.bus_p_m2_station_title_arrived_tv)
+            haveLineAndArrivedStation()
+        }else{ //前往目的地中
+            tv_next_station_title.text = resources.getString(R.string.bus_p_m2_next_station_title)
+            haveLineAndArriveingStation()
+        }
+    }
+
+    /**
+     * 剩余里程和时间
+     */
+    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".also { tv_distance.text = it }
+        "${time}分钟".also { tv_left_time.text = it }
+    }
+
+    fun noLineShow(){
+        // 没有线路展示
+        group_not_select_line.visibility = View.VISIBLE
+        // 下一个站点
+        group_stationinfo.visibility = View.GONE
+        // 距离和剩余大概时间
+        clg_distance_left_time.visibility = View.GONE
+        // 到达站点
+        tv_arrived_notice.visibility = View.GONE
+
+        iv_animal_list.visibility = View.GONE
+    }
+    // 有线路正在到站点
+    fun haveLineAndArriveingStation(){
+        group_not_select_line.visibility = View.GONE
+        group_stationinfo.visibility = View.VISIBLE
+        clg_distance_left_time.visibility = View.VISIBLE
+        tv_arrived_notice.visibility = View.GONE
+        iv_animal_list.visibility = View.GONE
+    }
+    // 有线路到达站点
+    private fun haveLineAndArrivedStation(){
+        group_not_select_line.visibility = View.GONE
+        group_stationinfo.visibility = View.VISIBLE
+        clg_distance_left_time.visibility = View.GONE
+        tv_arrived_notice.visibility = View.VISIBLE
+        iv_animal_list.visibility = View.VISIBLE
+        val animationDrawable = iv_animal_list.drawable as AnimationDrawable
+        animationDrawable.start()
+    }
+
+    companion object {
+        private val TAG = PM2DrivingInfoFragment::class.java.simpleName
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
@@ -0,0 +1,127 @@
+package com.mogo.och.bus.passenger.passenger.ui
+
+import android.os.Bundle
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.map.overlay.core.Level
+import com.mogo.map.overlay.point.Point
+import com.mogo.map.MapDataWrapper
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE
+import com.mogo.och.bus.passenger.passenger.presenter.PM2ADASPresenter
+import com.mogo.och.common.module.utils.OCHThreadPoolManager
+import kotlinx.android.synthetic.main.bus_p_m2_hpmap_fragment.mapBizView
+
+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.bus_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 builder = Point.Options.Builder(
+                TYPE_MARKER_M2_LINE,
+                Level.MAP_MARKER
+            )
+                .setId(uuid)
+                .anchor(0.5f, 0.5f)
+                .set3DMode(true)
+                .isUseGps(true)
+                .controlAngle(true)
+                .icon3DRes(R.raw.star_marker)
+                .longitude(station[0])
+                .latitude(station[1])
+            MapDataWrapper.getCenterLineInfo(
+                station[0], station[1], -1f
+            ) {
+                // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空
+                it?.let{
+                    builder.rotate(it.angle.toFloat())
+                }
+            }
+            val overlayManager = getOverlayManager()
+            overlayManager?.showOrUpdatePoint(builder.build())
+        }
+        OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
+    }
+
+    fun removeMapMaker(
+        uuid: String,
+    ) {
+        //开启线程移除起终点marker设置
+        val removeMapMarkerRunnable = Runnable {
+            d("RemoveMapMaker=" + Thread.currentThread().name, uuid)
+            val overlayManager = getOverlayManager()
+            overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE)
+        }
+        OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable)
+    }
+
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/video/PM2VideoFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/video/PM2VideoFragment.kt
@@ -0,0 +1,64 @@
+package com.mogo.och.bus.passenger.passenger.ui.video
+
+import com.google.gson.reflect.TypeToken
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.passenger.presenter.PM2VideoPresenter
+import com.mogo.och.common.module.wigets.video.AdsDatas
+import com.mogo.och.common.module.wigets.video.RotationItem
+import kotlinx.android.synthetic.main.bus_p_m2_video_fragment.imageVideoRotationView
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/4/12
+ */
+class PM2VideoFragment :
+    MvpFragment<PM2VideoFragment?, PM2VideoPresenter?>() {
+
+    private var arrayListOf = mutableListOf<RotationItem>()
+
+    override fun getLayoutId(): Int {
+        return R.layout.bus_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() {
+
+        try {
+            arrayListOf.clear()
+            var datas: AdsDatas = GsonUtils.fromJson(FunctionBuildConfig.tempConfig,object : TypeToken<AdsDatas>() {}.type)
+            arrayListOf.addAll(datas.ads)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2BlueToothView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2BlueToothView.kt
@@ -0,0 +1,36 @@
+package com.mogo.och.bus.passenger.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.main.bus_p_m2_view_blue_tooth.view.blueView
+
+/**
+ * 魔戒蓝牙控件
+ * 放置于StatusBar右侧位置
+ */
+class M2BlueToothView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.bus_p_m2_view_blue_tooth, this, true)
+    }
+
+    override fun mofangStatus(status: Boolean) {
+        ThreadUtils.runOnUiThread {
+            if (status) {
+                blueView.setImageResource(R.drawable.bus_p_m2_blue_tooth_close)
+            } else {
+                blueView.setImageResource(R.drawable.bus_p_m2_blue_tooth_open)
+            }
+        }
+    }
+
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2PTrafficLightView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2PTrafficLightView.kt
@@ -0,0 +1,181 @@
+package com.mogo.och.bus.passenger.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.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_bg
+import kotlinx.android.synthetic.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_iv
+import kotlinx.android.synthetic.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_time_tv
+
+/**
+ * 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.bus_p_m2_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.bus_p_m2_light_red_nor)
+                    this@M2PTrafficLightView.visibility = VISIBLE
+                }
+                TrafficLightEnum.YELLOW -> {
+                    m2_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_m2_light_yellow_nor)
+                    this@M2PTrafficLightView.visibility = VISIBLE
+                }
+                TrafficLightEnum.GREEN -> {
+                    m2_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_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.dp_60).toInt()
+            setLayoutParams(lp)
+            m2_p_traffic_light_time_tv.visibility = VISIBLE
+            m2_p_traffic_light_bg.layoutParams.width =
+                resources.getDimension(R.dimen.dp_60).toInt()
+        }
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2StatusBarView.kt
@@ -0,0 +1,110 @@
+package com.mogo.och.bus.passenger.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.main.bus_p_m2_view_status_bar.view.progress
+import kotlinx.android.synthetic.main.bus_p_m2_view_status_bar.view.tv_power_cos
+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.bus_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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2TurnLightView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2TurnLightView.kt
@@ -0,0 +1,199 @@
+package com.mogo.och.bus.passenger.passenger.ui.widget
+
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.common.module.manager.lightmanager.TurnLightManager
+import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.left_nor_image
+import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.left_select_image
+import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.right_nor_image
+import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.right_select_image
+import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.turn_light_layout
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/13
+ */
+class M2TurnLightView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr),
+    IMoGoTurnLightListener, TurnLightManager.TurnLightListener {
+
+
+    companion object {
+        private const val TAG = "TurnLightViewStatus"
+    }
+
+    private var isLeftLight: Boolean = false
+    private var isRightLight: Boolean = false
+    private var isDisappear: Boolean = false
+
+    init {
+        LayoutInflater.from(context)
+            .inflate(R.layout.bus_p_m2_turn_light_status, this, true)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerTurnLightListenerManager.addListener(TAG,this)
+
+        TurnLightManager.addTurnLightStatusChangeListener(TAG,this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerChassisLamplightListenerManager.removeListener(TAG)
+        CallerTurnLightListenerManager.removeListener(TAG)
+    }
+
+    override fun hideTurnLightView() {
+        ThreadUtils.runOnUiThread{
+            if (!isDisappear) {
+                isDisappear = true
+                isLeftLight = false
+                isRightLight = false
+                animationDisappear()
+            }
+        }
+    }
+
+    override fun statusChange(newStatus: TurnLightManager.TurnLightStatus) {
+        ThreadUtils.runOnUiThread {
+            setTurnLight(newStatus)
+        }
+    }
+
+    /**
+     * 转向灯动画
+     */
+    private fun setTurnLight(directionLight: TurnLightManager.TurnLightStatus) {
+        if (!isAttachedToWindow) {
+            return
+        }
+        //根据左右进行显示和隐藏，实际要判断每个来的时间和频度
+        when (directionLight) {
+            TurnLightManager.TurnLightStatus.TURN_LIGHT_LEFT -> { //左转向
+                if (!isLeftLight) {
+                    isLeftLight = true
+                    isRightLight = false
+                    isDisappear = false
+                    showNormalAnimation()
+                    left_select_image.visibility = View.VISIBLE
+                    right_select_image.visibility = View.GONE
+                    right_select_image.clearAnimation()
+                    setAnimation(left_select_image)
+                }
+            }
+            TurnLightManager.TurnLightStatus.TURN_LIGHT_RIGHT -> { //右转向
+                if (!isRightLight) {
+                    isRightLight = true
+                    isLeftLight = false
+                    isDisappear = false
+                    showNormalAnimation()
+                    left_select_image.visibility = View.GONE
+                    right_select_image.visibility = View.VISIBLE
+                    left_select_image.clearAnimation()
+                    setAnimation(right_select_image)
+                }
+            }
+            TurnLightManager.TurnLightStatus.TURN_LIGHT_NONE -> { //消失
+                if (!isDisappear) {
+                    isDisappear = true
+                    isLeftLight = false
+                    isRightLight = false
+                    animationDisappear()
+                }
+            }
+        }
+    }
+
+    //显示背景
+    private fun showNormalAnimation() {
+        val appearAnimation = AlphaAnimation(0f, 1.0f)
+        appearAnimation.duration = 300
+        val appearAnimationImage = AlphaAnimation(0f, 1.0f)
+        appearAnimation.duration = 500
+        turn_light_layout.startAnimation(appearAnimation)
+        left_nor_image.startAnimation(appearAnimationImage)
+        right_nor_image.startAnimation(appearAnimationImage)
+
+        turn_light_layout.visibility = View.VISIBLE
+        left_nor_image.visibility = View.VISIBLE
+        right_nor_image.visibility = View.VISIBLE
+    }
+
+    //消失动画，当转向等数据为空时候
+    private fun animationDisappear() {
+        left_select_image.visibility = View.GONE
+        right_select_image.visibility = View.GONE
+        left_select_image.clearAnimation()
+        right_select_image.clearAnimation()
+
+        left_nor_image.clearAnimation()
+        right_nor_image.clearAnimation()
+        turn_light_layout.clearAnimation()
+
+        val disappearAnimationLeft = AlphaAnimation(1.0f, 0f)
+        disappearAnimationLeft.duration = 300
+
+        val disappearAnimationBg = AlphaAnimation(1.0f, 0f)
+        disappearAnimationBg.duration = 500
+
+        left_nor_image.startAnimation(disappearAnimationLeft)
+        right_nor_image.startAnimation(disappearAnimationLeft)
+        turn_light_layout.startAnimation(disappearAnimationBg)
+
+        disappearAnimationLeft.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationRepeat(p0: Animation?) {
+            }
+
+            override fun onAnimationStart(p0: Animation?) {
+            }
+
+            override fun onAnimationEnd(p0: Animation?) {
+                left_nor_image.visibility = View.GONE
+                right_nor_image.visibility = View.GONE
+            }
+        })
+
+        disappearAnimationBg.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationRepeat(p0: Animation?) {
+            }
+
+            override fun onAnimationStart(p0: Animation?) {
+            }
+
+            override fun onAnimationEnd(p0: Animation?) {
+                turn_light_layout.visibility = View.GONE
+            }
+        })
+    }
+
+    //实现图片闪烁效果
+    private fun setAnimation(imageView: ImageView) {
+        val animationSet = AnimatorSet()
+        val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f)
+        val valueAnimatorDisappear = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f)
+        valueAnimator.duration = 1000
+        valueAnimatorDisappear.duration = 800
+        valueAnimator.repeatCount = -1
+        valueAnimatorDisappear.repeatCount = -1
+        animationSet.playTogether(valueAnimatorDisappear, valueAnimator)
+        animationSet.start()
+    }
+
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
@@ -0,0 +1,137 @@
+package com.mogo.och.bus.passenger.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.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
+import com.shuyu.gsyvideoplayer.utils.GSYVideoType
+import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
+import me.jessyan.autosize.utils.AutoSizeUtils
+
+/**
+ * @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_TYPE_16_9)
+        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)
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (!mIfCurrentIsFullscreen) {
+            val dp2px = AutoSizeUtils.dp2px(context, 16f)
+            this.outlineProvider = TextureVideoViewOutlineProvider(dp2px.toFloat())
+            this.clipToOutline = true
+        }
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceImageView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceImageView.kt
@@ -0,0 +1,45 @@
+package com.mogo.och.bus.passenger.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.bus_p_m2_p_video_holder)
+        imageView?.let { Glide.with(context).asBitmap().load(path)
+            .apply(
+                RequestOptions().useUnlimitedSourceGeneratorsPool(true)
+                    .placeholder(R.drawable.bus_p_m2_p_video_holder)
+                    .error(R.drawable.bus_p_m2_p_video_holder)
+                    .fallback(R.drawable.bus_p_m2_p_video_holder)
+                    .centerCrop()
+            )
+            .into(it) }
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvancePagerAdapter.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvancePagerAdapter.kt
@@ -0,0 +1,212 @@
+package com.mogo.och.bus.passenger.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.och.common.module.wigets.video.RotationItem
+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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -0,0 +1,254 @@
+package com.mogo.och.bus.passenger.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.download.*
+import com.mogo.eagle.core.utilcode.download.callback.*
+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)
+        val outLayout = LayoutParams(-1, -1)
+        addView(videoRelativeLayout, outLayout)
+
+        if (videoViewPlayer === null) {
+            //视频播放控件
+            videoViewPlayer = AdvanceGSYVideoPlayer(context)
+        }
+
+        val 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.bus_p_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)
+        val downloadUrl = fileNetPath
+        val downloadDir = mVideoDirPath
+        if (downloadUrl != null && downloadDir != null) {
+            DownloadUtils.downLoad(
+                context, downloadUrl, downloadDir, downloadVideoName,  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 : IDownloadListener {
+        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, downloaded: Long, total: Long) {
+            Logger.d(ImageAndVideoRotation.TAG, "download-onProgress== ${ (downloaded * 1.0f * 100/total).toInt() }")
+        }
+
+        override fun onFinished(url: String, path: String) {
+            Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url")
+            if (url.equals(fileNetPath)) { //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
+                //下载完成
+                ThreadUtils.runOnUiThread {
+                    startPlay(Uri.fromFile(File(path)).toString())
+                }
+            } else {//如果当前文件不存在再次去下载当前的
+                Logger.d(
+                    ImageAndVideoRotation.TAG, "download-onFinished = not current" +
+                            ",currentUrl = $fileNetPath "
+                )
+                if (FileUtils.isFileExists(path)) {
+                    Logger.d(ImageAndVideoRotation.TAG, "have download startPlay")
+                    ThreadUtils.runOnUiThread {
+                        startPlay(Uri.fromFile(File(path)).toString())
+                    }
+                    return
+                } else {
+                    startDownLoadVideo()
+                }
+            }
+        }
+
+        override fun onError(url: String, error: String?) {
+            Logger.d(ImageAndVideoRotation.TAG, "download-onError-$error")
+            //出错再次下载
+            startDownLoadVideo()
+        }
+    }
+}
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceViewPager.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceViewPager.kt
@@ -0,0 +1,24 @@
+package com.mogo.och.bus.passenger.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/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/ImageAndVideoRotation.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/ImageAndVideoRotation.kt
@@ -0,0 +1,50 @@
+package com.mogo.och.bus.passenger.passenger.ui.widget.video
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.RelativeLayout
+import com.mogo.och.bus.passenger.passenger.ui.widget.video.AdvancePagerAdapter
+import com.mogo.och.bus.passenger.passenger.ui.widget.video.AdvanceViewPager
+import com.mogo.och.common.module.wigets.video.RotationItem
+
+/**
+ * @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/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arrived_road.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arrived_road.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arriving_road.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arriving_road.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_custom_corner.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_custom_corner.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_0.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_0.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_1.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_1.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_2.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_2.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_auto_button_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_auto_button_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bg_driving_info_image.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bg_driving_info_image.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_close.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_close.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_open.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_open.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bottom_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bottom_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_card_split.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_card_split.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_clock_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_clock_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_drive_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_drive_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_line_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_line_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_time_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_time_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_green_nor.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_green_nor.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_red_nor.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_red_nor.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_yellow_nor.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_yellow_nor.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_lightyellow_nor.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_lightyellow_nor.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_name.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_name.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_noselect.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_noselect.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_tile.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_tile.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_car_icon.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_car_icon.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_end_icon.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_end_icon.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_start_icon.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_start_icon.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_arrived_icon.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_arrived_icon.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_icon.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_icon.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_p_video_holder.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_p_video_holder.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_sky_bg.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_sky_bg.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_status_bar_logo.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_status_bar_logo.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_left.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_left.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_right.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_right.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_left.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_left.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_right.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_right.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_open.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_open.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_un_open.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_un_open.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_open.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_open.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_un_open.png
+++ b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_un_open.png
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_arrived_notice.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_arrived_notice.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_24" />
+    <solid android:color="@color/bus_p_m2_color_aeedb8"/>
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_distance_lefttime.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_distance_lefttime.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_24" />
+    <solid android:color="@color/bus_p_m2_color_99afc9e7"/>
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_info.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomLeftRadius="@dimen/dp_16"
+        android:topLeftRadius="@dimen/dp_16"/>
+    <gradient android:startColor="@android:color/white"
+        android:endColor="@color/bus_p_m2_color_c8efff"
+        android:angle="315"
+        />
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_selector.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_selector.xml
@@ -0,0 +1,8 @@
+<?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/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_arrived_station.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_arrived_station.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
+android:oneshot="false">
+    <item android:drawable="@drawable/bus_p_m2_arrived_an_0"  android:duration="300"/>
+    <item android:drawable="@drawable/bus_p_m2_arrived_an_1" android:duration="300"/>
+    <item android:drawable="@drawable/bus_p_m2_arrived_an_2" android:duration="300"/>
+
+
+</animation-list>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_auto.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_auto.xml
@@ -0,0 +1,7 @@
+<?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/bus_p_m2_button_un_auto_bg_color"/>
+    <corners android:radius="@dimen/dp_20"/>
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_traffic_light.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_traffic_light.xml
@@ -0,0 +1,7 @@
+<?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/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_pnc.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_pnc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient android:centerColor="@color/bus_p_m2_pnc_bg_color"/>
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_brakelight_background_daytime.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_brakelight_background_daytime.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/bus_p_m2_button_un_auto_bg_color" />
+    <corners android:radius="@dimen/dp_25" />
+</shape>
--- a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_power_seekbar_style.xml
+++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_power_seekbar_style.xml
@@ -0,0 +1,26 @@
+<?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/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml
@@ -0,0 +1,378 @@
+<?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="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- 全览地图带站点-->
+    <com.mogo.eagle.core.function.view.OverMapView
+        android:id="@+id/overMapView"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:carDrawable="@drawable/bus_p_m2_map_car_icon"
+        app:isClearArrived="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.6"
+        app:mapStyleExtraPath="@string/bus_p_m2_over_map_style_extra_path"
+        app:mapStylePath="@string/bus_p_m2_over_map_style_path"
+        app:resetDrawableMarginBottom="@dimen/dp_54"
+        app:resetDrawableMarginRight="@dimen/dp_34"
+        app:compassDrawable="@drawable/bus_p_m2_amap_custom_corner"
+        app:arrivedDrawable="@drawable/bus_p_m2_amap_arrived_road"
+        app:unArrivedDrawable="@drawable/bus_p_m2_amap_arriving_road"
+        app:mapTilt="0"
+        app:leftPadding="200"
+        app:topPadding="150"
+        app:bottomPadding="50" />
+
+    <ImageView
+        android:id="@+id/cl_left_container_back"
+        android:layout_width="0dp"
+        android:scaleType="fitXY"
+        android:layout_height="match_parent"
+        android:src="@drawable/bus_p_m2_bg_driving_info_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.516"/>
+
+    <View
+        android:id="@+id/cl_left_container"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.5"/>
+
+    <ImageView
+        android:id="@+id/iv_line_name_container"
+        android:layout_width="@dimen/dp_661"
+        android:layout_height="@dimen/dp_92"
+        android:src="@drawable/bus_p_m2_line_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_line_icon"
+        android:layout_width="@dimen/dp_32"
+        android:layout_height="@dimen/dp_32"
+        android:layout_marginEnd="@dimen/dp_14"
+        android:src="@drawable/bus_p_m2_line_tile"
+        app:layout_constraintBottom_toBottomOf="@+id/line_name_tv"
+        app:layout_constraintEnd_toStartOf="@+id/line_name_tv"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="@+id/iv_line_name_container"
+        app:layout_constraintTop_toTopOf="@+id/line_name_tv" />
+
+    <com.mogo.och.common.module.wigets.MarqueeTextView
+        android:id="@+id/line_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:maxWidth="@dimen/dp_600"
+        android:singleLine="true"
+        android:textColor="@color/bus_p_m2_line_name_tv_color"
+        android:textSize="@dimen/dp_36"
+        android:textStyle="bold"
+        app:customGap="0.2"
+        app:layout_constraintEnd_toEndOf="@+id/iv_line_name_container"
+        app:layout_constraintStart_toEndOf="@+id/iv_line_icon"
+        app:layout_constraintTop_toTopOf="@+id/iv_line_name_container"
+        app:useCustomGap="true" />
+
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_not_select_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="aciv_not_select_line,m2_p_not_select_line_content" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_not_select_line"
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_105"
+        app:layout_constraintStart_toStartOf="@+id/m2_p_not_select_line_content"
+        app:layout_constraintEnd_toEndOf="@+id/m2_p_not_select_line_content"
+        app:layout_constraintBottom_toTopOf="@+id/m2_p_not_select_line_content"
+        android:layout_marginBottom="@dimen/dp_14"
+        android:src="@drawable/bus_p_m2_line_noselect" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/m2_p_not_select_line_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/bus_p_m2_not_select_line_content"
+        android:textColor="@color/bus_p_m2_line_during_tv_color"
+        android:textSize="@dimen/dp_18"
+        android:layout_marginBottom="@dimen/dp_43"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/cl_left_container"
+        app:layout_constraintBottom_toTopOf="@+id/aciv_speed_time_bg"
+        />
+
+    <!--  region 站点信息 -->
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_stationinfo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="bg_distance_lefttime,bg_distance_lefttime_split,tv_distance,tv_left_time,tv_next_station_title,station_name_tv" />
+
+    <TextView
+        android:id="@+id/tv_next_station_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_50"
+        android:layout_marginTop="@dimen/dp_96"
+        android:text="@string/bus_p_m2_next_station_title"
+        android:textColor="@color/bus_p_m2_color_203555"
+        android:textSize="@dimen/dp_40"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        app:layout_constraintTop_toTopOf="@+id/tv_next_station_title"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_next_station_title"
+        app:layout_constraintStart_toEndOf="@+id/tv_next_station_title"
+        android:id="@+id/iv_animal_list"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_32"
+        android:src="@drawable/bus_p_m2_bg_p_m2_arrived_station"
+        android:visibility="gone"
+        android:layout_marginStart="@dimen/dp_7" />
+
+    <com.mogo.och.common.module.wigets.MarqueeTextView
+        android:id="@+id/station_name_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_6"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:gravity="left"
+        android:singleLine="true"
+        android:text="@string/bus_p_m2_empty_tv"
+        android:textColor="@color/bus_p_m2_color_17417B"
+        android:textSize="@dimen/dp_56"
+        android:textStyle="bold"
+        app:customGap="0.2"
+        app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_next_station_title"
+        app:layout_constraintEnd_toEndOf="@+id/cl_left_container"
+        app:useCustomGap="true" />
+
+    <!--    region 到下一站距离和时间    -->
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/clg_distance_left_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="bg_distance_lefttime,bg_distance_lefttime_split,tv_distance,tv_left_time" />
+
+    <View
+        android:id="@+id/bg_distance_lefttime"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_48"
+        android:layout_marginTop="@dimen/dp_8"
+        android:background="@drawable/bus_p_m2_bg_driving_distance_lefttime"
+        app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
+        app:layout_constraintTop_toBottomOf="@+id/station_name_tv" />
+
+    <View
+        android:id="@+id/bg_distance_lefttime_split"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_23"
+        android:background="@color/bus_p_m2_color_6617417B"
+        app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime"
+        app:layout_constraintEnd_toEndOf="@+id/bg_distance_lefttime"
+        app:layout_constraintStart_toStartOf="@+id/bg_distance_lefttime"
+        app:layout_constraintTop_toTopOf="@+id/bg_distance_lefttime" />
+
+    <TextView
+        android:id="@+id/tv_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="--"
+        android:textColor="@color/bus_p_m2_color_2d3e5f"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime"
+        app:layout_constraintEnd_toStartOf="@+id/bg_distance_lefttime_split"
+        app:layout_constraintStart_toStartOf="@+id/bg_distance_lefttime"
+        app:layout_constraintTop_toTopOf="@+id/bg_distance_lefttime" />
+
+    <TextView
+        android:id="@+id/tv_left_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="--"
+        android:textColor="@color/bus_p_m2_color_2d3e5f"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime"
+        app:layout_constraintEnd_toEndOf="@+id/bg_distance_lefttime"
+        app:layout_constraintStart_toEndOf="@+id/bg_distance_lefttime_split"
+        app:layout_constraintTop_toTopOf="@+id/bg_distance_lefttime" />
+
+    <!--    endregion    -->
+
+    <TextView
+        android:id="@+id/tv_arrived_notice"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_48"
+        android:background="@drawable/bus_p_m2_bg_driving_arrived_notice"
+        android:gravity="center"
+        android:text="@string/bus_p_m2_arrived_station_title"
+        android:textColor="@color/bus_p_m2_color_34A61F"
+        android:textStyle="bold"
+        android:layout_marginTop="@dimen/dp_8"
+        android:textSize="@dimen/dp_26"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
+        app:layout_constraintTop_toBottomOf="@+id/station_name_tv" />
+
+    <!-- endregion       -->
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_speed_time_bg"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_181"
+        android:scaleType="fitXY"
+        android:src="@drawable/bus_p_m2_card_split"
+        app:layout_constraintEnd_toEndOf="@+id/cl_left_container"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+    <!-- 行车卡片-->
+    <com.mogo.och.common.module.wigets.OCHGradientTextView
+        android:id="@+id/speed_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_50"
+        android:text="0"
+        android:textColor="@color/bus_p_m2_speed_tv_color"
+        android:textSize="@dimen/dp_70"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg"
+        app:layout_constraintTop_toTopOf="@+id/viewTextClockHouerMin"
+        app:layout_constraintBottom_toBottomOf="@+id/viewTextClockHouerMin"/>
+
+    <TextView
+        android:id="@+id/tv_speed_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_8"
+        android:text="@string/bus_p_m2_speed_unit_txt"
+        app:layout_constraintBaseline_toBaselineOf="@+id/speed_tv"
+        android:textColor="@color/bus_p_m2_line_during_tv_color"
+        app:layout_constraintBottom_toBottomOf="@+id/speed_tv"
+        android:textSize="@dimen/dp_18"
+        app:layout_constraintStart_toEndOf="@+id/speed_tv" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/auto_tv"
+        android:layout_width="@dimen/dp_83"
+        android:layout_height="@dimen/dp_48"
+        android:layout_marginTop="@dimen/dp_21"
+        android:background="@drawable/bus_p_m2_bg_p_m2_auto"
+        android:gravity="center"
+        android:text="@string/bus_p_m2_auto_tv"
+        android:textColor="@color/bus_p_m2_color_7094ad"
+        android:layout_marginBottom="@dimen/dp_34"
+        android:textSize="@dimen/dp_24"
+        app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <!-- 转向灯  IMoGoChassisLamplightListener-->
+    <com.mogo.och.bus.passenger.passenger.ui.widget.M2TurnLightView
+        android:id="@+id/turn_light_view"
+        android:layout_width="@dimen/dp_86"
+        android:layout_height="@dimen/dp_47"
+        android:layout_marginLeft="@dimen/dp_12"
+        app:day_light_mode="true"
+        app:layout_constraintLeft_toRightOf="@+id/auto_tv"
+        app:layout_constraintTop_toTopOf="@+id/auto_tv"
+        app:layout_constraintBottom_toBottomOf="@+id/auto_tv"
+        app:visible="false" />
+
+    <!-- 红绿灯-->
+<!--    <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.AppCompatTextView
+        android:id="@+id/line_during_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_4"
+        android:textColor="@color/bus_p_m2_line_during_tv_color"
+        android:textSize="@dimen/dp_16"
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="@+id/line_name_tv"
+        app:layout_constraintTop_toBottomOf="@+id/line_name_tv" />
+
+    <View
+        android:id="@+id/view_split"
+        android:layout_marginTop="@dimen/dp_30"
+        app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/auto_tv"
+        app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg"
+        app:layout_constraintEnd_toEndOf="@+id/aciv_speed_time_bg"
+        android:background="@color/bus_p_m2_color_6617417B"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="0dp"/>
+
+    <TextClock
+        android:layout_marginStart="@dimen/dp_21"
+        android:id="@+id/viewTextClockHouerMin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="HH:mm"
+        android:format24Hour="HH:mm"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/dp_10"
+        app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg"
+        app:layout_constraintStart_toEndOf="@+id/view_split"
+        android:layout_marginEnd="@dimen/dp_90"
+        android:textColor="@color/bus_p_m2_color_17417B"
+        android:includeFontPadding="false"
+        android:textSize="@dimen/dp_52" />
+
+    <TextClock
+        android:layout_marginStart="@dimen/dp_21"
+        android:id="@+id/viewTextClockDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="yyyy年MM月dd日"
+        android:format24Hour="yyyy年MM月dd日"
+        android:gravity="center"
+        android:layout_marginBottom="-3dp"
+        app:layout_constraintBottom_toTopOf="@+id/viewTextClockWeek"
+        app:layout_constraintStart_toEndOf="@+id/view_split"
+        android:textColor="@color/bus_p_m2_color_17417B"
+        android:includeFontPadding="false"
+        android:textSize="@dimen/dp_26" />
+
+
+    <TextClock
+        android:layout_marginStart="@dimen/dp_21"
+        android:id="@+id/viewTextClockWeek"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="EEEE"
+        android:format24Hour="EEEE"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="@+id/view_split"
+        app:layout_constraintStart_toEndOf="@+id/view_split"
+        android:layout_marginEnd="@dimen/dp_90"
+        android:textColor="@color/bus_p_m2_color_17417B"
+        android:includeFontPadding="false"
+        android:textSize="@dimen/dp_26" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
@@ -0,0 +1,151 @@
+<?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:background="@android:color/white"
+    android:layout_height="match_parent">
+
+    <!-- 高精地图-->
+    <FrameLayout
+        android:id="@+id/hd_map_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/och_shadow_layout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <ImageView
+        android:src="@drawable/bus_p_m2_sky_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:scaleType="fitXY"
+        android:layout_width="1080dp"
+        android:layout_height="@dimen/dp_612"/>
+    <ImageView
+        android:id="@+id/iv_bottom_bg"
+        android:src="@drawable/bus_p_m2_bottom_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:scaleType="fitXY"
+        android:layout_width="1080dp"
+        android:layout_height="@dimen/dp_630"/>
+
+
+
+    <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
+        android:id="@+id/och_shadow_layout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_520"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="@dimen/dp_61"
+        android:layout_marginStart="@dimen/dp_25"
+        android:layout_marginEnd="@dimen/dp_25"
+        app:blurRadius="@dimen/dp_15"
+        app:shadowColor="#802F3E67"
+        app:shadowRadius="@dimen/dp_16"
+        app:shadow_position="outer"
+        app:xOffset="0dp"
+        app:yOffset="0dp"/>
+
+    <!-- 行车卡片--><!-- 全览地图带站点-->
+    <FrameLayout
+        android:id="@+id/driving_fragment"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:layout_height="@dimen/dp_492"
+        android:layout_marginTop="@dimen/dp_13"
+        app:layout_constraintTop_toTopOf="@+id/och_shadow_layout"
+        app:layout_constraintEnd_toEndOf="@+id/och_shadow_layout"
+        app:layout_constraintStart_toStartOf="@+id/och_shadow_layout"/>
+
+    <!--    消息盒子气泡-->
+    <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"
+        android:layout_marginBottom="-40dp"
+        app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="@dimen/dp_40"
+        />
+
+    <!--pnc行为决策-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
+        android:id="@+id/pnc_actions_view"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_36"
+        app:layout_constraintBottom_toTopOf="@+id/video_fragment"
+        android:layout_marginBottom="@dimen/dp_25"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:pnc_size="@dimen/dp_18"
+        app:background_resource="@drawable/bus_p_m2_bg_pnc" />
+
+    <!-- 图片或视频广告-->
+
+    <FrameLayout
+        android:id="@+id/video_fragment_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="572.5dp"
+        android:layout_marginBottom="@dimen/dp_35"
+        android:layout_marginEnd="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_35"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <FrameLayout
+        android:id="@+id/video_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="562.5dp"
+        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_40"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <ImageView
+        android:src="@drawable/bus_p_m2_video_top_left"
+        app:layout_constraintTop_toTopOf="@+id/video_fragment_bottom"
+        app:layout_constraintStart_toStartOf="@+id/video_fragment_bottom"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"/>
+
+    <ImageView
+        android:src="@drawable/bus_p_m2_video_top_right"
+        app:layout_constraintTop_toTopOf="@+id/video_fragment_bottom"
+        app:layout_constraintEnd_toEndOf="@+id/video_fragment_bottom"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"/>
+
+    <ImageView
+        android:src="@drawable/bus_p_m2_video_bottom_left"
+        app:layout_constraintBottom_toBottomOf="@+id/video_fragment_bottom"
+        app:layout_constraintStart_toStartOf="@+id/video_fragment_bottom"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"/>
+
+    <ImageView
+        android:src="@drawable/bus_p_m2_video_bottom_right"
+        app:layout_constraintBottom_toBottomOf="@+id/video_fragment_bottom"
+        app:layout_constraintEnd_toEndOf="@+id/video_fragment_bottom"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"/>
+
+
+    <com.mogo.och.common.module.wigets.ZhiView
+        android:id="@+id/zv_msg_pop_bottom"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
+        android:src="@drawable/xiaozhi_normal_0000"
+        android:layout_marginBottom="-70dp"
+        app:layout_constraintBottom_toTopOf="@+id/video_fragment"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- 16   9   -->
+<!-- 1000 562.5  -->
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_hpmap_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_hpmap_fragment.xml
@@ -0,0 +1,18 @@
+<?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"
+        app:styleMode="MAP_STYLE_DAY_VR"
+        app:carPosition="-1"
+        app:default_perspective="MAP_STYLE_VR_ERHAI_B2"
+        app:isWeatherEnable="false"
+        app:locationIcon3DRes="@raw/m2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_traffic_light_view.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_traffic_light_view.xml
@@ -0,0 +1,36 @@
+<?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_60"
+    android:layout_height="@dimen/dp_40"
+    android:visibility="visible">
+
+    <ImageView
+        android:id="@+id/m2_p_traffic_light_bg"
+        android:layout_width="@dimen/dp_60"
+        android:layout_height="@dimen/dp_40"
+        android:background="@drawable/bus_p_m2_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/bus_p_m2_color_2d3e5f"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:gravity="center" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_turn_light_status.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_turn_light_status.xml
@@ -0,0 +1,53 @@
+<?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_86"
+    android:layout_height="@dimen/dp_47"
+    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/bus_p_m2_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_30"
+            android:layout_height="@dimen/dp_30"
+            android:layout_gravity="left|center_vertical"
+            android:layout_marginLeft="@dimen/dp_12"
+            android:src="@drawable/bus_p_m2_zuozhuan_un_open" />
+
+        <ImageView
+            android:id="@+id/right_nor_image"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="@dimen/dp_30"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginRight="@dimen/dp_12"
+            android:src="@drawable/bus_p_m2_youzhuan_un_open" />
+
+        <ImageView
+            android:id="@+id/left_select_image"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="@dimen/dp_30"
+            android:layout_gravity="left|center_vertical"
+            android:layout_marginLeft="@dimen/dp_12"
+            android:src="@drawable/bus_p_m2_zuozhuan_open"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/right_select_image"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="@dimen/dp_30"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginRight="@dimen/dp_12"
+            android:src="@drawable/bus_p_m2_youzhuan_open"
+            android:visibility="gone" />
+    </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_fragment.xml
@@ -0,0 +1,13 @@
+<?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.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/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_view.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_view.xml
@@ -0,0 +1,8 @@
+<?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/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_blue_tooth.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_blue_tooth.xml
@@ -0,0 +1,15 @@
+<?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/bus_p_m2_blue_tooth_open"
+        tools:ignore="ContentDescription" />
+
+</RelativeLayout>
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_status_bar.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_status_bar.xml
@@ -0,0 +1,72 @@
+<?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_40" />
+
+    <!--魔方连接状态 蓝牙-->
+    <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/bus_p_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/bus_p_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/bus_p_m2_power_tv_color"
+        android:layout_marginRight="@dimen/dp_40"
+        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/bus_p_m2_status_bar_logo"
+        android:scaleType="fitXY"
+        android:layout_width="@dimen/dp_94"
+        android:layout_height="@dimen/dp_25"/>
+
+
+
+</merge>
--- a/OCH/bus/passenger/src/main/res/m2/raw/star_marker.nt3d
+++ b/OCH/bus/passenger/src/main/res/m2/raw/star_marker.nt3d
--- a/OCH/bus/passenger/src/main/res/m2/raw/station_marker.nt3d
+++ b/OCH/bus/passenger/src/main/res/m2/raw/station_marker.nt3d
--- a/OCH/bus/passenger/src/main/res/m2/values/colors.xml
+++ b/OCH/bus/passenger/src/main/res/m2/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="bus_p_m2_white_color">#FFFFFF</color>
+ <color name="bus_p_m2_speed_tv_color">#0B1E38</color>
+ <color name="bus_p_m2_button_un_auto_bg_color">#BBDAFB</color>
+ <color name="bus_p_m2_line_name_tv_color">#0B1E38</color>
+ <color name="bus_p_m2_line_during_tv_color">#5D7199</color>
+ <color name="bus_p_m2_pnc_bg_color">#A5D8FF</color>
+ <color name="bus_p_m2_power_tv_color">#1B2546</color>
+ <color name="bus_p_m2_next_tv_color">#23355D</color>
+ <color name="bus_p_m2_dashed_line_color">#8895B7</color>
+
+
+ <color name="bus_p_m2_color_c8efff">#C8EFFF</color>
+ <color name="bus_p_m2_color_203555">#203555</color>
+ <color name="bus_p_m2_color_17417B">#17417B</color>
+ <color name="bus_p_m2_color_2d3e5f">#2D3E5F</color>
+ <color name="bus_p_m2_color_34A61F">#34A61F</color>
+ <color name="bus_p_m2_color_aeedb8">#AEEDB8</color>
+ <color name="bus_p_m2_color_43cefe">#43CEFE</color>
+ <color name="bus_p_m2_color_1466fb">#1466FB</color>
+ <color name="bus_p_m2_color_7094ad">#7094AD</color>
+
+ <color name="bus_p_m2_color_99afc9e7">#99AFC9E7</color>
+ <color name="bus_p_m2_color_6617417B">#6617417B</color>
+</resources>
--- a/OCH/bus/passenger/src/main/res/m2/values/dimens.xml
+++ b/OCH/bus/passenger/src/main/res/m2/values/dimens.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/OCH/bus/passenger/src/main/res/m2/values/strings.xml
+++ b/OCH/bus/passenger/src/main/res/m2/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="bus_p_m2_speed_unit_txt">KM/H</string>
+    <string name="bus_p_m2_over_map_style_path">m2_map_style.data</string>
+    <string name="bus_p_m2_over_map_style_extra_path">m2_map_style_extra.data</string>
+    <string name="bus_p_m2_auto_tv">AUTO</string>
+    <string name="bus_p_m2_station_title_arrived_tv">已到站</string>
+    <string name="bus_p_m2_empty_tv">暂无站点</string>
+    <string name="bus_p_m2_next_station_title">前方到站</string>
+    <string name="bus_p_m2_empty_remain_km">—公里</string>
+    <string name="bus_p_m2_empty_remain_minute">—分钟</string>
+    <string name="bus_p_m2_arrived_station_title">请按秩序下车</string>
+    <string name="bus_p_m2_not_select_line_content">暂无路线</string>
+</resources>
--- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt
+++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt
@@ -67,7 +67,7 @@ class MogoOCHShuttlePassenger : IMoGoFunctionProvider {

            val fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG)

-            mPM2Fragment = if (fragmentByTag is PM2BaseFragment){
+            mPM2Fragment = if (fragmentByTag is Fragment){
                fragmentByTag
            }else{
                if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
--- a/Show More
+++ b/Show More