diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index b8eeb38cb3..54dfe96bf8 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -114,6 +114,7 @@ object CharterPassengerModel { private var carTypeChageListener: IOrderChangeCallback?=null private var subscribeCountDown: Disposable?=null + var switchLine5minWait: Disposable?=null fun init() { initListeners() @@ -866,6 +867,12 @@ object CharterPassengerModel { ) CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}") + switchLine5minWait?.let { + if (!it.isDisposed) { + it.dispose() + } + } + // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() // 结束路距计算 diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index 6a1a100b31..ff00e03a79 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -194,12 +194,15 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : checkLine?.let { mView?.lineAdapterSubmit(it) } - mView?.go2StartCar() + mView?.hideDataDriverAgree() + CharterPassengerModel.switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { + CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") + } CharterPassengerModel.queryOrder() CharterPassengerModel.cleanbroadcastListInfo() } else { ToastUtils.showShort("司机端拒绝请重新选择") - mView?.endAni() + mView?.hideDataDriverRefuse() } RxUtils.disposeSubscribe(subscribeSelectSite) BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) @@ -240,7 +243,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : ) CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "发送数据：切换站点${msg}") } - mView?.startAni() + mView?.hideDataWaitDriverMsg() // 启动查看和司机端链接 BusPassengerModelLoopManager.setLoopFunction( TAGLINELOOP, @@ -250,14 +253,14 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : RxUtils.disposeSubscribe(subscribeSelectSite) subscribeSelectSite = RxUtils.createSubscribe(120_000){ ToastUtils.showShort("请联系安全员确认") - mView?.endAni() + mView?.hideDataDriverRefuse() } } private fun checkServerStatus() { if (!CallerTelematicManager.getClientConnStatus()) { ToastUtils.showShort("断开和司机端连接、请联系安全员") BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) - mView?.endAni() + mView?.hideDataDriverRefuse() CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni666") } } @@ -267,7 +270,6 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : } fun canSwitchLine():Boolean { - return true val gnssSpeed = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed if (gnssSpeed < 0.5) { diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 7b105cfaa5..43d67fdb28 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -227,7 +227,7 @@ class BusPassengerPresenter(view: MainFragment?) : OCHPlanningStopSideStatusManager.Status.START -> { VoiceNotice.showNotice( context.getString(R.string.m1_stop_site_zh), - AIAssist.LEVEL1 + AIAssist.LEVEL0 ) } OCHPlanningStopSideStatusManager.Status.DOING -> { @@ -235,9 +235,13 @@ class BusPassengerPresenter(view: MainFragment?) : } OCHPlanningStopSideStatusManager.Status.EndingSuccess -> { ToastUtils.showShort("靠边停车成功") + VoiceNotice.showNotice( + context.getString(R.string.m1_stop_site_success), + AIAssist.LEVEL0 + ) } OCHPlanningStopSideStatusManager.Status.EndingFaile -> { - ToastUtils.showShort("靠边停车失败") + ToastUtils.showShort("车辆系统繁忙，请稍后再试") } } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index cd2916dfa8..ccf4c418cf 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -1,13 +1,11 @@ package com.mogo.och.bus.passenger.ui.dialogfragment.fragment -import android.animation.ObjectAnimator +import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View -import android.view.animation.LinearInterpolator import androidx.recyclerview.widget.LinearLayoutManager import com.elegant.utils.UiThreadHandler import com.mogo.commons.mvp.MvpFragment -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -15,12 +13,14 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.response.LineInfoResponse import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse +import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment import com.mogo.och.bus.passenger.view.BottomDecoration +import com.mogo.och.common.module.utils.RxUtils import kotlinx.android.synthetic.main.m1_order_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -41,15 +41,6 @@ class M1OrderLineFragment : val siteList = mutableListOf() - - private val loadingAni = - ObjectAnimator.ofFloat(iv_loading_wait_driver, "rotation", 0f, 90f, 180f, 270f, 360f) - .apply { - repeatCount = -1 - interpolator = LinearInterpolator() - duration = 1000 - } - override fun getLayoutId(): Int { return R.layout.m1_order_fragment } @@ -62,7 +53,6 @@ class M1OrderLineFragment : CallerLogger.d(SceneConstant.M_BUS_P + TAG, "initViews") lineAdapter = OrderLineItemAdapter(requireContext(), lineList) siteAdapter = OrderSiteItemAdapter(requireContext(), siteList) - loadingAni.target = iv_loading_wait_driver rlv_line_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) rlv_line_list.addItemDecoration( @@ -111,11 +101,14 @@ class M1OrderLineFragment : mPresenter?.resetData() } tv_site_submit.onClick { + CharterPassengerModel.switchLine5minWait?.let { + if (!it.isDisposed) { + ToastUtils.showShort("选择线路后5分钟内不可用选") + return@onClick + } + } mPresenter?.changeSites(siteList) } - tv_loading_wait_driver_title.onClick { - endAni() - } } @@ -131,39 +124,57 @@ class M1OrderLineFragment : } } - fun startAni() { + fun hideDataWaitDriverMsg() { g_lines_sites_data.visibility = View.GONE g_loading_group.visibility = View.VISIBLE - if (!loadingAni.isRunning) { - loadingAni.start() - } + val animationDrawable = iv_loading_wait_driver.drawable as AnimationDrawable + animationDrawable.start() } - fun endAni() { + fun showSelectData() { UiThreadHandler.post { g_lines_sites_data.visibility = View.VISIBLE g_loading_group.visibility = View.GONE + group_driver_agrenn_line.visibility = View.GONE + aciv_driver_refuse_group.visibility = View.GONE } } + fun hideDataDriverAgree(){ + group_driver_agrenn_line.visibility = View.VISIBLE + aciv_driver_refuse_group.visibility = View.GONE + g_loading_group.visibility = View.GONE + g_lines_sites_data.visibility = View.GONE + RxUtils.createSubscribe { + dismiss?.closeDialog() + } + } + fun hideDataDriverRefuse(){ + group_driver_agrenn_line.visibility = View.GONE + aciv_driver_refuse_group.visibility = View.VISIBLE + g_loading_group.visibility = View.GONE + g_lines_sites_data.visibility = View.GONE + RxUtils.createSubscribe { + showSelectData() + } + } + + fun setViewByOrderStatus(currentStatus: OrderStatusEnum) { when (currentStatus) { OrderStatusEnum.NoOrderUnuse -> { // 无订单页面 m1_order_noorder.visibility = View.VISIBLE - m1_order_early_end.visibility = View.GONE lsv_line_site.visibility = View.GONE } OrderStatusEnum.OrderNoLine -> { // 选择线路页面 m1_order_noorder.visibility = View.GONE - m1_order_early_end.visibility = View.GONE lsv_line_site.visibility = View.VISIBLE } OrderStatusEnum.OrdersWithLine -> { // 选择线路页面 m1_order_noorder.visibility = View.GONE - m1_order_early_end.visibility = View.GONE lsv_line_site.visibility = View.VISIBLE } } @@ -181,7 +192,7 @@ class M1OrderLineFragment : override fun onDestroyView() { super.onDestroyView() - loadingAni.cancel() + //loadingAni.cancel() CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView") } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt deleted file mode 100644 index b04a65c940..0000000000 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt +++ /dev/null @@ -1,18 +0,0 @@ -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 EarlyEndOrderView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { - init { - LayoutInflater.from(context).inflate(R.layout.m1_order_early_end, this, true) - } -} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt index cd873d8bb7..94e43674ed 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt @@ -6,6 +6,7 @@ import android.util.AttributeSet import android.view.MotionEvent import android.view.View import androidx.appcompat.widget.AppCompatTextView +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -16,6 +17,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.view.bottom.BottomClickView +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import com.mogo.och.common.module.utils.SoundPoolHelper import kotlinx.android.synthetic.main.m1_bottom_bar.view.* @@ -61,6 +63,12 @@ class GoView @JvmOverloads constructor( } private fun startGo(){ + + if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { + val string = AbsMogoApplication.getApp().getString(R.string.m1_close_door_and_startauto) + ToastUtils.showShort(string) + return + } when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 ToastUtils.showShort("设备未就绪请稍等") diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png new file mode 100644 index 0000000000..fb6fc1375a Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png new file mode 100644 index 0000000000..f462e5aa15 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.png new file mode 100644 index 0000000000..1137f9cebd Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.png new file mode 100644 index 0000000000..94225fbd19 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.png new file mode 100644 index 0000000000..12ac2c7cd7 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.png new file mode 100644 index 0000000000..e96dcba42f Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.png new file mode 100644 index 0000000000..bb21fdc7b8 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.png new file mode 100644 index 0000000000..a59ac743c0 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.png new file mode 100644 index 0000000000..1e6e98e749 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.png new file mode 100644 index 0000000000..8031d522b4 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.png new file mode 100644 index 0000000000..5104b3e154 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.png new file mode 100644 index 0000000000..c2f6dfe467 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.png new file mode 100644 index 0000000000..55169260b0 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.png new file mode 100644 index 0000000000..70a9a4d4e2 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.png new file mode 100644 index 0000000000..7249bd6c00 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.png new file mode 100644 index 0000000000..dd9b20e123 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.png new file mode 100644 index 0000000000..158f9bd472 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.png new file mode 100644 index 0000000000..451ba3fee4 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.png new file mode 100644 index 0000000000..bc84a61f8d Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.png new file mode 100644 index 0000000000..9557bb4287 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.png new file mode 100644 index 0000000000..c60d988f87 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.png new file mode 100644 index 0000000000..426eb26312 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.png new file mode 100644 index 0000000000..228aa09df2 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.png new file mode 100644 index 0000000000..f1301f2bfd Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.png new file mode 100644 index 0000000000..7eed395b23 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.png new file mode 100644 index 0000000000..19979e347e Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.png new file mode 100644 index 0000000000..c07d6f9f38 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.png new file mode 100644 index 0000000000..6790b9eb73 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.png new file mode 100644 index 0000000000..a64acf4098 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.png new file mode 100644 index 0000000000..c87efa80b8 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.png new file mode 100644 index 0000000000..99addfa297 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.png new file mode 100644 index 0000000000..1137f9cebd Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml new file mode 100644 index 0000000000..ed41d52de6 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml deleted file mode 100644 index fb7d333076..0000000000 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml index 9b63d84b6a..a24a4b8b59 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml @@ -102,8 +102,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/gl_site_cancle_submit_guide" /> - - - - + app:constraint_referenced_ids="tv_site_submit,tv_site_cancle" /> + app:constraint_referenced_ids="cl_line_list,cl_side_list,tv_site_submit,tv_site_cancle" /> + + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + + + + + + - - KM/h - 正在为您靠边停车，请坐稳扶好 + 正在为您靠边停车，扶稳坐好哟 + 靠边停车成功 请安全员登录司机屏 包车将在5分钟后结束，结束后我们将自动为您寻找停车点 @@ -45,7 +46,7 @@ 最后,蘑菇小助手为您送上乘车小贴士～ 太棒了！您已完成乘车指南，更多功能欢迎探索～蘑菇小助手预祝您旅途愉快 - + 先关闭车门再启动吧～ diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt index 537cd55dff..7934b36787 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt @@ -1,9 +1,11 @@ package com.mogo.och.common.module.manager.devicemanage +import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.common.module.voice.VoiceNotice import io.reactivex.disposables.Disposable object LightAirconditionDoorManager { @@ -15,7 +17,7 @@ object LightAirconditionDoorManager { fun go2OpenDoor(isOpen:Boolean){ val canOpenOrCloseDoor = canOpenOrCloseDoor() if(!canOpenOrCloseDoor.isNullOrBlank()){ - ToastUtils.showShort(canOpenOrCloseDoor) + ToastUtils.showLong(canOpenOrCloseDoor) return } RxUtils.disposeSubscribe(dooorSubscribe) @@ -30,9 +32,17 @@ object LightAirconditionDoorManager { RxUtils.disposeSubscribe(doorStatusSubscribe) doorStatusSubscribe = RxUtils.createSubscribe(6000) { if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车门无法关闭，请使用车内物理按钮") + ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + VoiceNotice.showNotice( + "车辆系统繁忙，稍后再试试吧～", + AIAssist.LEVEL0 + ) }else{ - ToastUtils.showShort("车门无法开启，请使用车内物理按钮") + ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + VoiceNotice.showNotice( + "车辆系统繁忙，稍后再试试吧～", + AIAssist.LEVEL0 + ) } } } @@ -42,7 +52,7 @@ object LightAirconditionDoorManager { return if(location.gnssSpeed<0.01){ null }else{ - "车辆正在运行、请稍后再试" + "车辆行驶中不可以开门哦～" } } }