yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
wangmingjun
2023-05-12 12:50:53 +08:00
parent a4ad075992 dfef5cba44
commit 3fde1b42cd
43 changed files with 206 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -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()
// 结束路距计算

14
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
View File

@@ -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) {

8
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
View File

@@ -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("车辆系统繁忙，请稍后再试")
}
}
}

61
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt
View File

@@ -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<SiteInfoResponse.SiteInfo>()
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")
}

18
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt
View File

@@ -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)
}
}

8
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt
View File

@@ -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("设备未就绪请稍等")

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

36
OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
android:oneshot="false">
<item android:drawable="@drawable/charter_p_wait_driver_submit01" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit02" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit03" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit04" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit05" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit06" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit07" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit08" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit09" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit10" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit11" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit12" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit13" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit14" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit15" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit16" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit17" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit18" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit19" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit20" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit21" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit22" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit23" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit24" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit25" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit26" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit27" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit28" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit29" android:duration="60"/>
<item android:drawable="@drawable/charter_p_wait_driver_submit30" android:duration="60"/>
</animation-list>

83
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml
View File

@@ -1,83 +0,0 @@
<?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: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">
<!--提前结束包车页面-->
<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_early_end_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_early_end_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>
</androidx.constraintlayout.widget.ConstraintLayout>

107
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
View File

@@ -102,8 +102,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/gl_site_cancle_submit_guide" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_site_cancle_submit_guide"
android:layout_width="wrap_content"
@@ -115,34 +113,31 @@
android:id="@+id/g_side_cancle_submit_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="tv_site_submit,tv_site_cancle,tv_site_cancle,tv_site_submit" />
app:constraint_referenced_ids="tv_site_submit,tv_site_cancle" />
<androidx.constraintlayout.widget.Group
android:id="@+id/g_lines_sites_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="cl_line_list,cl_side_list" />
app:constraint_referenced_ids="cl_line_list,cl_side_list,tv_site_submit,tv_site_cancle" />
<!--region 等待司机同意或者拒绝-->
<ImageView
android:id="@+id/iv_loading_wait_driver"
android:layout_width="@dimen/dp_71"
android:layout_height="@dimen/dp_73"
android:src="@drawable/bus_p_loading"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="@dimen/dp_600"
android:layout_height="@dimen/dp_300"
android:src="@drawable/charter_p_wait_driver_submit_ani"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.372" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_loading_wait_driver_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="63dp"
android:text="等待司机确认信息，请稍候…"
android:gravity="center"
android:text="稍等，亲\n蘑菇小助手正在为您确认信息…"
android:textColor="@color/bus_p_m1_4a5375"
android:textSize="@dimen/dp_30"
app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"
@@ -155,15 +150,89 @@
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="iv_loading_wait_driver,tv_loading_wait_driver_title" />
<!--endregion 等待司机同意或者拒绝-->
<!--region 司机同意显示-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_driver_agree_image"
android:layout_width="@dimen/dp_235"
android:layout_height="@dimen/dp_223"
android:layout_marginTop="@dimen/dp_61"
android:src="@drawable/charter_p_driver_agree"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_driver_agree_title_top"
app:layout_constraintStart_toStartOf="@+id/aciv_driver_agree_image"
app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image"
app:layout_constraintTop_toBottomOf="@+id/aciv_driver_agree_image"
android:text="确认完毕！"
android:textColor="@color/bus_p_m1_112b57"
android:textStyle="bold"
android:textSize="@dimen/dp_34"
android:layout_marginTop="@dimen/dp_34"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_driver_agree_title_bottom"
app:layout_constraintStart_toStartOf="@+id/aciv_driver_agree_image"
app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image"
app:layout_constraintTop_toBottomOf="@+id/aciv_driver_agree_title_top"
android:text="小助手已记录您的选择。"
android:textColor="@color/bus_p_m1_112b57"
android:textSize="@dimen/dp_29"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/group_driver_agrenn_line"
app:constraint_referenced_ids="aciv_driver_agree_image,aciv_driver_agree_title_top,aciv_driver_agree_title_bottom"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!--endregion 司机同意显示-->
<!--region 司机拒绝显示-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_driver_refuse_image"
android:layout_width="@dimen/dp_395"
android:layout_height="@dimen/dp_234"
android:layout_marginTop="@dimen/dp_61"
android:src="@drawable/charter_p_driver_refuse"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_driver_refuse_title"
app:layout_constraintStart_toStartOf="@+id/aciv_driver_refuse_image"
app:layout_constraintEnd_toEndOf="@+id/aciv_driver_refuse_image"
app:layout_constraintTop_toBottomOf="@+id/aciv_driver_refuse_image"
android:layout_marginTop="@dimen/dp_35"
android:gravity="center"
android:text="啊哦，加载失败了\n联系车内领航员，或尝试再次提交。"
android:textColor="@color/bus_p_m1_112b57"
android:textSize="@dimen/dp_34"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/aciv_driver_refuse_group"
android:visibility="gone"
app:constraint_referenced_ids="aciv_driver_refuse_image,aciv_driver_refuse_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!--endregion 司机拒绝显示-->
</androidx.constraintlayout.widget.ConstraintLayout>
<include
android:id="@+id/m1_order_early_end"
layout="@layout/m1_order_early_end"
android:visibility="gone" />
<include
android:id="@+id/m1_order_noorder"
layout="@layout/m1_order_noorder"

5
OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml
View File

@@ -23,7 +23,8 @@
<string name="bus_p_m1_speed_unit">KM/h</string>
<string name="m1_stop_site_zh">正在为您靠边停车，请坐稳扶好</string>
<string name="m1_stop_site_zh">正在为您靠边停车，扶稳坐好哟</string>
<string name="m1_stop_site_success">靠边停车成功</string>
<string name="m1_please_login_driver">请安全员登录司机屏</string>
<string name="m1_end_order_5min">包车将在5分钟后结束，结束后我们将自动为您寻找停车点</string>
@@ -45,7 +46,7 @@
<string name="m1_novice_guidance_notice_tts">最后,蘑菇小助手为您送上乘车小贴士～</string>
<string name="m1_novice_guidance_complier_tts">太棒了！您已完成乘车指南，更多功能欢迎探索～蘑菇小助手预祝您旅途愉快</string>
<!-- <string name="m1_novice_guidance_tts">先关闭车门再启动吧～</string>-->
<string name="m1_close_door_and_startauto">先关闭车门再启动吧～</string>
<!-- <string name="m1_novice_guidance_tts">车辆起步，扶稳坐好哟，前方到站XXX</string>-->
<!-- <string name="m1_novice_guidance_tts">自驾系统繁忙，稍后再试试吧～</string>-->

18
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
View File

@@ -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{
"车辆正在运行、请稍后再试"
"车辆行驶中不可以开门哦～"
}
}
}