From 6f44d55bd2cac255d304d1309eb81a4eabb0e475 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 16 May 2023 23:02:38 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[fix]=20[3.2.0]=20[=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E8=AF=AD=E8=A8=80=E3=80=81=E9=80=9F=E5=BA=A6=E3=80=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/CharterPassengerModel.kt | 21 +++++++++---------- .../BusPassengerFunctionPresenter.kt | 5 +++++ .../presenter/BusPassengerPresenter.kt | 11 +++++++++- .../ui/dialogfragment/M1ContainFragment.kt | 14 +++++++++++++ .../passenger/view/statusbar/StatusBarView.kt | 6 ++++++ .../src/main/res/layout/m1_debugview_pass.xml | 2 ++ .../src/main/res/values/strings.xml | 2 +- 7 files changed, 48 insertions(+), 13 deletions(-) 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 be2c6a2f49..ceb97a05e8 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 @@ -6,7 +6,6 @@ import android.net.ConnectivityManager import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager -import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine @@ -48,8 +47,6 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.PinYinUtil import com.mogo.och.common.module.voice.VoiceManager import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.tts.base.LangTtsEntity -import com.mogo.tts.base.LanguageType import io.reactivex.Observable import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers @@ -433,12 +430,12 @@ object CharterPassengerModel { coordinateConverterWgsToGcj.latitude ) // 小于15m到站 - if (calculateLineDistance < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"小于15米到站1") + if (calculateLineDistance < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE && calculateLineDistance > 0) { + CallerLogger.d(M_BUS_P + TAG,"小于15米到站1") arriveDest() } - if (calculateLineDistance < CharterPassengerConst.ARRIVE_SOON_AT_START_STATION_DISTANCE) { - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"小于100米到站") + if (calculateLineDistance < CharterPassengerConst.ARRIVE_SOON_AT_START_STATION_DISTANCE && calculateLineDistance > 0) { + CallerLogger.d(M_BUS_P + TAG, "小于100米到站") arriveDestSoon() } } @@ -675,6 +672,8 @@ object CharterPassengerModel { mogoLocation.latitude ) if(lastSumLength>100) { + ToastUtils.showLong("缺少轨迹数据") + if (mRoutePoints.size == 0) return // 计算距离 lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength( @@ -690,11 +689,11 @@ object CharterPassengerModel { "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + " thread = " + Thread.currentThread().name ) - if (lastSumLength < CharterPassengerConst.ARRIVE_SOON_AT_START_STATION_DISTANCE) { + if (lastSumLength < CharterPassengerConst.ARRIVE_SOON_AT_START_STATION_DISTANCE&&lastSumLength>0) { CallerLogger.d(M_BUS_P + TAG,"小于100米到站2") arriveDestSoon() } - if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { + if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE&&lastSumLength>0) { CallerLogger.d(M_BUS_P + TAG,"小于15米到站2") arriveDest() return @@ -918,8 +917,8 @@ object CharterPassengerModel { order.siteId?.let { siteId -> if (order.arriveStatus == OrderInfoResponse.ARRIVING) { if (broadcastList["${siteId}$ending100Key"] == null || broadcastList["${siteId}$ending100Key"] == false) { - val string = mContext.getString(com.mogo.och.common.module.R.string.arrived_station_zh) - VoiceNotice.showNotice(string,) + val string = mContext.getString(R.string.arrived_station_left_100) + VoiceNotice.showNotice(string) } } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt index 099d83d721..a1668f7b62 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt @@ -1,6 +1,7 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner +import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment class BusPassengerFunctionPresenter(view: M1ContainFragment?) : @@ -15,4 +16,8 @@ class BusPassengerFunctionPresenter(view: M1ContainFragment?) : override fun onDestroy(owner: LifecycleOwner) { super.onDestroy(owner) } + + fun haveOrder(): Boolean { + return CharterPassengerModel.hasOrder() + } } \ No newline at end of file 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 344722d26f..4bf0aac8e7 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 @@ -7,6 +7,7 @@ import android.view.View import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.voice.AIAssist +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.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -23,6 +24,7 @@ import com.mogo.och.bus.passenger.bean.response.LineInfoResponse import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse import com.mogo.och.bus.passenger.bean.response.TrajectoriesResponse +import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.callback.IDistanceCallback import com.mogo.och.bus.passenger.callback.IOrderChangeCallback import com.mogo.och.bus.passenger.model.CharterPassengerModel @@ -46,7 +48,7 @@ import kotlin.math.ceil class BusPassengerPresenter(view: MainFragment?) : BusBasePassengerFunctionDevicePresenter(view), IDistanceCallback, IOrderChangeCallback, IOrderStatusChangeListener, - OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback { + OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback, IBusPassengerControllerStatusCallback { private val lindIdAndView = ConcurrentHashMap() @@ -60,6 +62,7 @@ class BusPassengerPresenter(view: MainFragment?) : CharterPassengerModel.init() // 定位监听 CharterPassengerModel.setStationDistanceListener(TAG, this) + CharterPassengerModel.setControllerStatusCallback(TAG,this) CharterPassengerModel.setCarTypeChangeListener(this) CharterPassengerModel.setStatusChangeListener(TAG, this) CallerTelematicListenerManager.addListener(TAG, DriverMessage) @@ -76,6 +79,12 @@ class BusPassengerPresenter(view: MainFragment?) : OCHPlanningStopSideStatusManager.removeListener(TAG) } + override fun onCarLocationChanged(location: MogoLocation?) { + location?.let { + setSpeed(it.gnssSpeed) + } + } + private fun setSpeed(speed: Float) { UiThreadHandler.post { val speedKM = (Math.abs(speed) * 3.6f).toInt() diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt index 77ba9c2bc9..680d20c716 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt @@ -9,6 +9,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction +import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.MvpDialogFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P @@ -23,6 +24,7 @@ import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.M1VideoFragment import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.OrderInfoFragment import com.mogo.och.bus.passenger.ui.view.bottom.BottomBar import com.mogo.och.bus.passenger.ui.view.bottom.BottomClickView +import com.mogo.och.common.module.biz.constant.LoginStatusManager import kotlinx.android.synthetic.main.m1_contain_fragment.* import org.greenrobot.eventbus.EventBus @@ -130,6 +132,18 @@ class M1ContainFragment : } } bb_bottom_bar.setOrderInfoClickListener{ + if (LoginStatusManager.isLogin()) { + if(mPresenter?.haveOrder()==true){ + + }else{ + ToastUtils.showShort("请确认订单") + return@setOrderInfoClickListener + } + }else{ + ToastUtils.showShort(AbsMogoApplication.getApp().getString(R.string.m1_please_login_driver)) + return@setOrderInfoClickListener + } + CallerLogger.d(M_BUS_P+ TAG, "initViews---$tab") if(tab==ORDERINFO) { dismissAllowingStateLoss() diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt index 2a6fb57717..df793fbdf9 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt @@ -47,6 +47,8 @@ class StatusBarView @JvmOverloads constructor( private var mHits = LongArray(COUNTS) + private var preStatus = -1 + private fun continuousClick(type:String) { //每次点击时，数组向前移动一位 System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1) @@ -96,6 +98,10 @@ class StatusBarView @JvmOverloads constructor( } private fun setAutoPilotSatusInfo(state: Int) { + if(preStatus==state){ + return + } + preStatus = state when (state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> { actv_auto_status.text = "安全接管中" diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml index 2f00612482..873316e934 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml @@ -34,6 +34,8 @@ app:layout_constraintEnd_toEndOf="parent" android:inputType="numberPassword" android:gravity="center" + android:maxLines="1" + android:imeOptions="actionDone" android:textSize="@dimen/dp_32" android:textColor="@android:color/white" android:background="@drawable/charter_p_debugview_edit_bg" 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 8177f74ab4..376b5fe977 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站就要到啦！ From 9642acb4202a172f3f8b9ab3b25632e8a0cee278 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 17 May 2023 11:36:20 +0800 Subject: [PATCH 2/9] [charter] [3.2.0] [play di need Activity] --- .../java/com/mogo/och/bus/passenger/receive/DriverMessage.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt index bd16acb41d..2aa969855f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt @@ -5,6 +5,7 @@ import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R @@ -80,7 +81,7 @@ object DriverMessage: IReceivedMsgListener { } private fun playDI() { - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(AbsMogoApplication.getApp(), R.raw.m1_voice_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.m1_voice_di) } From 6f83801eb5abf9baeb477091d1262d70d77fd677 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 17 May 2023 11:50:35 +0800 Subject: [PATCH 3/9] [charter] [3.2.0] [reset distance time] --- .../mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt | 1 + 1 file changed, 1 insertion(+) 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 4bf0aac8e7..f72bd59518 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 @@ -109,6 +109,7 @@ class BusPassengerPresenter(view: MainFragment?) : override fun setDistancecAndTime(meters: Long, timeInSecond: Long) { if (meters < 0 && timeInSecond < 0) { setDistanceAndTime("--", context.getString(R.string.m1_distance_unit_km), "--", "--") + return } var dis: String? = "0" var disUnit = "KM" From a896e6ff5fcad7e8be29abc51202e80a47dd1a38 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 17 May 2023 12:14:20 +0800 Subject: [PATCH 4/9] [3.2.0]fix bug of roma has no lat and lon, and add trace log start request ,plus open the adas data track for default --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 18 +++++++++--------- .../trace/TraceManager.kt | 4 ++-- .../business/ai/AiCloudIdentifyDataManager.kt | 10 +++++++--- .../ai/net/AiCloudIdentifyNetWorkModel.kt | 12 ++++++++---- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 2bf5aa76aa..ea44139ef5 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -108,15 +108,15 @@ class MoGoAdasListenerImpl : OnAdasListener { } } - //感知物体 - @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED, - linkCode = CHAIN_LINK_ADAS, - endpoint = PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, - paramIndexes = [0, 1], - clientPkFileName = "sn" - ) + //感知物体 注解暂时关闭，通过调试面板查看数量，此注解暂时用于aiCloud显示感知物 +// @ChainLog( +// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED, +// linkCode = CHAIN_LINK_ADAS, +// endpoint = PAD, +// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, +// paramIndexes = [0, 1], +// clientPkFileName = "sn" +// ) override fun onTrackedObjects( header: MessagePad.Header, trackedObjects: MessagePad.TrackedObjects diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 330c6ccc73..28e0080ac0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -54,7 +54,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = - FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) + FwBuild(false, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = @@ -82,7 +82,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报)") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = - ChainLogParam(false, "ADAS感知物体") + ChainLogParam(true, "ADAS感知物体") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = ChainLogParam(false, "ADAS车前引导线") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 4c9d09af54..f994b2e2c6 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.commons.debug.DebugConfig +import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.multidisplay.TelematicConstant @@ -13,6 +14,7 @@ import com.mogo.eagle.core.function.business.ai.net.AiCloudIdentifyNetWorkModel. import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager import com.mogo.eagle.core.function.call.map.CallerMapRomaListener import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -125,8 +127,10 @@ class AiCloudIdentifyDataManager : IMogoMapListener, // CallerMapRomaListener.invokeMapRoma(false) // sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "4".toByteArray()) // } - MapBizTrace.log(TAG,"开启请求，data:$dataReceive") - aiCloudIdentifyNetWorkModel.requestIdentifyRange(dataReceive, serverSn, { + val status = MogoStatusManager.getInstance().isSocketOnLine + val gnss = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().gnssInfo + MapBizTrace.log(TAG,"开启请求，data:$dataReceive , socketStatus:$status , lon:${gnss.longitude} , lat:${gnss.latitude}") + aiCloudIdentifyNetWorkModel.requestIdentifyRange(dataReceive, gnss.longitude,gnss.latitude,{ MapBizTrace.log( TAG, "requestIdentifyRange ok startRange:$START_METRE, endRange:$END_METRE , dataReceive:$dataReceive" @@ -156,7 +160,7 @@ class AiCloudIdentifyDataManager : IMogoMapListener, when { // 解除漫游限制 visualAngleMode.isRoma -> { - MapBizTrace.log(TAG, "onMapVisualAngleChanged, invoke roma") + MapBizTrace.log(TAG, "onMapVisualAngleChanged, invoke roma , socketStatus: ${ MogoStatusManager.getInstance().isSocketOnLine}") showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt index 57f6e064f3..61a48f2c0b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt @@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.business.ai.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.constants.HostConst.getEagleHost -import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.BaseResponse import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.START_METRE @@ -10,7 +9,7 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.apiCall import com.mogo.eagle.core.network.request -class AiCloudIdentifyNetWorkModel private constructor(){ +class AiCloudIdentifyNetWorkModel private constructor() { companion object { val aiCloudIdentifyNetWorkModel by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { @@ -25,7 +24,7 @@ class AiCloudIdentifyNetWorkModel private constructor(){ fun requestIdentifyRange( dataReceive: Boolean, - serverSn:String, + lon: Double, lat: Double, onSuccess: (() -> Unit), onError: ((String) -> Unit) ) { @@ -37,7 +36,12 @@ class AiCloudIdentifyNetWorkModel private constructor(){ map["startMetre"] = START_METRE map["endMetre"] = END_METRE map["type"] = 1 - map["relationSn"] = serverSn + if (lon != 0.0) { + map["lon"] = lon + } + if (lat != 0.0) { + map["lat"] = lat + } } loader { apiCall { From 641ad6c7dc1c2c34b5592c4817518046b79b358c Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 17 May 2023 11:01:08 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[3.2.0][CrashFix]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=9C=A8=E5=AD=90=E7=BA=BF=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84Ui=E7=BB=98=E5=88=B6=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt index 53668b88a6..74b91eeb29 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt @@ -127,14 +127,13 @@ class MoGoHmiProvider : IMoGoHmiProvider { "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime" ) lastShowV2XJob?.safeCancel() - ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.Default) { + ProcessLifecycleOwner.get().lifecycleScope.launch { delay(expireTime) }.also { itx -> lastShowV2XJob = itx }.invokeOnCompletion { listener?.onDismiss() } - Log.d("CODE", "---- 00 ------ tts_content: $ttsContent") if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) { val last = lastSpeakJob.get() From 495b331153d1a1af0924d8664cbaac8de5d7c4f9 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 17 May 2023 14:24:37 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20=E4=BC=98=E5=8C=96=E5=9F=8B=E7=82=B9=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=80=BB=E8=BE=91;=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E5=8D=87=E7=BA=A7=E5=BC=80=E5=A7=8B=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 10 ++++++++-- .../upgrade/UpgradeManager.kt | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index ec176f37c3..e2b79cd036 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -43,12 +43,18 @@ class UpgradeAppNetWorkManager private constructor() { scope.launch { val sn = MoGoAiCloudClientConfig.getInstance().sn //null val macAddress = mac //"48:b0:2d:4d:31:7f" - val type = screenType //10 + val type = screenType //"10" SharedPrefsMgr.getInstance(context!!).putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost()) try { val records = provider?.getUpgradeRecords()?.also { - MogoAnalyticUtils.track("AppUpgradeRecord", it.let { TreeMap().also { itx -> itx.putAll(it) } }) + MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap().also { itx -> + it.entries.forEach { entry -> + itx[entry.key] = entry.value.joinToString(",") { + "${ it.first } -> ${ it.second }" + } + } + }) } Log.d(TAG, "getAppUpgradeInfo: -> records:" + records?.entries?.joinToString(",") { itx -> "key:${itx.key} -> value:[${itx.value.joinToString(",") { "${it.first},${it.second}" } }]"}) val versionCode = AppUtils.getAppVersionCode() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 727f2395ee..038c36ce71 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -166,6 +166,7 @@ class UpgradeManager : IDownloadListener { } } else { val apk = File(localPath) + upgradeProvider?.recordInstallStart() withContext(Dispatchers.Main) { ApkInstaller.installApp(Utils.getApp(), apk) { code, reason -> if (code != PackageInstaller.STATUS_SUCCESS) { From 3a4aa3748728221e76695a6c73e8e01b6d03d174 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 17 May 2023 15:18:26 +0800 Subject: [PATCH 7/9] [3.2.0] open the data track chain --- .../com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 28e0080ac0..c2fcbd8793 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -54,7 +54,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = - FwBuild(false, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) + FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = From 259578845805c9175427db5e95efc33d39dc8d76 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 17 May 2023 15:56:38 +0800 Subject: [PATCH 8/9] [3.2.0] remove unuse code --- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index f994b2e2c6..4752d743b3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -7,7 +7,6 @@ import com.mogo.commons.debug.DebugConfig import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.data.multidisplay.TelematicConstant import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener import com.mogo.eagle.core.function.business.ai.net.AiCloudIdentifyNetWorkModel.Companion.aiCloudIdentifyNetWorkModel @@ -19,8 +18,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListener import com.mogo.eagle.core.function.call.map.CallerMapRomaListener import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.updateLongSightLevel -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer import com.mogo.eagle.core.function.utils.MapBizTrace import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.map.MogoMapUIController @@ -49,7 +46,6 @@ class AiCloudIdentifyDataManager : IMogoMapListener, } private var showAiCloud = AtomicBoolean(false) - private var serverSn = "" fun initServer(mContext: Context) { MogoMapListenerHandler.mogoMapListenerHandler.registerHostMapListener(TAG, this) From 1dcf28496d3fa3c7ce9b8d62746fcb1b118b9b19 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 17 May 2023 16:48:24 +0800 Subject: [PATCH 9/9] [charter] [3.2.0] [driver arrived dest ] --- .../passenger/model/CharterPassengerModel.kt | 139 ++++++++++-------- .../BusPassengerFunctionOrderPresenter.kt | 10 +- .../bus/passenger/receive/DriverMessage.kt | 29 ++-- .../ui/view/bottom/impl/GoViewWithArrive.kt | 1 - 4 files changed, 106 insertions(+), 73 deletions(-) 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 ceb97a05e8..440592c557 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 @@ -844,71 +844,88 @@ object CharterPassengerModel { @Synchronized fun arriveDest() { - orderInfo?.let { order-> - order.lineId?.let {lineId-> - order.siteId?.let { siteId -> - if (order.arriveStatus == OrderInfoResponse.ARRIVING) { - if (broadcastList["${siteId}$endKey"] == null || broadcastList["${siteId}$endKey"] == false) { - val currentTimeStamp = DateTimeUtil.getCurrentTimeStamp() - BusPassengerServiceManager.arriveDest( - mContext, - lindId = lineId, - writtenVersion = currentTimeStamp, - object : OchCommonServiceCallback { - override fun onSuccess(data: BaseData?) { - if (null != data && 0 == data.code) { - VoiceManager.arrivedStation( - order.siteName!!, - order.siteNameKr ?: "", - VoiceFocusManager.getVoiceCmdCallBack() - ) - broadcastList["${siteId}$endKey"] = true - // 给司机端 + val (order, lineId, siteId) = getOrderInfo() + if(order!=null&&lineId!=null&&siteId!=null){ + if (order.arriveStatus == OrderInfoResponse.ARRIVING) { + if (broadcastList["${siteId}$endKey"] == null || broadcastList["${siteId}$endKey"] == false) { + val currentTimeStamp = DateTimeUtil.getCurrentTimeStamp() + BusPassengerServiceManager.arriveDest( + mContext, + lindId = lineId, + writtenVersion = currentTimeStamp, + object : OchCommonServiceCallback { + override fun onSuccess(data: BaseData?) { + if (null != data && 0 == data.code) { + arrivedDeskSuccess(currentTimeStamp,true) + } + } - val msg = ChangeDestMsg( - order.orderNo?:":", - lineId.toInt(), - order.lineName?:"", - order.startSiteId?:0, - order.startSiteName?:"", - siteId.toInt(), - order.siteName, - true, - 2, - currentTimeStamp - ) - CallerTelematicManager.sendMsgToServer( - OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(msg).toByteArray() - ) - CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}") - - switchLine5minWait?.let { - if (!it.isDisposed) { - it.dispose() - } - } - - // 到站结束自驾 - CallerAutoPilotControlManager.cancelAutoPilot() - // 结束路距计算 - endCalculateDistanceLoop() - // 到站置距离位0 - invokeStationDistanceListener(-1,-1) - - } - } - - override fun onFail(code: Int, msg: String) { - ToastUtils.showShort("$code:$msg") - } - }) - } - } + override fun onFail(code: Int, msg: String) { + ToastUtils.showShort("$code:$msg") + } + }) } } } + } + fun arrivedDeskSuccess( + currentTimeStamp: Long, + needSendDriver:Boolean + ) { + val (order, lineId, siteId) = getOrderInfo() + if(order!=null&&lineId!=null&&siteId!=null){ + VoiceManager.arrivedStation( + order.siteName!!, + order.siteNameKr ?: "", + VoiceFocusManager.getVoiceCmdCallBack() + ) + broadcastList["${siteId}$endKey"] = true + // 给司机端 + if (needSendDriver) { + val msg = ChangeDestMsg( + order.orderNo ?: ":", + lineId.toInt(), + order.lineName ?: "", + order.startSiteId ?: 0, + order.startSiteName ?: "", + siteId.toInt(), + order.siteName, + true, + OrderInfoResponse.ARRIVED, + currentTimeStamp + ) + CallerTelematicManager.sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}") + } + + switchLine5minWait?.let { + if (!it.isDisposed) { + it.dispose() + } + } + + // 到站结束自驾 + CallerAutoPilotControlManager.cancelAutoPilot() + // 结束路距计算 + endCalculateDistanceLoop() + // 到站置距离位0 + invokeStationDistanceListener(-1, -1) + } + } + + private fun getOrderInfo():Triple{ + this.orderInfo?.let { order-> + this.orderInfo?.lineId?.let { lineId -> + this.orderInfo?.siteId?.let { siteId -> + return Triple(order,lineId,siteId) + } + } + } + return Triple(null,null,null) } @Synchronized @@ -961,9 +978,11 @@ object CharterPassengerModel { } val parameters = initAutopilotControlParameters() if (null == parameters) { + ToastUtils.showShort("请选择站点") CallerLogger.e(SceneConstant.M_BUS + TAG, "行程日志-AutopilotControlParameters is empty.") return } + ToastUtils.showShort("启动自动驾驶中") startAutoPilot(parameters) CallerLogger.d( SceneConstant.M_BUS + TAG, 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 ff00e03a79..13422731e7 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 @@ -180,10 +180,14 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : if (type == OchCommonConst.BUSINESS_STRING) { val msg = GsonUtils.fromJson( String(byteArray), - ChangeDestMsg::class.java - ) as ChangeDestMsg - CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "接受数据：切换站点${msg}") + BaseDPMsg::class.java + ) as BaseDPMsg if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type) { + val msg = GsonUtils.fromJson( + String(byteArray), + ChangeDestMsg::class.java + ) as ChangeDestMsg + CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "接受数据：切换站点${msg}") if (msg.isConfirmed) { ToastUtils.showShort("站点确定") mView?.setEnableSiteStatus(true) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt index 2aa969855f..b1f3cbf364 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt @@ -7,12 +7,14 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg -import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg -import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg -import com.mogo.och.common.module.bean.dpmsg.DPMsgType +import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse +import com.mogo.och.bus.passenger.model.CharterPassengerModel +import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager +import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter +import com.mogo.och.common.module.bean.dpmsg.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager @@ -20,6 +22,7 @@ import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStat import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.utils.SoundPoolHelper +import com.mogo.och.common.module.voice.VoiceNotice object DriverMessage: IReceivedMsgListener { override fun onReceivedMsg(type: Int, byteArray: ByteArray) { @@ -60,15 +63,23 @@ object DriverMessage: IReceivedMsgListener { ) } if(msg.isPlay){ - AIAssist.getInstance(AbsMogoApplication.getApp()).speakTTSVoiceWithLevel(msg.msg, AIAssist.LEVEL1) + VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) if(msg.msg.contains("核销成功")){ - RxUtils.createSubscribe(15_000) { - val string = AbsMogoApplication.getApp().getString(R.string.m1_welcome_tts) - AIAssist.getInstance(AbsMogoApplication.getApp()).speakTTSVoiceWithLevel(string, AIAssist.LEVEL1) - } + val string = AbsMogoApplication.getApp().getString(R.string.m1_welcome_tts) + VoiceNotice.showNotice(string, AIAssist.LEVEL1,15_000) } } } + DPMsgType.TYPE_CHANGE_DEST.type -> { + val msg = GsonUtils.fromJson( + String(byteArray), + ChangeDestMsg::class.java + ) as ChangeDestMsg + if (msg.isConfirmed&&msg.arriveStatus== OrderInfoResponse.ARRIVED) { + CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "接受数据：到站${msg}") + CharterPassengerModel.arrivedDeskSuccess(msg.writtenVersion?:0,false) + } + } else -> {} } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt index 94fc93bf6c..cb20a12286 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt @@ -82,7 +82,6 @@ class GoViewWithArrive @JvmOverloads constructor( ToastUtils.showShort("设备未就绪请稍等") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastUtils.showShort("启动自动驾驶中") CallerAutoPilotControlManager.sendPlanningCmd(2) CharterPassengerModel.startAutopilot() onceRegisterAutoStatus()