diff --git a/OCH/mogo-och-bus-passenger/src/m2/AndroidManifest.xml b/OCH/mogo-och-bus-passenger/src/m2/AndroidManifest.xml new file mode 100644 index 0000000000..e0687231c1 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt similarity index 86% rename from OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt rename to OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt index 422f601d8b..90322cd39c 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt @@ -12,7 +12,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.BusPassengerRouteFragment +import com.mogo.och.bus.passenger.ui.BusPM2BaseFragment /** * 网约车-Bus-乘客端 @@ -23,7 +23,7 @@ import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { private var mActivity: FragmentActivity? = null private var mContainerId = 0 - private var mPassengerFragment: BusPassengerRouteFragment? = null + private var mPM2Fragment: BusPM2BaseFragment? = null override fun createCoverage(activity: FragmentActivity, containerId: Int) {} override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { mActivity = activity @@ -32,7 +32,7 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { } override val functionName: String - get() = "och-bus-passenger-m1" + get() = "och-bus-passenger-m2" override fun onDestroy() { // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 @@ -64,21 +64,21 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { } private fun showFragment() { - if (mPassengerFragment == null) { + if (mPM2Fragment == null) { d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======") - mPassengerFragment = BusPassengerRouteFragment() + mPM2Fragment = BusPM2BaseFragment() mActivity!!.supportFragmentManager.beginTransaction() - .add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss() + .add(mContainerId, mPM2Fragment!!).commitAllowingStateLoss() return } d(SceneConstant.M_TAXI_P + TAG, "准备show fragment") - mActivity!!.supportFragmentManager.beginTransaction().show(mPassengerFragment!!) + mActivity!!.supportFragmentManager.beginTransaction().show(mPM2Fragment!!) .commitAllowingStateLoss() } private fun hideFragment() { - if (mPassengerFragment != null) { - mActivity!!.supportFragmentManager.beginTransaction().hide(mPassengerFragment!!) + if (mPM2Fragment != null) { + mActivity!!.supportFragmentManager.beginTransaction().hide(mPM2Fragment!!) .commitAllowingStateLoss() } } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/BusPM2Model.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/BusPM2Model.kt new file mode 100644 index 0000000000..c0c5c1dcc1 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/BusPM2Model.kt @@ -0,0 +1,45 @@ +package com.mogo.och.bus.passenger.model + +import com.mogo.commons.module.status.IMogoStatusChangedListener +import com.mogo.commons.module.status.StatusDescriptor +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import mogo.telematics.pad.MessagePad + +/** + * @author: wangmingjun + * @date: 2023/1/31 + */ +class BusPM2Model private constructor() { + companion object { + val TAG = BusPM2Model::class.java.simpleName + val instance: BusPM2Model by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) { + BusPM2Model() + } + } + + init { + initListener() + } + + + private fun initListener(){ + CallerAutoPilotStatusListenerManager.addListener(TAG,mAutoPilotStatusListener) + } + + private val mAutoPilotStatusListener : IMoGoAutopilotStatusListener = + object : IMoGoAutopilotStatusListener { + + override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) { + super.onAutopilotArriveAtStation(arrivalNotification) + //todo 自动驾驶到站接口 + } + + override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { + super.onAutopilotStatusResponse(autoPilotStatusInfo) + //todo 自动驾驶状态展示, 注意美化模式下的处理 + } + + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2DrivingPresenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2DrivingPresenter.kt new file mode 100644 index 0000000000..08f558571f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2DrivingPresenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.ui.BusPM2DrivingInfoFragment + +class BusPM2DrivingPresenter(view: BusPM2DrivingInfoFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2MapPresenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2MapPresenter.kt new file mode 100644 index 0000000000..aa642b9a76 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2MapPresenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.ui.BusPM2MapFragment + +class BusPM2MapPresenter(view: BusPM2MapFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2Presenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2Presenter.kt new file mode 100644 index 0000000000..079421aff5 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2Presenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.ui.BusPM2BaseFragment + +class BusPM2Presenter(view: BusPM2BaseFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2VideoPresenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2VideoPresenter.kt new file mode 100644 index 0000000000..8265ce093f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPM2VideoPresenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.ui.video.BusPM2VideoFragment + +class BusPM2VideoPresenter(view: BusPM2VideoFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt deleted file mode 100644 index 6df3e4a056..0000000000 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mogo.och.bus.passenger.presenter - -import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment - -class BusPassengerPresenter(view: BusPassengerRouteFragment?) : - Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2BaseFragment.kt similarity index 57% rename from OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt rename to OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2BaseFragment.kt index 1dacbaec9a..b5c3f79b59 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2BaseFragment.kt @@ -3,22 +3,21 @@ package com.mogo.och.bus.passenger.ui import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.call.map.CallerSmpManager.hidePanel import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter +import com.mogo.och.bus.passenger.presenter.BusPM2Presenter /** * @author: wangmingjun * @date: 2022/4/12 */ -class BusPassengerRouteFragment : - MvpFragment() { +class BusPM2BaseFragment : + MvpFragment() { /** * 改变自动驾驶状态 * * @param status 2 - running 1 - enable 2 - disable */ - private val mPrevAPStatus = -1 override fun getLayoutId(): Int { - return R.layout.bus_p_fragment + return R.layout.bus_p_m2_fragment } override fun getTagName(): String { @@ -30,11 +29,11 @@ class BusPassengerRouteFragment : hidePanel() } - override fun createPresenter(): BusPassengerPresenter { - return BusPassengerPresenter(this) + override fun createPresenter(): BusPM2Presenter { + return BusPM2Presenter(this) } companion object { - private val TAG = BusPassengerRouteFragment::class.java.simpleName + private val TAG = BusPM2BaseFragment::class.java.simpleName } } \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2DrivingInfoFragment.kt new file mode 100644 index 0000000000..452f8f9e29 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2DrivingInfoFragment.kt @@ -0,0 +1,37 @@ +package com.mogo.och.bus.passenger.ui + +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.presenter.BusPM2DrivingPresenter + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class BusPM2DrivingInfoFragment : + MvpFragment() { + /** + * 改变自动驾驶状态 + * + * @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() { + + } + + override fun createPresenter(): BusPM2DrivingPresenter { + return BusPM2DrivingPresenter(this) + } + + companion object { + private val TAG = BusPM2DrivingInfoFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2MapFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2MapFragment.kt new file mode 100644 index 0000000000..e0080f53be --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/BusPM2MapFragment.kt @@ -0,0 +1,37 @@ +package com.mogo.och.bus.passenger.ui + +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.presenter.BusPM2MapPresenter + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class BusPM2MapFragment : + MvpFragment() { + /** + * 改变自动驾驶状态 + * + * @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() { + + } + + override fun createPresenter(): BusPM2MapPresenter { + return BusPM2MapPresenter(this) + } + + companion object { + private val TAG = BusPM2MapFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/BusPM2VideoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/BusPM2VideoFragment.kt new file mode 100644 index 0000000000..52a29724f9 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/BusPM2VideoFragment.kt @@ -0,0 +1,36 @@ +package com.mogo.och.bus.passenger.ui.video + +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.presenter.BusPM2VideoPresenter + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class BusPM2VideoFragment : + MvpFragment() { + /** + * 改变自动驾驶状态 + * + * @param status 2 - running 1 - enable 2 - disable + */ + override fun getLayoutId(): Int { + return R.layout.bus_p_m2_video_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + } + + override fun createPresenter(): BusPM2VideoPresenter { + return BusPM2VideoPresenter(this) + } + + companion object { + private val TAG = BusPM2VideoFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_driving_info_fragment.xml new file mode 100644 index 0000000000..5228bfe171 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_driving_info_fragment.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_fragment.xml new file mode 100644 index 0000000000..1a343bea16 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_fragment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_map_fragment.xml similarity index 75% rename from OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_fragment.xml rename to OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_map_fragment.xml index 77d9ef65f8..ebfc0c2abe 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_map_fragment.xml @@ -1,6 +1,9 @@ + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_video_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_video_fragment.xml new file mode 100644 index 0000000000..ebfc0c2abe --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/bus_p_m2_video_fragment.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml new file mode 100644 index 0000000000..8e63faf83d --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml @@ -0,0 +1,30 @@ + + + #2D3E5F + #CCE9EFFC + #C7D2E1 + #2D3E5F + #0043FF + #2D3E5F + #596A8A + #D8E5F8 + #FFB327 + #2D3E5F + #0043FF + #276AFE + #0043FF + #276AFE + #FFC125 + #FF8131 + #31BFF2 + #3257E9 + #FFFFFF + #CDDBF6 + #2D3E5F + #0043FF + #2D3E5F + #E6E9EFFC + #33394C63 + #2D3E5F + #33394C63 + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/dimens.xml new file mode 100644 index 0000000000..e738022b0d --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/dimens.xml @@ -0,0 +1,61 @@ + + + 700dp + 40dp + 40dp + 40dp + 40dp + 110dp + 224dp + 510dp + 3dp + + 158dp + 90dp + 45dp + 158dp + 90dp + 45dp + 90dp + 90dp + 3dp + + 224dp + 50dp + 50dp + 44dp + 130dp + 38dp + + 36dp + + 110dp + 42dp + + 4dp + 10dp + 20dp + 60dp + 30dp + 20dp + 50dp + 6dp + 50dp + 36dp + 80dp + 100dp + 80dp + 60dp + 6dp + + 685dp + 309dp + 50dp + 10dp + 44dp + 55dp + 40dp + + 584dp + 550dp + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml new file mode 100644 index 0000000000..e98feed5f5 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml @@ -0,0 +1,13 @@ + + + KM/H + 您已收车 + 暂无班次 + + + 到达站: + 下一站: + 始发站: + 请携带好随身物品下车。 + 欢迎乘坐蘑菇车联自动驾驶车。 + \ No newline at end of file