From 16a0eb74e8ea9d943b4eb48f3ede2cd6dfcc8cb2 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 14 Feb 2023 14:01:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[m1]=20[1.0.2]=20[=E8=BD=A6=E9=80=9F?= =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=85=B3=E9=97=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionDevicePresenter.kt | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 6bb3556ce7..7b28e3fd3c 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -1,16 +1,16 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner +import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager 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.common.module.manager.OCHM1LightAirconditionDoorStatusManager import com.zhidao.support.adas.high.AdasManager -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable -import java.util.concurrent.TimeUnit class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragment?) : BusBasePassengerFunctionDevicePresenter(view), @@ -18,6 +18,7 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme private var subscribe: Disposable? = null private var subscribeDoorStatus: Disposable? = null + private var gnssSpeed =0f companion object { private const val TAG = "BusPassengerFunctionDevicePresenter" @@ -26,6 +27,19 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) OCHM1LightAirconditionDoorStatusManager.addListener(TAG, this) + BusPassengerModel.setControllerStatusCallback(TAG,object : + IBusPassengerControllerStatusCallback{ + override fun onVRModeChanged(isVRMode: Boolean) { + + } + + override fun onCarLocationChanged(location: MogoLocation?) { + location?.let { + gnssSpeed = it.gnssSpeed + } + } + + }) } override fun onDestroy(owner: LifecycleOwner) { @@ -44,6 +58,11 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme } fun openDoor() { + val canOpenOrCloseDoor = canOpenOrCloseDoor() + if(!canOpenOrCloseDoor.isNullOrEmpty()){ + ToastUtils.showShort(canOpenOrCloseDoor) + return + } disposeSubscribe(subscribe) subscribe = createSubscribe(1000) { AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(0) @@ -58,6 +77,11 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme } fun closeDoor() { + val canOpenOrCloseDoor = canOpenOrCloseDoor() + if(!canOpenOrCloseDoor.isNullOrBlank()){ + ToastUtils.showShort(canOpenOrCloseDoor) + return + } disposeSubscribe(subscribe) subscribe = createSubscribe(1000) { AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(0) @@ -71,6 +95,14 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme } } + private fun canOpenOrCloseDoor():String?{ + if(gnssSpeed==0f){ + return null + }else{ + return "车辆正在运行、请稍后再试" + } + } + // 靠边停车 fun startStopSide() { when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { From d2f10127228df42b63e7cb770dbbb23187bf1ffd Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 14 Feb 2023 18:18:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[m1]=20[1.0.2]=20[=E6=9C=89=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=BC=80=E9=97=A8=E3=80=81=E6=B8=A9=E5=BA=A6=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=B7=A6=E5=8F=B3=E5=88=A4=E6=96=AD=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionDevicePresenter.kt | 9 +-- .../ui/BusPassengerFunctionSoftFragment.kt | 6 +- .../passenger/ui/BusPassengerRouteFragment.kt | 14 ++--- .../passenger/view/HorizontalDecoration.java | 2 +- .../src/m1/res/layout/bus_p_fragment.xml | 60 +++++++++---------- 5 files changed, 46 insertions(+), 45 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 7b28e3fd3c..60b00eb555 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.model.BusPassengerModel @@ -18,7 +19,7 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme private var subscribe: Disposable? = null private var subscribeDoorStatus: Disposable? = null - private var gnssSpeed =0f + private var gnssSpeed =0.0 companion object { private const val TAG = "BusPassengerFunctionDevicePresenter" @@ -35,7 +36,7 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme override fun onCarLocationChanged(location: MogoLocation?) { location?.let { - gnssSpeed = it.gnssSpeed + gnssSpeed = it.gnssInfo.vehicleSpeed } } @@ -96,10 +97,10 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme } private fun canOpenOrCloseDoor():String?{ - if(gnssSpeed==0f){ + if(gnssSpeed==0.0){ return null }else{ - return "车辆正在运行、请稍后再试" + return "速度:${gnssSpeed}车辆正在运行、请稍后再试" } } diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt index b45fe03d17..9872c91961 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt @@ -314,11 +314,11 @@ class BusPassengerFunctionSoftFragment : if(enable){ adapter.setEnable(true) iv_temperature_select.visibility = View.VISIBLE - rb_wind_speed_low.setTextColor(ContextCompat.getColor(requireContext(),R.color.bus_p_m1_6647576e)) + rb_wind_speed_low.setTextColor(ContextCompat.getColorStateList(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector)) }else{ adapter.setEnable(false) iv_temperature_select.visibility = View.GONE - rb_wind_speed_low.setTextColor(ContextCompat.getColor(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector)) + rb_wind_speed_low.setTextColor(ContextCompat.getColor(requireContext(),R.color.bus_p_m1_6647576e)) } } @@ -471,7 +471,7 @@ class BusPassengerFunctionSoftFragment : mAudioManager?.setStreamVolume( AudioManager.STREAM_MUSIC, currnetValue, - AudioManager.FLAG_SHOW_UI + AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE ) } } diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt index 6984eca699..c857117102 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt @@ -54,16 +54,16 @@ class BusPassengerRouteFragment : true } omvOverMap.hideResetView() - viewDriverMsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener { + viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener { override fun showMsgBoxList(show: Boolean) { if (show) { - viewDriverMsgBoxList.visibility = View.VISIBLE - viewDriverMsgBoxBubble.visibility = View.GONE - viewDriverMsgBoxBubble.isShowData(false) + viewBusPM1MsgBoxList.visibility = View.VISIBLE + viewBusPM1MsgBoxBubble.visibility = View.GONE + viewBusPM1MsgBoxBubble.isShowData(false) } else { - viewDriverMsgBoxList.visibility = View.GONE - viewDriverMsgBoxBubble.visibility = View.VISIBLE - viewDriverMsgBoxBubble.isShowData(true) + viewBusPM1MsgBoxList.visibility = View.GONE + viewBusPM1MsgBoxBubble.visibility = View.VISIBLE + viewBusPM1MsgBoxBubble.isShowData(true) } } diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java index dc0baf9052..53a3c85dd4 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java @@ -11,7 +11,7 @@ public class HorizontalDecoration extends RecyclerView.ItemDecoration { /** * 第一个视图和最后一个视图偏移的距离 */ - private int distance = 0; + private static int distance = 0; private static final String TAG = "HorizontalDecoration"; /** diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml index b3bc02a7b7..e7d0726719 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml @@ -164,36 +164,6 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file