[8.4.0]

[b4]
[ui]

OCH/shuttle/passenger_weaknet/src/main/java/b4/com/mogo/och/shuttle/weaknet/passenger/presenter/PB4DrivingFullsPresenter.kt

@@ -0,0 +1,65 @@
+package com.mogo.och.shuttle.weaknet.passenger.presenter
+
+import androidx.lifecycle.LifecycleOwner
+import com.mogo.commons.mvp.Presenter
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.och.data.bean.BusStationBean
+import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback
+import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel
+import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel
+import com.mogo.och.shuttle.weaknet.passenger.ui.linenew.PB4DrivingInfoFullSFragment
+
+class PB4DrivingFullsPresenter(view: PB4DrivingInfoFullSFragment?) :
+        Presenter<PB4DrivingInfoFullSFragment?>(view),
+        ICommonCallback {
+
+    private val TAG = "PB4DrivingPresenter"
+
+    init {
+        CommonModel.init(context)
+        PM2ADASModel.INSTANCE.init(context)
+        initListener()
+    }
+
+    override fun onDestroy(owner: LifecycleOwner) {
+        super.onDestroy(owner)
+        destroyListener()
+        CommonModel.releaseListeners()
+    }
+
+    private fun initListener() {
+        CommonModel.setRouteLineInfoCallback(TAG, this)
+    }
+
+    private fun destroyListener() {
+        CommonModel.setRouteLineInfoCallback(TAG, null)
+    }
+
+    override fun updateSpeed(speed: Int) {
+
+    }
+
+    override fun updateRemainMT(meters: Long, timeInSecond: Long) {
+        ThreadUtils.runOnUiThread {
+            mView?.updateRemainMT(meters, timeInSecond) //米，秒
+        }
+    }
+
+    override fun showNoTaskView(empty: Boolean) {
+        ThreadUtils.runOnUiThread {
+            mView?.showNoTaskView(empty)
+        }
+        if (empty) {
+            PM2ADASModel.INSTANCE.removeHDMapStations()
+        }
+    }
+
+
+    override fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean) {
+        ThreadUtils.runOnUiThread {
+            mView?.updateStationsInfo(stations, i, isArrived)
+        }
+    }
+
+
+}

OCH/shuttle/passenger_weaknet/src/main/java/b4/com/mogo/och/shuttle/weaknet/passenger/ui/PB4BaseFragment.kt

@@ -1,17 +1,13 @@
 package com.mogo.och.shuttle.weaknet.passenger.ui
 
 import com.mogo.commons.mvp.MvpFragment
-import com.mogo.eagle.core.data.enums.EventTypeEnumNew
-import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager
-import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
-import com.mogo.eagle.core.utilcode.util.UriUtils
-import com.mogo.och.common.module.biz.birdge.data.RoadMsg
 import com.mogo.och.shuttle.weaknet.passenger.R
 import com.mogo.och.shuttle.weaknet.passenger.presenter.PB4Presenter
-import com.mogo.och.shuttle.weaknet.passenger.ui.line.PB4DrivingInfoFragment
+import com.mogo.och.shuttle.weaknet.passenger.ui.linenew.PB4DrivingInfoFullSFragment
 import com.mogo.och.shuttle.weaknet.passenger.ui.map.PB4HPMapFragment
 import kotlinx.android.synthetic.main.shuttle_p_b4_fragment.b4_tv_shuttle_b2_p_version
 
@@ -25,7 +21,7 @@ class PB4BaseFragment :
 
     val TAG = PB4BaseFragment::class.java.simpleName
 
-    private var drivingFragment: PB4DrivingInfoFragment? = null
+    private var drivingFragment: PB4DrivingInfoFullSFragment? = null
     private var hdMapFragment: PB4HPMapFragment? = null
 
 
@@ -40,6 +36,15 @@ class PB4BaseFragment :
     override fun initViews() {
 //        tv_shuttle_b2_p_version.text = "版本：${AppUtils.getAppVersionName()}"
         b4_tv_shuttle_b2_p_version.text = StringUtils.getString(R.string.module_och_version, AppUtils.getAppVersionName())
+        b4_tv_shuttle_b2_p_version.onClick {
+
+        }
+        b4_tv_shuttle_b2_p_version.setOnLongClickListener {
+            context?.let {
+                ToggleDebugView.toggleDebugView.toggle(it)
+            }
+            true
+        }
         initFragment()
     }
 
@@ -51,7 +56,7 @@ class PB4BaseFragment :
      * 初始化行程信息，高静地图，宣传 三个fragment
      */
     private fun initFragment() {
-        if (drivingFragment == null) drivingFragment = PB4DrivingInfoFragment()
+        if (drivingFragment == null) drivingFragment = PB4DrivingInfoFullSFragment()
         childFragmentManager.beginTransaction().add(R.id.b4_driving_fragment, drivingFragment!!)
                 .show(drivingFragment!!).commitAllowingStateLoss()
 

OCH/shuttle/passenger_weaknet/src/main/java/b4/com/mogo/och/shuttle/weaknet/passenger/ui/linenew/PB4DrivingInfoFullSFragment.kt

@@ -0,0 +1,104 @@
+package com.mogo.och.shuttle.weaknet.passenger.ui.linenew
+
+import android.os.Bundle
+import android.view.View
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.utilcode.util.StringUtils
+import com.mogo.och.common.module.utils.NumberFormatUtil
+import com.mogo.och.data.bean.BusStationBean
+import com.mogo.och.shuttle.weaknet.passenger.R
+import com.mogo.och.shuttle.weaknet.passenger.presenter.PB4DrivingFullsPresenter
+import kotlin.math.ceil
+import kotlin.math.roundToInt
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/4/12
+ */
+class PB4DrivingInfoFullSFragment :
+        MvpFragment<PB4DrivingInfoFullSFragment?, PB4DrivingFullsPresenter?>() {
+
+
+    override fun getLayoutId(): Int {
+        return R.layout.b4_driving_info_full_fragment
+    }
+
+    override fun getTagName(): String {
+        return TAG
+    }
+
+    override fun initViews() {
+
+    }
+
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+    }
+
+    override fun onDestroyView() {
+        mPresenter?.onDestroy(this)
+        super.onDestroyView()
+    }
+
+    fun showNoTaskView(haveTask: Boolean) {
+
+    }
+
+    override fun createPresenter(): PB4DrivingFullsPresenter {
+        return PB4DrivingFullsPresenter(this)
+    }
+
+    fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean) {
+        if (stations.isEmpty()) {
+
+        } else {
+            if (isArrived && i != 0) {
+
+            } else {
+
+            }
+        }
+
+    }
+
+    /**
+     * 剩余里程和时间
+     */
+    fun updateRemainMT(meters: Long, timeInSecond: Long) { //米。秒
+        var disUnit = StringUtils.getString(R.string.module_och_km)
+        var remainDis: String? = "0"
+
+        if (meters > 0) {
+            if (meters / 1000 < 1) {
+//                disUnit = "米"
+                disUnit = StringUtils.getString(R.string.module_och_m)
+                remainDis = meters.toFloat().roundToInt().toString()
+            } else {
+//                disUnit = "公里"
+
+//                disUnit = "公里";
+                disUnit = StringUtils.getString(R.string.module_och_km)
+                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 }
+    }
+
+
+    companion object {
+        private val TAG = PB4DrivingInfoFullSFragment::class.java.simpleName
+    }
+}

OCH/shuttle/passenger_weaknet/src/main/res/b4/drawable/b4_empty_service_bg.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:startColor="@color/b4_7C7C7C" android:endColor="@color/black" android:angle="270"/>
+</shape>

OCH/shuttle/passenger_weaknet/src/main/res/b4/layout/b4_driving_info_full_fragment.xml

@@ -0,0 +1,387 @@
+<?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"
+    tools:layout_height="@dimen/dp_1920"
+    tools:layout_width="@dimen/dp_1080">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_line_info"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_630"
+        android:background="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actvLineName"
+            android:layout_width="@dimen/dp_136"
+            android:layout_height="@dimen/dp_136"
+            android:layout_marginStart="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_47"
+            android:background="@drawable/b4_line_name"
+            android:gravity="center"
+            android:text="100"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_54"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_end_station_head"
+            app:layout_constraintTop_toTopOf="@+id/actvLineName"
+            app:layout_constraintBottom_toBottomOf="@+id/actvLineName"
+            app:layout_constraintStart_toEndOf="@+id/actvLineName"
+            android:layout_marginStart="@dimen/dp_12"
+            android:src="@drawable/b4_end_station"
+            android:elevation="10dp"
+            android:layout_width="@dimen/dp_106"
+            android:layout_height="@dimen/dp_106"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            app:layout_constraintTop_toTopOf="@+id/aciv_end_station_head"
+            app:layout_constraintBottom_toBottomOf="@+id/aciv_end_station_head"
+            app:layout_constraintStart_toEndOf="@+id/aciv_end_station_head"
+            app:layout_constraintEnd_toStartOf="@+id/b4TextClockDate"
+            android:layout_marginStart="@dimen/dp_15"
+            android:layout_marginEnd="@dimen/dp_18"
+            android:gravity="start"
+            android:text="SHENTON WAY TER"
+            android:textSize="@dimen/dp_55"
+            android:textColor="@color/white"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <TextClock
+            android:id="@+id/b4TextClockDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_26"
+            android:background="@drawable/b4_clock_bg"
+            android:format12Hour="HH:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:textColor="@color/common_FFFFFF"
+            android:textSize="@dimen/dp_36"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/actvLineName"
+            app:layout_constraintBottom_toBottomOf="@+id/actvLineName"
+            />
+
+        <View
+            android:id="@+id/bg_line_green"
+            app:layout_constraintTop_toTopOf="@+id/aciv_end_station_head"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/aciv_end_station_head"
+            app:layout_constraintEnd_toEndOf="@+id/aciv_end_station_head"
+            android:background="@color/b4_00E200"
+            android:layout_marginTop="@dimen/dp_10"
+            android:elevation="5dp"
+            android:layout_width="@dimen/dp_26"
+            android:layout_height="0dp"/>
+
+        <View
+            android:id="@+id/bg_station_4"
+            app:layout_constraintTop_toBottomOf="@+id/b4TextClockDate"
+            app:layout_constraintVertical_chainStyle="packed"
+            android:layout_marginTop="@dimen/dp_5_5"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@color/b4_555555"
+            android:layout_width="@dimen/dp_808"
+            android:layout_height="@dimen/dp_98"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_arrow_station_4"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_4"
+            app:layout_constraintBottom_toTopOf="@+id/bg_station_4"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:elevation="@dimen/dp_8"
+            android:src="@drawable/b4_arrow_double"
+            android:layout_width="@dimen/dp_31"
+            android:layout_height="@dimen/dp_22"/>
+
+        <ImageView
+            android:src="@drawable/b4_arrior_station"
+            android:elevation="8dp"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_4"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_4"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            app:layout_constraintTop_toTopOf="@+id/bg_station_4"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_4"
+            app:layout_constraintStart_toStartOf="@+id/bg_station_4"
+            app:layout_constraintEnd_toEndOf="@+id/bg_station_4"
+            android:layout_marginStart="@dimen/dp_18"
+            android:textSize="@dimen/dp_40"
+            android:textColor="@color/white"
+            android:text="Gradens by the bay"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:id="@+id/bg_station_3"
+            app:layout_constraintTop_toBottomOf="@+id/bg_station_4"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@color/b4_333333"
+            android:layout_width="@dimen/dp_808"
+            android:layout_height="@dimen/dp_98"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_arrow_station_3"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_3"
+            app:layout_constraintBottom_toTopOf="@+id/bg_station_3"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:elevation="@dimen/dp_8"
+            android:src="@drawable/b4_arrow_single"
+            android:layout_width="@dimen/dp_31"
+            android:layout_height="@dimen/dp_22"/>
+
+        <ImageView
+            android:src="@drawable/b4_arrior_station"
+            android:elevation="8dp"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_3"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_3"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            app:layout_constraintTop_toTopOf="@+id/bg_station_3"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_3"
+            app:layout_constraintStart_toStartOf="@+id/bg_station_3"
+            app:layout_constraintEnd_toEndOf="@+id/bg_station_3"
+            android:layout_marginStart="@dimen/dp_18"
+            android:textSize="@dimen/dp_40"
+            android:textColor="@color/white"
+            android:text="Bef Marina Gdns Dr"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:id="@+id/bg_station_2"
+            app:layout_constraintTop_toBottomOf="@+id/bg_station_3"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@color/b4_555555"
+            android:layout_width="@dimen/dp_808"
+            android:layout_height="@dimen/dp_98"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_arrow_station_2"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_2"
+            app:layout_constraintBottom_toTopOf="@+id/bg_station_2"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:elevation="@dimen/dp_8"
+            android:src="@drawable/b4_arrow_single"
+            android:layout_width="@dimen/dp_31"
+            android:layout_height="@dimen/dp_16"/>
+
+        <ImageView
+            android:src="@drawable/b4_arrior_station"
+            android:elevation="8dp"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_2"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_2"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            app:layout_constraintTop_toTopOf="@+id/bg_station_2"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_2"
+            app:layout_constraintStart_toStartOf="@+id/bg_station_2"
+            app:layout_constraintEnd_toEndOf="@+id/bg_station_2"
+            android:layout_marginStart="@dimen/dp_18"
+            android:textSize="@dimen/dp_40"
+            android:textColor="@color/white"
+            android:text="Marina Bay Cruise Centre"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:id="@+id/bg_station_1"
+            app:layout_constraintTop_toBottomOf="@+id/bg_station_2"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@color/b4_333333"
+            android:layout_width="@dimen/dp_808"
+            android:layout_height="@dimen/dp_98"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_arrow_station_1"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_1"
+            app:layout_constraintBottom_toTopOf="@+id/bg_station_1"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:elevation="@dimen/dp_8"
+            android:src="@drawable/b4_arrow_single"
+            android:layout_width="@dimen/dp_31"
+            android:layout_height="@dimen/dp_16"/>
+
+        <ImageView
+            android:src="@drawable/b4_arrior_station"
+            android:elevation="8dp"
+            app:layout_constraintTop_toTopOf="@+id/bg_station_1"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_1"
+            app:layout_constraintStart_toStartOf="@+id/bg_line_green"
+            app:layout_constraintEnd_toEndOf="@+id/bg_line_green"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            app:layout_constraintTop_toTopOf="@+id/bg_station_1"
+            app:layout_constraintBottom_toBottomOf="@+id/bg_station_1"
+            app:layout_constraintStart_toStartOf="@+id/bg_station_1"
+            app:layout_constraintEnd_toEndOf="@+id/bg_station_1"
+            android:layout_marginStart="@dimen/dp_18"
+            android:textSize="@dimen/dp_40"
+            android:textColor="@color/white"
+            android:text="80 Robinson Road"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="@dimen/dp_116"
+            android:layout_height="@dimen/dp_116"
+            android:layout_marginStart="@dimen/dp_34"
+            android:layout_marginBottom="@dimen/dp_37"
+            android:background="@drawable/b4_next_station"
+            android:gravity="center"
+            android:text="NEXT"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_28"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_empty_server"
+        app:layout_constraintTop_toBottomOf="@+id/cl_line_info"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/b4_empty_service_bg"
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:layout_height="0dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_text_no_service"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_305"
+            android:src="@drawable/b4_no_service"
+            android:layout_width="@dimen/dp_390"
+            android:layout_height="@dimen/dp_68"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            app:layout_constraintTop_toBottomOf="@+id/aciv_text_no_service"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_267"
+            android:src="@drawable/b4_no_service_bottom"
+            android:layout_width="@dimen/dp_831"
+            android:layout_height="@dimen/dp_524"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_line_info_station"
+        app:layout_constraintTop_toBottomOf="@+id/cl_line_info"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/b4_empty_service_bg"
+        android:layout_width="0dp"
+        android:layout_height="0dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/b4_aciv_doorway"
+            android:layout_width="@dimen/dp_300"
+            android:layout_height="@dimen/dp_280"
+            android:layout_marginTop="@dimen/dp_128"
+            android:src="@drawable/b4_arrive_door"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/b4_aciv_door_left"
+            android:layout_width="@dimen/dp_165"
+            android:layout_height="@dimen/dp_311"
+            android:layout_marginEnd="-157dp"
+            android:layout_marginBottom="-14dp"
+            android:src="@drawable/b4_arrive_door_left"
+            app:layout_constraintBottom_toBottomOf="@+id/b4_aciv_doorway"
+            app:layout_constraintEnd_toStartOf="@+id/b4_aciv_doorway" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/b4_aciv_arrow_left"
+            android:layout_width="@dimen/dp_135"
+            android:layout_height="@dimen/dp_84"
+            android:layout_marginBottom="@dimen/dp_20"
+            android:src="@drawable/b4_arrive_door_left_arrow"
+            app:layout_constraintBottom_toBottomOf="@+id/b4_aciv_door_left"
+            app:layout_constraintEnd_toStartOf="@+id/b4_aciv_door_left"
+            app:layout_constraintTop_toTopOf="@+id/b4_aciv_door_left" />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/b4_aciv_door_right"
+            android:layout_width="@dimen/dp_165"
+            android:layout_height="@dimen/dp_311"
+            android:layout_marginStart="-157dp"
+            android:layout_marginBottom="-15dp"
+            android:src="@drawable/b4_arrive_door_right"
+            app:layout_constraintBottom_toBottomOf="@+id/b4_aciv_doorway"
+            app:layout_constraintStart_toEndOf="@+id/b4_aciv_doorway" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/b4_aciv_arrow_right"
+            android:layout_width="@dimen/dp_135"
+            android:layout_height="@dimen/dp_84"
+            android:layout_marginBottom="@dimen/dp_20"
+            android:src="@drawable/b4_arrive_door_right_arrow"
+            app:layout_constraintBottom_toBottomOf="@+id/b4_aciv_door_right"
+            app:layout_constraintStart_toEndOf="@+id/b4_aciv_door_right"
+            app:layout_constraintTop_toTopOf="@+id/b4_aciv_door_right" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_station_des"
+            app:layout_constraintTop_toBottomOf="@+id/b4_aciv_doorway"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_78"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:src="@drawable/b4_station_start"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/actv_station_des"
+            android:layout_marginTop="@dimen/dp_70"
+            android:layout_width="@dimen/dp_736"
+            android:layout_height="@dimen/dp_526"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/shuttle/passenger_weaknet/src/main/res/b4/layout/shuttle_p_b4_fragment.xml

@@ -5,6 +5,14 @@
     android:layout_height="match_parent"
     android:background="@drawable/b4_big_bg">
 
+    <FrameLayout
+        android:id="@+id/b4_driving_fragment_630"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_630"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <!-- 高精地图-->
     <FrameLayout
         android:id="@+id/b4_hd_map_fragment"
@@ -12,7 +20,7 @@
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/b4_driving_fragment" />
+        app:layout_constraintTop_toBottomOf="@+id/b4_driving_fragment_630" />
 
     <com.mogo.och.common.module.wigets.LoadingMapStatusView
         android:layout_width="wrap_content"
@@ -26,42 +34,37 @@
     <FrameLayout
         android:id="@+id/b4_driving_fragment"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_630"
+        android:layout_height="match_parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/b4_driving_fragment1"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_630"
-        android:background="#FF000000"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--        android:id="@+id/b4_driving_fragment1"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="@dimen/dp_630"-->
+<!--        android:background="#FF000000"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent">-->
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/b4_temp" />
-
-        <TextClock
-            android:id="@+id/b4TextClockDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_53"
-            android:layout_marginEnd="@dimen/dp_30"
-            android:background="@drawable/b4_clock_bg"
-            android:format12Hour="HH:mm"
-            android:format24Hour="HH:mm"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:textColor="@color/common_FFFFFF"
-            android:textSize="@dimen/dp_36"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+<!--        <TextClock-->
+<!--            android:id="@+id/b4TextClockDate"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/dp_53"-->
+<!--            android:layout_marginEnd="@dimen/dp_30"-->
+<!--            android:background="@drawable/b4_clock_bg"-->
+<!--            android:format12Hour="HH:mm"-->
+<!--            android:format24Hour="HH:mm"-->
+<!--            android:gravity="center"-->
+<!--            android:includeFontPadding="false"-->
+<!--            android:textColor="@color/common_FFFFFF"-->
+<!--            android:textSize="@dimen/dp_36"-->
+<!--            android:textStyle="bold"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintTop_toTopOf="parent" />-->
+<!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
     <TextView
         android:id="@+id/b4_tv_shuttle_b2_p_version"
         android:layout_width="wrap_content"

OCH/shuttle/passenger_weaknet/src/main/res/b4/values/colors.xml

@@ -12,4 +12,8 @@
     <color name="b4_1F82FB">#1F82FB</color>
     <color name="b4_394047">#394047</color>
     <color name="b4_BBC9D4">#BBC9D4</color>
+    <color name="b4_00E200">#00E200</color>
+    <color name="b4_555555">#555555</color>
+    <color name="b4_333333">#333333</color>
+    <color name="b4_7C7C7C">#7C7C7C</color>
 </resources>

core/mogo-core-res/src/main/res/values/dimens.xml

@@ -30,6 +30,7 @@
     <dimen name="dp_4">4dp</dimen>
     <dimen name="dp_4_5">4.5dp</dimen>
     <dimen name="dp_5">5dp</dimen>
+    <dimen name="dp_5_5">5.5dp</dimen>
     <dimen name="dp_6">6dp</dimen>
     <dimen name="dp_7">7dp</dimen>
     <dimen name="dp_7_5">7.5dp</dimen>
@@ -1042,6 +1043,7 @@
     <dimen name="dp_1051">1051dp</dimen>
     <dimen name="dp_1055">1055dp</dimen>
     <dimen name="dp_1058">1058dp</dimen>
+    <dimen name="dp_1080">1080dp</dimen>
     <dimen name="dp_1090">1090dp</dimen>
     <dimen name="dp_1092">1092dp</dimen>
     <dimen name="dp_1100">1100dp</dimen>