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 e9ca8eaf54..47ad1581fc 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 @@ -30,7 +30,7 @@ import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.bean.dpmsg.LineSite import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback -import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus @@ -291,8 +291,8 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { // 自动驾驶中 - when (OCHPlanningStopSideStatusManager.stopSiteStatus) { - OCHPlanningStopSideStatusManager.Status.EndingSuccess -> { + when (StopSideStatusManager.stopSiteStatus) { + StopSideStatusManager.Status.EndingSuccess -> { return true } else ->{ 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 f72bd59518..ea121179d9 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 @@ -35,7 +35,7 @@ import com.mogo.och.bus.passenger.ui.MainFragment import com.mogo.och.bus.passenger.view.MakerWithSiteName import com.mogo.och.bus.passenger.view.MakerWithSiteNamewithCheck import com.mogo.och.common.module.biz.network.OchCommonServiceCallback -import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.utils.DateTimeUtil @@ -48,7 +48,7 @@ import kotlin.math.ceil class BusPassengerPresenter(view: MainFragment?) : BusBasePassengerFunctionDevicePresenter(view), IDistanceCallback, IOrderChangeCallback, IOrderStatusChangeListener, - OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback, IBusPassengerControllerStatusCallback { + StopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback, IBusPassengerControllerStatusCallback { private val lindIdAndView = ConcurrentHashMap() @@ -66,7 +66,7 @@ class BusPassengerPresenter(view: MainFragment?) : CharterPassengerModel.setCarTypeChangeListener(this) CharterPassengerModel.setStatusChangeListener(TAG, this) CallerTelematicListenerManager.addListener(TAG, DriverMessage) - OCHPlanningStopSideStatusManager.addListener(TAG, this) + StopSideStatusManager.addListener(TAG, this) setCarChangeListener(R.raw.m1) } @@ -76,7 +76,7 @@ class BusPassengerPresenter(view: MainFragment?) : CharterPassengerModel.setStationDistanceListener(TAG, null) CharterPassengerModel.setCarTypeChangeListener(null) CallerTelematicListenerManager.removeListener(TAG) - OCHPlanningStopSideStatusManager.removeListener(TAG) + StopSideStatusManager.removeListener(TAG) } override fun onCarLocationChanged(location: MogoLocation?) { @@ -123,7 +123,7 @@ class BusPassengerPresenter(view: MainFragment?) : } } val time = ceil(timeInSecond / 60f).toInt() - val arriveTime = DateTimeUtil.getAfterSecondTime(time) + val arriveTime = DateTimeUtil.getAfterSecondTime(timeInSecond.toInt()) setDistanceAndTime(dis.toString(), disUnit, time.toString(), arriveTime) } @@ -224,32 +224,32 @@ class BusPassengerPresenter(view: MainFragment?) : } override fun onStartAutopilotFailure( - actionStatus: OCHPlanningStopSideStatusManager.Status, + actionStatus: StopSideStatusManager.Status, stopSideStatus: Boolean?, errorInfo: String? ) { UiThreadHandler.post { when (actionStatus) { - OCHPlanningStopSideStatusManager.Status.NOSTART -> { + StopSideStatusManager.Status.NOSTART -> { ToastUtils.showShort(errorInfo) } - OCHPlanningStopSideStatusManager.Status.START -> { + StopSideStatusManager.Status.START -> { VoiceNotice.showNotice( context.getString(R.string.m1_stop_site_zh), AIAssist.LEVEL0 ) } - OCHPlanningStopSideStatusManager.Status.DOING -> { + StopSideStatusManager.Status.DOING -> { // 正在靠边停车 } - OCHPlanningStopSideStatusManager.Status.EndingSuccess -> { + StopSideStatusManager.Status.EndingSuccess -> { ToastUtils.showShort("靠边停车成功") VoiceNotice.showNotice( context.getString(R.string.m1_stop_site_success), AIAssist.LEVEL0 ) } - OCHPlanningStopSideStatusManager.Status.EndingFaile -> { + StopSideStatusManager.Status.EndingFaile -> { ToastUtils.showShort("车辆系统繁忙，请稍后再试") } } @@ -297,7 +297,7 @@ class BusPassengerPresenter(view: MainFragment?) : val stationsNameList: MutableList = mutableListOf() val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.map_staton_icon) sites.forEach { - stationsList.add(SiteMarkerBean(LatLng(it.GcjLat!!,it.GcjLon!!),stationIcon,0.5f,0.5f)) + stationsList.add(SiteMarkerBean(LatLng(it.GcjLat!!,it.GcjLon!!),stationIcon,0.5f,1f)) val bitmap = getBitmap(it.siteId!!,it.siteName ?: "", it.isCheck) stationsNameList.add(SiteMarkerBean(LatLng(it.GcjLat,it.GcjLon),bitmap,0.0f,0.2f)) } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 1b28c5f222..bfb52aeef9 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -178,7 +178,7 @@ class MainFragment : fun drawEndStation(latLng: LatLng) { val listOf = listOf(latLng) - omvOverMap.drawSiteMarkers(listOf,endStation,0.5f,0.5f) + omvOverMap.drawSiteMarkers(listOf,endStation,0.5f,1f) } fun cleanEndStation(){ omvOverMap.clearSiteMarkers() diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml index cfe640568d..1cde6d41fd 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml @@ -48,7 +48,7 @@ 先关闭车门再启动吧～ 自驾系统繁忙，稍后再试试吧～ - %1$s站就要到啦！ + %1$s就要到啦！ diff --git a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt b/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt index 81ae52637e..bdf18afced 100644 --- a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt +++ b/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt @@ -5,6 +5,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.common.module.utils.DateTimeUtil import org.json.JSONException import org.json.JSONObject import org.junit.Test diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index 7ee9c5fdf5..ddb716d072 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -20,9 +20,8 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean import com.mogo.och.common.module.biz.callback.ILoginCallback import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE -import com.mogo.och.common.module.biz.constant.LoginStatusManager import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin -import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.utils.DateTimeUtil import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -33,7 +32,7 @@ import mogo_msg.MogoReportMsg */ class DriverM1Presenter(view: DriverM1Fragment?) : Presenter(view),ILoginCallback, DriverM1OrderCallback, ChangeDestCallback, - IMoGoAutopilotStatusListener, OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, + IMoGoAutopilotStatusListener, StopSideStatusManager.OCHPlanningActionsCallback, IDriverM1ControllerStatusCallback { private val TAG = DriverM1Presenter::class.java.name @@ -47,14 +46,14 @@ class DriverM1Presenter(view: DriverM1Fragment?) : private fun registerListener() { //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口 CallerAutoPilotStatusListenerManager.addListener(TAG, this) - OCHPlanningStopSideStatusManager.addListener(TAG,this) + StopSideStatusManager.addListener(TAG,this) DriverM1Model.get().setDriverM1OrderCallback(this) DriverM1Model.get().setChangeDestCallback(this) DriverM1Model.get().setControllerStatusCallback(this) } private fun releaseListener() { - OCHPlanningStopSideStatusManager.removeListener(TAG) + StopSideStatusManager.removeListener(TAG) CallerAutoPilotStatusListenerManager.removeListener(TAG) DriverM1Model.get().setDriverM1OrderCallback(null) DriverM1Model.get().setChangeDestCallback(null) @@ -163,12 +162,12 @@ class DriverM1Presenter(view: DriverM1Fragment?) : } override fun onStartAutopilotFailure( - actionStatus: OCHPlanningStopSideStatusManager.Status, + actionStatus: StopSideStatusManager.Status, stopSideStatus: Boolean?, errorInfo: String? ) { when (actionStatus) { - OCHPlanningStopSideStatusManager.Status.START -> { // 靠边停车 to 消息盒子 + StopSideStatusManager.Status.START -> { // 靠边停车 to 消息盒子 DriverM1Model.get().pushOperationalToMsgBox( DateTimeUtil.getCurrentTimeStamp(), "", diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt similarity index 99% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt index 16c1c0a2a9..e0f6e39b0a 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import mogo.telematics.pad.MessagePad import java.util.concurrent.ConcurrentHashMap -object OCHPlanningStopSideStatusManager : IMoGoAutopilotPlanningActionsListener { +object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener { private const val TAG = "OCHPlanningActionsManager" init { 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 e1f155cc2f..e59a523149 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 @@ -14,7 +14,7 @@ object LightAirconditionDoorManager { private var dooorSubscribe: Disposable? = null private var doorStatusSubscribe: Disposable? = null - fun go2OpenDoor(isOpen:Boolean){ + fun go2OpenDoor(go2Open:Boolean){ val canOpenOrCloseDoor = canOpenOrCloseDoor() if(!canOpenOrCloseDoor.isNullOrBlank()){ ToastUtils.showLong(canOpenOrCloseDoor) @@ -24,7 +24,7 @@ object LightAirconditionDoorManager { dooorSubscribe = RxUtils.createSubscribe(1000) { CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) } - if(isOpen) { + if(go2Open) { CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1) }else{ CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2) @@ -32,17 +32,21 @@ object LightAirconditionDoorManager { RxUtils.disposeSubscribe(doorStatusSubscribe) doorStatusSubscribe = RxUtils.createSubscribe(6000) { if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") - VoiceNotice.showNotice( - "车辆系统繁忙，稍后再试试吧～", - AIAssist.LEVEL0 - ) + if(!go2Open) { + ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + VoiceNotice.showNotice( + "车辆系统繁忙，稍后再试试吧～", + AIAssist.LEVEL0 + ) + } }else{ - ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") - VoiceNotice.showNotice( - "车辆系统繁忙，稍后再试试吧～", - AIAssist.LEVEL0 - ) + if(go2Open) { + ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + VoiceNotice.showNotice( + "车辆系统繁忙，稍后再试试吧～", + AIAssist.LEVEL0 + ) + } } } }