[m1]

[1.1.2]
[m1 页面]

OCH/mogo-och-charter-passenger/README.md

@@ -4,12 +4,7 @@
 
 
 src
-    - androidTest Android 测试代码
-    - basecommon  金旅开沃、接驳车 公用代码部分
-    - jinlvvan    金旅开沃 独立代码部分  
+    - androidTest Android 测试代码 
     - m1          金旅m1  独立代码部分
-    - m2          金旅m2  独立代码部分
     - main        所有车型公用代码部分
-    - shuttle     接驳车独立代码       因为接驳车和金旅开沃代码耦合厉害暂时放入到mogo-och-bus-passenger里面
-                                     后期会创建独立module和mogo-och-bus-passenger平级
     - test        普通代码测试

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

@@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.step
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.bus.passenger.constant.BusPassengerConst
-import com.mogo.och.bus.passenger.ui.MainPassengerFragment
+import com.mogo.och.bus.passenger.ui.MainFragment
 
 /**
  * 网约车-Bus-乘客端
@@ -20,7 +20,7 @@ import com.mogo.och.bus.passenger.ui.MainPassengerFragment
 class MogoOCHBusPassenger : IMogoOCH {
     private var mActivity: FragmentActivity? = null
     private var mContainerId = 0
-    private var mPassengerFragment: MainPassengerFragment? = null
+    private var mPassengerFragment: MainFragment? = null
     override fun createCoverage(activity: FragmentActivity, containerId: Int) {}
     override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
         mActivity = activity
@@ -53,7 +53,7 @@ class MogoOCHBusPassenger : IMogoOCH {
     private fun showFragment() {
         if (mPassengerFragment == null) {
             d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
-            mPassengerFragment = MainPassengerFragment()
+            mPassengerFragment = MainFragment()
             mActivity!!.supportFragmentManager.beginTransaction()
                 .add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss()
             return

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

@@ -8,12 +8,12 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback
 import com.mogo.och.bus.passenger.model.BusPassengerModel
-import com.mogo.och.bus.passenger.ui.BusPassengerFunctionDeviceFragment
+import com.mogo.och.bus.passenger.ui.M1DeviceFragment
 import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager
 import io.reactivex.disposables.Disposable
 
-class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragment?) :
-    BusBasePassengerFunctionDevicePresenter<BusPassengerFunctionDeviceFragment?>(view),
+class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) :
+    BusBasePassengerFunctionDevicePresenter<M1DeviceFragment?>(view),
     OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback {
 
     private var subscribe: Disposable? = null

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

@@ -0,0 +1,6 @@
+package com.mogo.och.bus.passenger.presenter
+
+import com.mogo.och.bus.passenger.ui.M1OrderFragment
+
+class BusPassengerFunctionOrderPresenter(view: M1OrderFragment?) :
+    BusBasePassengerFunctionDevicePresenter<M1OrderFragment?>(view)

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

@@ -2,12 +2,12 @@ package com.mogo.och.bus.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.bus.passenger.ui.BusPassengerFunctionFragment
+import com.mogo.och.bus.passenger.ui.M1ContainFragment
 import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager
 import com.mogo.och.common.module.voice.VoiceNotice
 
-class BusPassengerFunctionPresenter(view: BusPassengerFunctionFragment?) :
-    BusBasePassengerFunctionDevicePresenter<BusPassengerFunctionFragment?>(view),
+class BusPassengerFunctionPresenter(view: M1ContainFragment?) :
+    BusBasePassengerFunctionDevicePresenter<M1ContainFragment?>(view),
     OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback {
     companion object{
         private const val TAG = "BusPassengerFunctionPresenter"

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

@@ -6,12 +6,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.ui.BusPassengerFunctionSoftFragment
+import com.mogo.och.bus.passenger.ui.M1SoftFragment
 import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager
 import io.reactivex.disposables.Disposable
 
-class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) :
-    BusBasePassengerFunctionDevicePresenter<BusPassengerFunctionSoftFragment?>(view),
+class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) :
+    BusBasePassengerFunctionDevicePresenter<M1SoftFragment?>(view),
     OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback {
     companion object {
         private const val TAG = "BusPassengerFunctionSoftPresenter"

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

@@ -1,7 +1,6 @@
 package com.mogo.och.bus.passenger.presenter
 
-import com.mogo.commons.mvp.Presenter
-import com.mogo.och.bus.passenger.ui.BusPassengerFunctionVideoFragment
+import com.mogo.och.bus.passenger.ui.M1VideoFragment
 
-class BusPassengerFunctionVideoPresenter(view: BusPassengerFunctionVideoFragment?) :
-    BusBasePassengerFunctionDevicePresenter<BusPassengerFunctionVideoFragment?>(view)
+class BusPassengerFunctionVideoPresenter(view: M1VideoFragment?) :
+    BusBasePassengerFunctionDevicePresenter<M1VideoFragment?>(view)

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

@@ -7,13 +7,13 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback
 import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback
 import com.mogo.och.bus.passenger.model.BusPassengerModel
-import com.mogo.och.bus.passenger.ui.MainPassengerFragment
+import com.mogo.och.bus.passenger.ui.MainFragment
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
 import java.util.*
 
-class BusPassengerPresenter(view: MainPassengerFragment?) :
-    BusBasePassengerFunctionDevicePresenter<MainPassengerFragment?>(view),
+class BusPassengerPresenter(view: MainFragment?) :
+    BusBasePassengerFunctionDevicePresenter<MainFragment?>(view),
     IBusPassengerControllerStatusCallback, IBusPassengerAutopilotPlanningCallback {
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)

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

@@ -16,18 +16,17 @@ import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter
-import kotlinx.android.synthetic.m1.bus_p_function_fragment.*
-
+import kotlinx.android.synthetic.m1.m1_contain_fragment.*
 
 /**
  * @author: yangyakun
  * @date: 2023/1/28
  */
-class BusPassengerFunctionFragment :
-    MvpDialogFragment<BusPassengerFunctionFragment?, BusPassengerFunctionPresenter?>() {
+class M1ContainFragment :
+    MvpDialogFragment<M1ContainFragment?, BusPassengerFunctionPresenter?>() {
 
     var tab: String = VIDEOTAB
-    var fragmentTag: String = BusPassengerFunctionVideoFragment.TAG
+    var fragmentTag: String = M1VideoFragment.TAG
     var fragment: Fragment? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -45,18 +44,23 @@ class BusPassengerFunctionFragment :
         when (tab) {
             VIDEOTAB -> {
                 fragment =
-                    childFragmentManager.findFragmentByTag(BusPassengerFunctionVideoFragment.TAG)
-                        ?: BusPassengerFunctionVideoFragment.newInstance()
+                    childFragmentManager.findFragmentByTag(M1VideoFragment.TAG)
+                        ?: M1VideoFragment.newInstance()
             }
             SETTINGDEVICETAB -> {
                 fragment =
-                    childFragmentManager.findFragmentByTag(BusPassengerFunctionDeviceFragment.TAG)
-                        ?: BusPassengerFunctionDeviceFragment.newInstance()
+                    childFragmentManager.findFragmentByTag(M1DeviceFragment.TAG)
+                        ?: M1DeviceFragment.newInstance()
             }
             SETTINGSOFTTAB -> {
                 fragment =
-                    childFragmentManager.findFragmentByTag(BusPassengerFunctionSoftFragment.TAG)
-                        ?: BusPassengerFunctionSoftFragment.newInstance()
+                    childFragmentManager.findFragmentByTag(M1SoftFragment.TAG)
+                        ?: M1SoftFragment.newInstance()
+            }
+            SETTINGORDERTAB -> {
+                fragment =
+                    childFragmentManager.findFragmentByTag(M1OrderFragment.TAG)
+                        ?: M1OrderFragment.newInstance()
             }
             else -> {}
         }
@@ -70,7 +74,7 @@ class BusPassengerFunctionFragment :
         }
     }
 
-    override fun getLayoutId(): Int = R.layout.bus_p_function_fragment
+    override fun getLayoutId(): Int = R.layout.m1_contain_fragment
 
     override fun getTagName(): String = TAG
 
@@ -96,12 +100,16 @@ class BusPassengerFunctionFragment :
         CallerLogger.d(M_BUS_P+TAG, "videoListener$isChecked")
         if (isChecked) {
             tab = VIDEOTAB
-            fragmentTag = BusPassengerFunctionVideoFragment.TAG
+            fragmentTag = M1VideoFragment.TAG
             cb_bp_setting_soft.isChecked = false
             cb_bp_setting_device.isChecked = false
+            cb_bp_setting_order.isChecked = false
             initFragment()
         }else{
-            if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){
+            if(!cb_bp_video_player.isChecked&&
+                !cb_bp_setting_soft.isChecked&&
+                !cb_bp_setting_device.isChecked&&
+                !cb_bp_setting_order.isChecked){
                 dismiss()
             }
         }
@@ -111,12 +119,16 @@ class BusPassengerFunctionFragment :
         CallerLogger.d(M_BUS_P+TAG, "settingDevices$isChecked")
         if (isChecked) {
             tab = SETTINGDEVICETAB
-            fragmentTag = BusPassengerFunctionDeviceFragment.TAG
+            fragmentTag = M1DeviceFragment.TAG
             cb_bp_setting_soft.isChecked = false
             cb_bp_video_player.isChecked = false
+            cb_bp_setting_order.isChecked = false
             initFragment()
         }else{
-            if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){
+            if(!cb_bp_video_player.isChecked&&
+                !cb_bp_setting_soft.isChecked&&
+                !cb_bp_setting_device.isChecked&&
+                !cb_bp_setting_order.isChecked){
                 dismiss()
             }
         }
@@ -126,12 +138,34 @@ class BusPassengerFunctionFragment :
         CallerLogger.d(M_BUS_P+TAG, "settingSoft$isChecked")
         if (isChecked) {
             tab = SETTINGSOFTTAB
-            fragmentTag = BusPassengerFunctionSoftFragment.TAG
+            fragmentTag = M1SoftFragment.TAG
             cb_bp_video_player.isChecked = false
             cb_bp_setting_device.isChecked = false
+            cb_bp_setting_order.isChecked = false
             initFragment()
         }else{
-            if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){
+            if(!cb_bp_video_player.isChecked&&
+                !cb_bp_setting_soft.isChecked&&
+                !cb_bp_setting_device.isChecked&&
+                !cb_bp_setting_order.isChecked){
+                dismiss()
+            }
+        }
+    }
+    private val settingOrder = CompoundButton.OnCheckedChangeListener { _, isChecked ->
+        CallerLogger.d(M_BUS_P+TAG, "settingOrder$isChecked")
+        if (isChecked) {
+            tab = SETTINGORDERTAB
+            fragmentTag = M1OrderFragment.TAG
+            cb_bp_video_player.isChecked = false
+            cb_bp_setting_device.isChecked = false
+            cb_bp_setting_soft.isChecked = false
+            initFragment()
+        }else{
+            if(!cb_bp_video_player.isChecked&&
+                !cb_bp_setting_soft.isChecked&&
+                !cb_bp_setting_device.isChecked&&
+                !cb_bp_setting_order.isChecked){
                 dismiss()
             }
         }
@@ -185,16 +219,21 @@ class BusPassengerFunctionFragment :
         cb_bp_video_player.setOnCheckedChangeListener(null)
         cb_bp_setting_soft.setOnCheckedChangeListener(null)
         cb_bp_setting_device.setOnCheckedChangeListener(null)
+        cb_bp_setting_order.setOnCheckedChangeListener(null)
         cb_bp_video_player.isChecked = false
         cb_bp_setting_soft.isChecked = false
         cb_bp_setting_device.isChecked = false
+        cb_bp_setting_order.isChecked = false
         cb_bp_video_player.setOnCheckedChangeListener(videoListener)
         cb_bp_setting_soft.setOnCheckedChangeListener(settingSoft)
         cb_bp_setting_device.setOnCheckedChangeListener(settingDevices)
+        cb_bp_setting_order.setOnCheckedChangeListener(settingOrder)
+
         when (tab) {
             VIDEOTAB -> cb_bp_video_player.isChecked = true
             SETTINGDEVICETAB -> cb_bp_setting_device.isChecked = true
             SETTINGSOFTTAB -> cb_bp_setting_soft.isChecked = true
+            SETTINGORDERTAB -> cb_bp_setting_order.isChecked = true
             else -> {}
         }
         super.onViewStateRestored(savedInstanceState)
@@ -204,15 +243,16 @@ class BusPassengerFunctionFragment :
         const val TAG = "BusPassengerFunctionFragment"
 
         const val VIDEOTAB = "VideoTab"
-        const val SETTINGDEVICETAB = "SettingDeviceTab"
         const val SETTINGSOFTTAB = "SettingSoftTab"
+        const val SETTINGDEVICETAB = "SettingDeviceTab"
+        const val SETTINGORDERTAB = "SettingOrderTab"
 
         const val SELECTTAB = "SELECTTAB"
 
         @JvmStatic
-        fun newInstance(): BusPassengerFunctionFragment {
+        fun newInstance(): M1ContainFragment {
             val args = Bundle()
-            val fragment = BusPassengerFunctionFragment()
+            val fragment = M1ContainFragment()
             fragment.arguments = args
             return fragment
         }

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

@@ -6,16 +6,16 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter
 import com.mogo.och.common.module.utils.SoundPoolHelper
-import kotlinx.android.synthetic.m1.bus_p_function_setting_devices_fragment.*
+import kotlinx.android.synthetic.m1.m1_devices_fragment.*
 
 /**
  * @author: yangyakun
  * @date: 2023/1/28
  */
-class BusPassengerFunctionDeviceFragment :
-    MvpFragment<BusPassengerFunctionDeviceFragment?, BusPassengerFunctionDevicePresenter?>() {
+class M1DeviceFragment :
+    MvpFragment<M1DeviceFragment?, BusPassengerFunctionDevicePresenter?>() {
 
-    override fun getLayoutId(): Int = R.layout.bus_p_function_setting_devices_fragment
+    override fun getLayoutId(): Int = R.layout.m1_devices_fragment
 
     override fun getTagName(): String = TAG
 
@@ -53,9 +53,9 @@ class BusPassengerFunctionDeviceFragment :
     companion object {
         const val TAG = "BusPassengerFunctionDeviceFragment"
         @JvmStatic
-        fun newInstance(): BusPassengerFunctionDeviceFragment {
+        fun newInstance(): M1DeviceFragment {
             val args = Bundle()
-            val fragment = BusPassengerFunctionDeviceFragment()
+            val fragment = M1DeviceFragment()
             fragment.arguments = args
             return fragment
         }

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

@@ -0,0 +1,45 @@
+package com.mogo.och.bus.passenger.ui
+
+import android.os.Bundle
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay
+import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter
+
+/**
+ * @author: yangyakun
+ * @date: 2023/1/28
+ */
+class M1OrderFragment :
+    MvpFragment<M1OrderFragment?, BusPassengerFunctionOrderPresenter?>() {
+
+    private val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
+
+    override fun getLayoutId(): Int {
+        return R.layout.m1_order_fragment
+    }
+
+    override fun getTagName(): String {
+        return TAG
+    }
+
+    override fun initViews() {
+
+    }
+
+    override fun createPresenter(): BusPassengerFunctionOrderPresenter {
+        return BusPassengerFunctionOrderPresenter(this)
+    }
+
+
+    companion object {
+        const val TAG = "BusPassengerFunctionOrderFragment"
+        @JvmStatic
+        fun newInstance(): M1OrderFragment {
+            val args = Bundle()
+            val fragment = M1OrderFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}

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

@@ -10,8 +10,6 @@ import android.media.AudioManager
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
 import android.view.animation.LinearInterpolator
 import android.widget.RadioButton
 import android.widget.SeekBar
@@ -38,7 +36,7 @@ import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.m1.bus_p_function_setting_soft_fragment.*
+import kotlinx.android.synthetic.m1.m1_soft_fragment.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 import java.util.concurrent.TimeUnit
 
@@ -47,10 +45,10 @@ import java.util.concurrent.TimeUnit
  * @author: yangyakun
  * @date: 2023/1/28
  */
-class BusPassengerFunctionSoftFragment :
-    MvpFragment<BusPassengerFunctionSoftFragment?, BusPassengerFunctionSoftPresenter?>() {
+class M1SoftFragment :
+    MvpFragment<M1SoftFragment?, BusPassengerFunctionSoftPresenter?>() {
 
-    override fun getLayoutId(): Int = R.layout.bus_p_function_setting_soft_fragment
+    override fun getLayoutId(): Int = R.layout.m1_soft_fragment
 
     override fun getTagName(): String = TAG
 
@@ -672,9 +670,9 @@ class BusPassengerFunctionSoftFragment :
         const val touchTag = 2
 
         @JvmStatic
-        fun newInstance(): BusPassengerFunctionSoftFragment {
+        fun newInstance(): M1SoftFragment {
             val args = Bundle()
-            val fragment = BusPassengerFunctionSoftFragment()
+            val fragment = M1SoftFragment()
             fragment.arguments = args
             return fragment
         }

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

@@ -13,20 +13,20 @@ import com.mogo.och.bus.passenger.ui.layoutmanage.CarouselZoomPostLayoutListener
 import com.mogo.och.bus.passenger.ui.layoutmanage.CenterScrollListener
 import com.mogo.och.bus.passenger.view.ConsultVideoPlayer
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
-import kotlinx.android.synthetic.m1.bus_p_function_video_fragment.*
+import kotlinx.android.synthetic.m1.m1_video_fragment.*
 import kotlin.math.floor
 
 /**
  * @author: yangyakun
  * @date: 2023/1/28
  */
-class BusPassengerFunctionVideoFragment :
-    MvpFragment<BusPassengerFunctionVideoFragment?, BusPassengerFunctionVideoPresenter?>() {
+class M1VideoFragment :
+    MvpFragment<M1VideoFragment?, BusPassengerFunctionVideoPresenter?>() {
 
     private val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
 
     override fun getLayoutId(): Int {
-        return R.layout.bus_p_function_video_fragment
+        return R.layout.m1_video_fragment
     }
 
     override fun getTagName(): String {
@@ -145,9 +145,9 @@ class BusPassengerFunctionVideoFragment :
     companion object {
         const val TAG = "BusPassengerFunctionVideoFragment"
         @JvmStatic
-        fun newInstance(): BusPassengerFunctionVideoFragment {
+        fun newInstance(): M1VideoFragment {
             val args = Bundle()
-            val fragment = BusPassengerFunctionVideoFragment()
+            val fragment = M1VideoFragment()
             fragment.arguments = args
             return fragment
         }

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

@@ -14,20 +14,20 @@ import com.mogo.eagle.core.utilcode.util.AppStateManager
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
-import kotlinx.android.synthetic.m1.bus_p_fragment.*
+import kotlinx.android.synthetic.m1.m1_main_fragment.*
 import java.lang.ref.WeakReference
 
 /**
  * @author: wangmingjun
  * @date: 2022/4/12
  */
-class MainPassengerFragment :
-    MvpFragment<MainPassengerFragment?, BusPassengerPresenter?>() {
+class MainFragment :
+    MvpFragment<MainFragment?, BusPassengerPresenter?>() {
 
-    private var bpFunctionGroupDialogFragment: WeakReference<BusPassengerFunctionFragment>? = null
+    private var bpFunctionGroupDialogFragment: WeakReference<M1ContainFragment>? = null
 
     override fun getLayoutId(): Int {
-        return R.layout.bus_p_fragment
+        return R.layout.m1_main_fragment
     }
 
     override fun getTagName(): String {
@@ -36,13 +36,16 @@ class MainPassengerFragment :
 
     override fun initViews() {
         cb_bp_video_player.onClick {
-            openSettingPage(BusPassengerFunctionFragment.VIDEOTAB)
+            openSettingPage(M1ContainFragment.VIDEOTAB)
         }
         cb_bp_setting_soft.onClick {
-            openSettingPage(BusPassengerFunctionFragment.SETTINGSOFTTAB)
+            openSettingPage(M1ContainFragment.SETTINGSOFTTAB)
         }
         cb_bp_setting_device.onClick {
-            openSettingPage(BusPassengerFunctionFragment.SETTINGDEVICETAB)
+            openSettingPage(M1ContainFragment.SETTINGDEVICETAB)
+        }
+        cb_bp_setting_order.onClick {
+            openSettingPage(M1ContainFragment.SETTINGORDERTAB)
         }
         v_debug.setOnLongClickListener {
             ToggleDebugView.toggleDebugView.toggle(requireContext())
@@ -68,7 +71,7 @@ class MainPassengerFragment :
     }
 
     private fun openSettingPage(tab: String) {
-        val fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(BusPassengerFunctionFragment.TAG)
+        val fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(M1ContainFragment.TAG)
         if (fragmentByTag is DialogFragment) {
             if (fragmentByTag.dialog != null && fragmentByTag.dialog!!.isShowing) {
                 CallerLogger.d(SceneConstant.M_BUS_P + TAG, "正在展示")
@@ -83,10 +86,10 @@ class MainPassengerFragment :
         }
 
         if (bpFunctionGroupDialogFragment?.get() == null) {
-            bpFunctionGroupDialogFragment = WeakReference(BusPassengerFunctionFragment.newInstance())
+            bpFunctionGroupDialogFragment = WeakReference(M1ContainFragment.newInstance())
         }
         val bpFunctionGroup = bpFunctionGroupDialogFragment?.get()
-        bpFunctionGroup?.arguments?.putString(BusPassengerFunctionFragment.SELECTTAB, tab)
+        bpFunctionGroup?.arguments?.putString(M1ContainFragment.SELECTTAB, tab)
         if (bpFunctionGroup != null) {
             if (bpFunctionGroup.dialog != null && bpFunctionGroup.dialog!!.isShowing) {
                 return

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java

@@ -51,7 +51,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
     @NonNull
     @Override
     public RecyclerItemVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(context).inflate(R.layout.list_video_item_normal, parent, false);
+        View v = LayoutInflater.from(context).inflate(R.layout.m1_video_item, parent, false);
         RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
         recyclerItemVideoHolder.setIsRecyclable(false);
         return recyclerItemVideoHolder;

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java

@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.bean.Temperature;
-import com.mogo.och.bus.passenger.view.PickerLayoutManager;
 
 import java.util.List;
 
@@ -38,7 +37,7 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
     public TextVH onCreateViewHolder(ViewGroup parent, int viewType) {
         View view;
         LayoutInflater inflater = LayoutInflater.from(context);
-        view = inflater.inflate(R.layout.bus_p_temperature_item, parent, false);
+        view = inflater.inflate(R.layout.m1_soft_temperature_item, parent, false);
         return new TextVH(view);
     }
 

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt

@@ -0,0 +1,18 @@
+package com.mogo.och.bus.passenger.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
+import com.mogo.och.bus.passenger.R
+
+class EndOrderView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+    init {
+        LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true)
+    }
+}

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt

@@ -0,0 +1,18 @@
+package com.mogo.och.bus.passenger.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
+import com.mogo.och.bus.passenger.R
+
+class LineSiteView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+    init {
+        LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true)
+    }
+}

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt

@@ -22,7 +22,6 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.utils.FullVideoUtils
-import com.mogo.och.bus.passenger.utils.ZoomDrawable
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
@@ -115,7 +114,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun getLayoutId(): Int {
-        return R.layout.taxi_p_video_show
+        return R.layout.m1_video_view
     }
 
     override fun updateStartImage() {

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt

@@ -6,7 +6,7 @@ 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.och.bus.passenger.R
-import kotlinx.android.synthetic.m1.bus_p_m1_view_blue_tooth.view.*
+import kotlinx.android.synthetic.m1.m1_statusview_blue_tooth.view.*
 
 /**
  * 魔戒蓝牙控件
@@ -20,7 +20,7 @@ class M1BlueToothView @JvmOverloads constructor(
 ) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.bus_p_m1_view_blue_tooth, this, true)
+        LayoutInflater.from(context).inflate(R.layout.m1_statusview_blue_tooth, this, true)
     }
 
     override fun mofangStatus(status: Boolean) {

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt

@@ -2,7 +2,6 @@ package com.mogo.och.bus.passenger.view.statusbar
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -20,7 +19,7 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m1.bus_p_m1_view_status_bar.view.*
+import kotlinx.android.synthetic.m1.m1_statusview_datetime.view.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 import kotlin.math.roundToInt
 
@@ -35,7 +34,7 @@ class StatusBarView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.bus_p_m1_view_status_bar, this, true)
+        LayoutInflater.from(context).inflate(R.layout.m1_statusview_datetime, this, true)
         setBackgroundColor(ContextCompat.getColor(context,R.color.bus_p_m1_80ffffff))
     }
 

OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_order_bg_selector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bus_p_function_order_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/bus_p_function_order_normal" android:state_checked="false"/>
+    <item android:drawable="@drawable/bus_p_function_order_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bus_p_function_order_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/bus_p_function_order_normal"/>
+</selector>

OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/m1_order_closedoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/m1_order_closedoor_press" android:state_pressed="false"/>
+    <item android:drawable="@drawable/m1_order_closedoor_normal"/>
+</selector>

OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/m1_order_opendoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/m1_order_opendoor_press" android:state_pressed="false"/>
+    <item android:drawable="@drawable/m1_order_opendoor_normal"/>
+</selector>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml

@@ -38,11 +38,21 @@
         android:id="@+id/cb_bp_setting_device"
         android:background="@drawable/bus_p_function_bottom_device_bg_selector"
         android:button="@null"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/cb_bp_setting_order"
         app:layout_constraintStart_toEndOf="@+id/cb_bp_setting_soft"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="@dimen/dp_181"
         android:layout_height="@dimen/dp_179"/>
 
+    <CheckBox
+        android:id="@+id/cb_bp_setting_order"
+        android:background="@drawable/bus_p_function_bottom_order_bg_selector"
+        android:button="@null"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/cb_bp_setting_device"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="@dimen/dp_162"
+        android:layout_height="@dimen/dp_179"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml

@@ -192,11 +192,29 @@
     <ImageView
         android:id="@+id/cb_bp_setting_device"
         android:src="@drawable/bus_p_function_bottom_device_bg_selector"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/cb_bp_setting_order"
         app:layout_constraintStart_toEndOf="@+id/cb_bp_setting_soft"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="@dimen/dp_181"
         android:layout_height="@dimen/dp_179"/>
+    <ImageView
+        android:id="@+id/cb_bp_setting_order"
+        android:src="@drawable/bus_p_function_bottom_order_bg_selector"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/cb_bp_setting_device"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="@dimen/dp_162"
+        android:layout_height="@dimen/dp_179"/>
+
+    <ImageView
+        android:src="@drawable/m1_order_end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="@dimen/dp_29"
+        android:layout_marginBottom="@dimen/dp_34"
+        android:layout_width="@dimen/dp_95"
+        android:layout_height="@dimen/dp_95"/>
+
 
     <!--消息盒子选择入口-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_early_end.xml

@@ -0,0 +1,72 @@
+<?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:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_early_end"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/m1_order_early_end"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/dp_83"
+        android:layout_width="@dimen/dp_252"
+        android:layout_height="@dimen/dp_172"/>
+
+    <TextView
+        android:text="未到包车时间，提前结束不退款\n请确认是否结束？"
+        android:textSize="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_52"
+        android:gravity="center"
+        android:textColor="@color/bus_p_m1_4a5375"
+        app:layout_constraintTop_toBottomOf="@+id/iv_early_end"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/m1_site_cancle_submit_bg"
+        android:layout_width="@dimen/dp_375"
+        android:layout_height="@dimen/dp_60"/>
+
+    <TextView
+        android:id="@+id/tv_site_cancle"
+        android:text="取消"
+        android:textSize="@dimen/dp_20"
+        app:layout_constraintStart_toStartOf="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintEnd_toStartOf="@+id/gl_site_cancle_submit_guide"
+        android:textColor="@color/bus_p_m1_3b4056"
+        android:gravity="center"
+        android:layout_width="0dp"
+        android:layout_height="0dp"/>
+    <TextView
+        android:id="@+id/tv_site_submit"
+        android:text="确认"
+        android:textSize="@dimen/dp_20"
+        android:gravity="center"
+        app:layout_constraintStart_toEndOf="@+id/gl_site_cancle_submit_guide"
+        app:layout_constraintEnd_toEndOf="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_site_cancle_submit_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_site_cancle_submit_bg"
+        android:textColor="@color/bus_p_m1_3b4056"
+        android:layout_width="0dp"
+        android:layout_height="0dp"/>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_site_cancle_submit_guide"
+        app:layout_constraintGuide_percent="0.5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml

@@ -0,0 +1,85 @@
+<?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:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_early_end"
+        android:layout_width="@dimen/dp_252"
+        android:layout_height="@dimen/dp_172"
+        android:layout_marginTop="@dimen/dp_63"
+        android:layout_marginStart="@dimen/dp_56"
+        android:src="@drawable/m1_order_early_end"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_end_title"
+        android:text="本次包车旅程已结束。"
+        android:textSize="@dimen/dp_44"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:textColor="@color/bus_p_m1_23293b"
+        app:layout_constraintStart_toEndOf="@+id/iv_early_end"
+        app:layout_constraintTop_toTopOf="@+id/iv_early_end"
+        app:layout_constraintBottom_toTopOf="@+id/tv_next_cloud"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_cloud"
+        android:text="蘑菇车联祝您旅途愉快，欢迎下次乘坐！"
+        android:textSize="@dimen/dp_31"
+        android:textColor="@color/bus_p_m1_485173"
+        app:layout_constraintStart_toEndOf="@+id/iv_early_end"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_early_end"
+        app:layout_constraintTop_toBottomOf="@+id/tv_end_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/iv_end_order_opendoor"
+        android:layout_width="@dimen/dp_108"
+        android:layout_height="@dimen/dp_108"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/m1_order_end_opendoor_selecotr"
+        android:layout_marginBottom="@dimen/dp_100"
+        app:layout_constraintEnd_toStartOf="@+id/iv_end_order_closedoor"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_end_order_closedoor"
+        android:layout_width="@dimen/dp_108"
+        android:layout_height="@dimen/dp_108"
+        android:layout_marginBottom="@dimen/dp_100"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/m1_order_end_closedoor_selecotr"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/iv_end_order_opendoor" />
+
+    <TextView
+        android:text="开车门"
+        android:textSize="@dimen/dp_28"
+        android:textColor="@color/bus_p_m1_23293b"
+        app:layout_constraintStart_toStartOf="@+id/iv_end_order_opendoor"
+        app:layout_constraintEnd_toEndOf="@+id/iv_end_order_opendoor"
+        app:layout_constraintTop_toBottomOf="@+id/iv_end_order_opendoor"
+        android:layout_marginTop="@dimen/dp_19"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:text="关车门"
+        android:textSize="@dimen/dp_28"
+        android:textColor="@color/bus_p_m1_23293b"
+        app:layout_constraintStart_toStartOf="@+id/iv_end_order_closedoor"
+        app:layout_constraintEnd_toEndOf="@+id/iv_end_order_closedoor"
+        app:layout_constraintTop_toBottomOf="@+id/iv_end_order_closedoor"
+        android:layout_marginTop="@dimen/dp_19"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml

@@ -0,0 +1,28 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:clickable="true"
+        android:background="@drawable/bus_p_function_setting_soft_b_shape"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1031:500"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.53698">
+
+        <com.mogo.och.bus.passenger.ui.view.LineSiteView
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <include
+            layout="@layout/m1_order_early_end"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml

@@ -0,0 +1,192 @@
+<?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:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_line_list"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintEnd_toStartOf="@+id/cl_side_list"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.35887">
+
+        <TextView
+            android:id="@+id/tv_line_title"
+            android:text="浏览线路"
+            android:textSize="@dimen/dp_26"
+            android:textColor="@color/bus_p_m1_0f1e57"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginTop="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_31"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/tv_switch_line"
+            android:text="切换"
+            android:textSize="@dimen/dp_22"
+            android:textColor="@color/bus_p_m1_225eff"
+            app:layout_constraintTop_toTopOf="@+id/tv_line_title"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_line_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="31dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:src="@drawable/m1_order_switch_line_enable"
+            android:id="@+id/iv_switch_line_left"
+            app:layout_constraintTop_toTopOf="@+id/tv_switch_line"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_switch_line"
+            app:layout_constraintEnd_toStartOf="@+id/tv_switch_line"
+            android:layout_marginEnd="@dimen/dp_6"
+            android:layout_width="@dimen/dp_14"
+            android:layout_height="@dimen/dp_16"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            app:layout_constraintTop_toBottomOf="@+id/tv_line_title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="@dimen/dp_24"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"/>
+
+        <ImageView
+            android:id="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:src="@drawable/m1_line_cancle_submit_bg"
+            android:layout_width="@dimen/dp_275"
+            android:layout_height="@dimen/dp_60"/>
+
+        <TextView
+            android:id="@+id/tv_line_cancle"
+            android:text="取消"
+            android:textSize="@dimen/dp_20"
+            app:layout_constraintStart_toStartOf="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintTop_toTopOf="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintEnd_toStartOf="@+id/gl_line_cancle_submit_guide"
+            android:textColor="@color/bus_p_m1_3b4056"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="0dp"/>
+        <TextView
+            android:id="@+id/tv_line_submit"
+            android:text="确认"
+            android:textSize="@dimen/dp_20"
+            app:layout_constraintStart_toEndOf="@+id/gl_line_cancle_submit_guide"
+            app:layout_constraintEnd_toEndOf="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintTop_toTopOf="@+id/iv_line_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_line_cancle_submit_bg"
+            android:textColor="@color/bus_p_m1_3b4056"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="0dp"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/gl_line_cancle_submit_guide"
+            app:layout_constraintGuide_percent="0.5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_side_list"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/cl_line_list"
+        app:layout_constraintWidth_percent="0.64113">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_site_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <ImageView
+            android:id="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:src="@drawable/m1_site_cancle_submit_bg"
+            android:layout_width="@dimen/dp_375"
+            android:layout_height="@dimen/dp_60"/>
+
+        <TextView
+            android:id="@+id/tv_site_cancle"
+            android:text="取消"
+            android:textSize="@dimen/dp_20"
+            app:layout_constraintStart_toStartOf="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintTop_toTopOf="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintEnd_toStartOf="@+id/gl_site_cancle_submit_guide"
+            android:textColor="@color/bus_p_m1_3b4056"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="0dp"/>
+        <TextView
+            android:id="@+id/tv_site_submit"
+            android:text="确认"
+            android:textSize="@dimen/dp_20"
+            android:gravity="center"
+            app:layout_constraintStart_toEndOf="@+id/gl_site_cancle_submit_guide"
+            app:layout_constraintEnd_toEndOf="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintTop_toTopOf="@+id/iv_site_cancle_submit_bg"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_site_cancle_submit_bg"
+            android:textColor="@color/bus_p_m1_3b4056"
+            android:layout_width="0dp"
+            android:layout_height="0dp"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/gl_site_cancle_submit_guide"
+            app:layout_constraintGuide_percent="0.5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/g_side_cancle_submit_group"
+            android:visibility="gone"
+            app:constraint_referenced_ids="tv_site_submit,tv_site_cancle,iv_site_cancle_submit_bg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/iv_site_submit_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:src="@drawable/m1_site_submit_bg"
+            android:layout_width="@dimen/dp_258"
+            android:layout_height="@dimen/dp_60"/>
+        <TextView
+            android:id="@+id/tv_site_only_submit"
+            android:text="确认"
+            android:textSize="@dimen/dp_20"
+            android:gravity="center"
+            app:layout_constraintStart_toStartOf="@+id/iv_site_submit_bg"
+            app:layout_constraintEnd_toEndOf="@+id/iv_site_submit_bg"
+            app:layout_constraintTop_toTopOf="@+id/iv_site_submit_bg"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_site_submit_bg"
+            android:textColor="@color/bus_p_m1_3b4056"
+            android:layout_width="0dp"
+            android:layout_height="0dp"/>
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/g_side_submit_group"
+            app:constraint_referenced_ids="tv_site_only_submit,iv_site_submit_bg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <ImageView
+        android:src="@drawable/m1_order_noorder"
+        android:layout_width="@dimen/dp_274"
+        android:layout_height="@dimen/dp_219"/>
+    <TextView
+        android:text="当前暂无订单"
+        android:layout_marginTop="@dimen/dp_42"
+        android:textSize="@dimen/dp_30"
+        android:textColor="@color/bus_p_m1_4a5375"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml

@@ -0,0 +1,32 @@
+<?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:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_early_end"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/bus_p_loading"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/dp_83"
+        android:layout_width="@dimen/dp_252"
+        android:layout_height="@dimen/dp_172"/>
+
+    <TextView
+        android:text="等待司机确认信息，请稍候…"
+        android:textSize="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_65"
+        android:gravity="center"
+        android:textColor="@color/bus_p_m1_4a5375"
+        app:layout_constraintTop_toBottomOf="@+id/iv_early_end"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml

@@ -15,6 +15,12 @@
     <color name="bus_p_m1_a3bdf2">#A3BDF2</color>
     <color name="bus_p_m1_56c59c">#56C59C</color>
     <color name="bus_p_m1_56efa0">#56EFA0</color>
+    <color name="bus_p_m1_4a5375">#4A5375</color>
+    <color name="bus_p_m1_0f1e57">#0F1E57</color>
+    <color name="bus_p_m1_225eff">#225EFF</color>
+    <color name="bus_p_m1_3b4056">#3B4056</color>
+    <color name="bus_p_m1_23293b">#23293B</color>
+    <color name="bus_p_m1_485173">#485173</color>
 
     <color name="bus_p_m1_CCFFFFFF">#CCFFFFFF</color>
     <color name="bus_p_m1_80ffffff">#80FFFFFF</color>

app/build.gradle

@@ -225,6 +225,10 @@ android {
             dimension "project"
             buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\""
         }
+        yantai {
+            dimension "project"
+            buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\""
+        }
 
         dali {
             dimension "project"

app/productFlavors/flavorsFilterConfig.gradle

@@ -111,6 +111,52 @@ project.android.variantFilter { variant ->
         }
         // endregion
     }
+    else if(names.contains("yantai")){//
+        // region 过滤noop 的flavors 不带och业务的
+        if (names.contains("noop")) {
+            //Gradle会忽略满足上述条件的所有变体
+            setIgnore(true)
+        }
+        // endregion
+        // region 过滤sweper 的flavors
+        if (names.contains("sweeper") && !names.contains("fOchSweeper")) {
+            //Gradle会忽略满足上述条件的所有变体
+            setIgnore(true)
+        }
+        // endregion
+        // region 过滤shuttle 的flavors
+        if (names.contains("shuttle")) {
+            //Gradle会忽略满足上述条件的所有变体
+            if (names.contains("fOchBus")) {
+            } else if (names.contains("fOchBusPassenger")) {
+            } else {
+                setIgnore(true)
+            }
+        }
+        // endregion
+        // region 过滤taxi 的flavors
+        if (names.contains("taxi")) {
+            //Gradle会忽略满足上述条件的所有变体
+            setIgnore(true)
+        }
+        // endregion
+        // region 过滤bus 的flavors
+        if (names.contains("bus")) {
+            //Gradle会忽略满足上述条件的所有变体
+            setIgnore(true)
+        }
+        // endregion
+        // region 过滤charter 包车 的flavors
+        if (names.contains("charter")) {
+            //Gradle会忽略满足上述条件的所有变体
+            if (names.contains("ochDriverM1")) {
+            } else if (names.contains("ochPassengerM1")) {
+            } else {
+                setIgnore(true)
+            }
+        }
+        // endregion
+    }
     else {
         setIgnore(true)
     }

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -100,6 +100,11 @@ object ConfigStartUp {
             } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
                 //是否显示 限速UI
                 HmiBuildConfig.isShowLimitingVelocityView = false
+            } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) {
+                //是否显示 限速UI
+                HmiBuildConfig.isShowLimitingVelocityView = false
+                //白天模式
+                FunctionBuildConfig.skinMode = 1
             }
         }