From acb1d8a46e97cf122af7c4325b268ebeab562846 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Jan 2025 19:27:28 +0800 Subject: [PATCH 1/4] [6.8.2] [taxi] [fix] --- .../logchainanalytic/OchChainLogManager.kt | 15 +++---- ...PassengerOrdersInServiceQueryRespBean.java | 14 +++++++ .../passenger/model/TaxiPassengerModel.kt | 42 +++++++++---------- 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index 58066154bd..9d4b22cd84 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -1,15 +1,9 @@ package com.mogo.och.common.module.manager.logchainanalytic -import android.text.TextUtils import com.mogo.commons.debug.DebugConfig -import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.commons.utils.MogoAnalyticUtils -import com.mogo.eagle.core.data.app.AppConfigInfo -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.zhjt.service.chain.ChainLog @@ -68,6 +62,8 @@ object OchChainLogManager { const val EVENT_KEY_INFO_CALL_EYE = "analytics_event_call_eye_och" + const val EVENT_KEY_INFO_ERROR = "analytics_event_och_error" + fun writeChainLogEye(title: String, info: String) { writeChainLog(title, info, true, EVENT_KEY_INFO_CALL_EYE) @@ -80,12 +76,17 @@ object OchChainLogManager { writeChainLog(title, info, true, EVENT_KEY_INFO_TIME) } - // 轨迹方面的日志 fun writeChainLogTrajectory(title: String, info: String) { writeChainLog(title, info, true, EVENT_KEY_INFE_WITH_TRAJECTORY) } + // 错误日志 + fun writeChainLogError(title: String, info: String) { + writeChainLog(title, info, true, EVENT_KEY_INFO_ERROR) + } + + fun writeChainLogMap(title: String, info: String) { writeChainLog(title, info, true, EVENT_KEY_INFO_MAP) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java index 7a4918cf1b..2a0bd4ae25 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java @@ -3,6 +3,8 @@ package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.taxi.BaseOrderBean; +import org.jetbrains.annotations.Nullable; + import java.util.List; import java.util.Objects; @@ -80,6 +82,18 @@ public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData { public int hashCode() { return Objects.hash(siteId, siteName, gcjLon, gcjLat, wgs84Lon, wgs84Lat); } + + @Nullable + public SiteBean copy() { + SiteBean temp = new SiteBean(); + temp.siteId = siteId; + temp.siteName = siteName; + temp.gcjLon = gcjLon; + temp.gcjLat = gcjLat; + temp.wgs84Lat = wgs84Lat; + temp.wgs84Lon = wgs84Lon; + return temp; + } } public static class OrderBean extends BaseOrderBean { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index 3bb20e6889..e7f992f8e6 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -282,6 +282,7 @@ object TaxiPassengerModel { currentTrajectoryInfo = null currentTaskStatus = -1 } else { + OchChainLogManager.writeChainLogError("queryOrderById","订单状态异常 old:${currentOCHOrder}__new:${data.data}") currentOCHOrder = data.data orderStatusChange() } @@ -379,7 +380,7 @@ object TaxiPassengerModel { orderStatusChangeInner() d(M_TAXI_P + TAG, "最新的状态-->${curOrderStatus}") OchChainLogManager.writeChainLog(currentOCHOrder.toString(),"最新的状态-->${curOrderStatus}") - com.mogo.och.unmanned.taxi.utils.order.OrderModel.invokeListener(currentOCHOrder) + OrderModel.invokeListener(currentOCHOrder) } private fun orderStatusChangeInner() { @@ -449,27 +450,24 @@ object TaxiPassengerModel { } private fun setStation() { - try { - if (currentOCHOrder != null && currentLineId != null) { - val startStation = MogoLocation() - startStation.longitude = currentOCHOrder!!.orderStartSite.gcjLon - startStation.latitude = currentOCHOrder!!.orderStartSite.gcjLat - val endStation = MogoLocation() - endStation.longitude = currentOCHOrder!!.orderEndSite.gcjLon - endStation.latitude = currentOCHOrder!!.orderEndSite.gcjLat - TrajectoryAndDistanceManager.setStationPoint( - startStation, - endStation, - currentLineId - ) - } - }catch (e:Exception){ - RxUtils.createSubscribeOnOwnThread(10_000) { - if(currentOCHOrder!=null&¤tOCHOrder!!.orderEndSite!=null) { - setStation() - } - } - OchChainLogManager.writeChainLog("exception",e.toString()) + var tempStartPoint: TaxiPassengerOrdersInServiceQueryRespBean.SiteBean?=null + var tempEndPoint: TaxiPassengerOrdersInServiceQueryRespBean.SiteBean?=null + if(currentOCHOrder!=null){ + tempStartPoint = currentOCHOrder?.orderStartSite?.copy() + tempEndPoint = currentOCHOrder?.orderEndSite?.copy() + } + if (tempStartPoint!=null && tempEndPoint!=null && currentLineId != null) { + val startStation = MogoLocation() + startStation.longitude = tempStartPoint.gcjLon + startStation.latitude = tempStartPoint.gcjLat + val endStation = MogoLocation() + endStation.longitude = currentOCHOrder!!.orderEndSite.gcjLon + endStation.latitude = currentOCHOrder!!.orderEndSite.gcjLat + TrajectoryAndDistanceManager.setStationPoint( + startStation, + endStation, + currentLineId + ) } } From c38805abb7faa1a18e9cd6bcb2f9534a98a94dec Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 14 Jan 2025 14:26:05 +0800 Subject: [PATCH 2/4] [6.10.0] [common] [bridge] --- .../passenger/model/CharterPassengerModel.kt | 3 +- OCH/common/biz/build.gradle | 2 +- OCH/common/bridge/build.gradle | 12 +++++++ .../com/mogo/och/bridge/BridgeProvider.kt | 33 +++++++++++++++++++ .../common/module/debug/DebugDataDispatch.kt | 22 +++++++------ .../common/module/biz/birdge/BridgeManager.kt | 26 +++++++++++++++ .../common/module/biz/birdge/BridgeService.kt | 10 ++++++ .../common/module/constant/OchCommonConst.kt | 1 + .../weaknet/passenger/model/CommonModel.kt | 5 +-- .../unmanned/taxi/ui/task/TaxiTaskModel.kt | 5 +-- .../itinerarycurrent/ItineraryCurrentModel.kt | 4 +-- .../passenger/model/TaxiPassengerModel.kt | 5 +-- 12 files changed, 108 insertions(+), 20 deletions(-) create mode 100644 OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeManager.kt create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeService.kt diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index a1e0f17aec..8ba164966f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -52,6 +52,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.LedScreenManager import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.PinYinUtil import com.mogo.och.common.module.voice.VoiceNotice @@ -1273,7 +1274,7 @@ object CharterPassengerModel { endStation: MogoLocation?, lineId: Long? ) { - TrajectoryAndDistanceManager.setStationPoint(startStation, endStation, lineId) + BridgeManager.setDistanceStation(startStation,endStation,lineId) } } \ No newline at end of file diff --git a/OCH/common/biz/build.gradle b/OCH/common/biz/build.gradle index 62fddfebc6..b24bd454a6 100644 --- a/OCH/common/biz/build.gradle +++ b/OCH/common/biz/build.gradle @@ -53,9 +53,9 @@ dependencies { implementation project(':OCH:common:common') implementation rootProject.ext.dependencies.arouter + kapt rootProject.ext.dependencies.aroutercompiler implementation project(':OCH:common:data') implementation project(':OCH:common:bridge') - kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogocommons diff --git a/OCH/common/bridge/build.gradle b/OCH/common/bridge/build.gradle index de95c8a7eb..769c31b049 100644 --- a/OCH/common/bridge/build.gradle +++ b/OCH/common/bridge/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' id 'kotlin-android-extensions' } @@ -10,6 +11,14 @@ android { minSdkVersion rootProject.ext.android.minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" + + kapt { + useBuildCache = false + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) + } + } + } buildTypes { @@ -50,6 +59,9 @@ dependencies { testImplementation project(':OCH:common:bridge') testImplementation 'junit:junit:4.12' + implementation rootProject.ext.dependencies.arouter + kapt rootProject.ext.dependencies.aroutercompiler + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_function_call diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt new file mode 100644 index 0000000000..e7c14f850d --- /dev/null +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt @@ -0,0 +1,33 @@ +package com.mogo.och.bridge + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.biz.birdge.BridgeService +import com.mogo.och.common.module.constant.OchCommonConst + + +/** + * eye 桥 + */ +@Route(path = OchCommonConst.BIZ_Bridge) +class BridgeProvider : BridgeService { + + private var context: Context? = null + + private val tag = M_OCHCOMMON + "BridgeProvider" + + override fun setDistanceStation(startLocation: MogoLocation?, endLocation: MogoLocation?, lineId: Long?) { + CallerLogger.d(tag,"distance 设置起始站点的定位") + TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineId) + } + + + override fun init(context: Context?) { + this.context = context + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index 6b7dba6a13..cd78f45fd6 100644 --- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -34,6 +34,7 @@ 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.ThreadUtils +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.order.OrderManager import com.mogo.och.common.module.debug.location.MogoLocationExit import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -256,16 +257,17 @@ object DebugDataDispatch { } fun setStation(startLon:Double,startLat:Double,endLon:Double,endLat:Double,lineID:Long){ -// if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){ -// TrajectoryAndDistanceManager.setStationPoint(null,null,-1) -// } -// val startLocation = MogoLocation() -// startLocation.longitude = startLon -// startLocation.latitude = startLat -// val endLocation = MogoLocation() -// endLocation.longitude = endLon -// endLocation.latitude = endLat -// TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID) + if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){ + BridgeManager.setDistanceStation(null,null,-1) + } + val startLocation = MogoLocation() + startLocation.longitude = startLon + startLocation.latitude = startLat + val endLocation = MogoLocation() + endLocation.longitude = endLon + endLocation.latitude = endLat + + BridgeManager.setDistanceStation(startLocation,endLocation,lineID) } fun getLocaitonByLog(path:String) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeManager.kt new file mode 100644 index 0000000000..a3c08046f6 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeManager.kt @@ -0,0 +1,26 @@ +package com.mogo.och.common.module.biz.birdge + +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager + +object BridgeManager { + + private const val TAG = M_OCHCOMMON+"BridgeManager" + + private var bridgeService: BridgeService? = + ARouter.getInstance().build(OchCommonConst.BIZ_Bridge).navigation() as BridgeService + + fun load(){ + OchChainLogManager.writeChainLogInit("初始化信息","初始化Bridge系统") + d(TAG,"初始化信息_初始化Bridge系统") + } + + fun setDistanceStation(startLocation: MogoLocation?, endLocation: MogoLocation?, lineId: Long?) { + bridgeService?.setDistanceStation(startLocation,endLocation,lineId) + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeService.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeService.kt new file mode 100644 index 0000000000..0c5b86bdb4 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeService.kt @@ -0,0 +1,10 @@ +package com.mogo.och.common.module.biz.birdge + +import com.alibaba.android.arouter.facade.template.IProvider +import com.mogo.eagle.core.data.map.MogoLocation + +interface BridgeService : IProvider { + + fun setDistanceStation(startLocation: MogoLocation?, endLocation: MogoLocation?, lineId: Long?) + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt index 8d4a5a1d98..6426ed50a6 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt @@ -32,6 +32,7 @@ class OchCommonConst { const val BIZ_SKIN = "/ochbiz/common/skin" const val BIZ_TIME = "/ochbiz/common/time" const val BIZ_OFFLINE = "/offlinedriver/offlinedata" + const val BIZ_Bridge = "/birdge/bridge" const val BUS_DRIVER = "/busdriver/busdriver" const val BUS_PASSENGER = "/buspassenger/buspassenger" diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt index ea68602ad5..b030798c80 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt @@ -24,6 +24,7 @@ import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.manager.download.DownloadManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener @@ -397,12 +398,12 @@ object CommonModel { val endStation = MogoLocation() endStation.longitude = endStationInfo.gcjLon endStation.latitude = endStationInfo.gcjLat - TrajectoryAndDistanceManager.setStationPoint(startStation, endStation, lineId.toLong()) + BridgeManager.setDistanceStation(startStation, endStation, lineId.toLong()) } private fun cleanStation(type: String) { d(TAG, "清理站点:$type") - TrajectoryAndDistanceManager.setStationPoint(null, null, -1L) + BridgeManager.setDistanceStation(null, null, -1L) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 98fb9688a2..2b8ef8a49f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -53,6 +53,7 @@ import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2 import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.order.IOrderListener import com.mogo.och.common.module.biz.order.OrderManager import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -794,7 +795,7 @@ object TaxiTaskModel { //订单到站结束轨迹剩余里程就算和高德计算, 防止到站查询订单全程的显示被覆盖 LineManager.setLineInfo(null) - TrajectoryAndDistanceManager.setStationPoint(null, null, -1L) + BridgeManager.setDistanceStation(null, null, -1L) destroyAmapNavi() mTaxiTaskWithOrderCallbackMap.forEach { @@ -869,7 +870,7 @@ object TaxiTaskModel { destroyAmapNavi() } LineManager.setLineInfo(null) - TrajectoryAndDistanceManager.setStationPoint(null, null, -1L) + BridgeManager.setDistanceStation(null, null, -1L) } fun queryOrderByOrderNo(orderNo: String) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt index a87c412a73..4843446d59 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt @@ -18,7 +18,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.data.taxi.TaxiOrderStatusEnum import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.bridge.autopilot.location.OchLocationManager -import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback @@ -297,7 +297,7 @@ class ItineraryCurrentModel : BaseViewModel(), val endStation = MogoLocation() endStation.longitude = curTaskAndOrder.endSite!!.gcjLon endStation.latitude = curTaskAndOrder.endSite!!.gcjLat - TrajectoryAndDistanceManager.setStationPoint( + BridgeManager.setDistanceStation( startStation, endStation, curTaskAndOrder.lineId diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index e7f992f8e6..a76facd3ae 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -22,6 +22,7 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager @@ -463,7 +464,7 @@ object TaxiPassengerModel { val endStation = MogoLocation() endStation.longitude = currentOCHOrder!!.orderEndSite.gcjLon endStation.latitude = currentOCHOrder!!.orderEndSite.gcjLat - TrajectoryAndDistanceManager.setStationPoint( + BridgeManager.setDistanceStation( startStation, endStation, currentLineId @@ -473,7 +474,7 @@ object TaxiPassengerModel { } private fun clearStation() { - TrajectoryAndDistanceManager.setStationPoint(null, null, -1L) + BridgeManager.setDistanceStation(null, null, -1L) } } \ No newline at end of file From 91f5cc2efb16cf388e5d8634d15a7e6aaaaa6298 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 16 Jan 2025 15:01:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[6100][ada]=E7=A7=BB=E9=99=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E8=83=BD=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E6=A1=A3=E4=BD=8D=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/launcher/startup/ConfigStartUp.kt | 3 +-- .../datacenter/autopilot/MoGoAutopilotControlProvider.kt | 6 +++--- .../com/mogo/eagle/core/data/config/FunctionBuildConfig.kt | 7 ------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 8874aab760..f11c5734b8 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -57,8 +57,7 @@ object ConfigStartUp { } // 各个module需要的url FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java) - //不能启动自动驾驶的档位 - FunctionBuildConfig.launchAutopilotGear = BuildConfig.LAUNCH_AUTOPILOT_GEAR + // 各车型宣传视频本地配置json FunctionBuildConfig.mediaUrlConfig = BuildConfig.mediaUrlConfig FunctionBuildConfig.musicUrlConfig = BuildConfig.musicUrlConfig diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 1013e929a5..8c577e312e 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -140,7 +140,7 @@ class MoGoAutopilotControlProvider : .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE)) .setRootCrt(CallerCloudCertManager.getRootCrtFDecode()) .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode()) - .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) +// .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) // .setSubscribeInterfaceOptions(subscribeInterfaceOptions)// .build() @@ -237,7 +237,7 @@ class MoGoAutopilotControlProvider : val options = AdasOptions .newBuilder() .setPassenger(true) - .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) +// .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) .build() AdasManager.getInstance() .create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) @@ -272,7 +272,7 @@ class MoGoAutopilotControlProvider : .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE)) .setRootCrt(CallerCloudCertManager.getRootCrtFDecode()) .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode()) - .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) +// .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) .build() AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听///////////////////////////////////////////// diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 6d7f326b30..9e1318335a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -330,13 +330,6 @@ object FunctionBuildConfig { @JvmField var urlJson: UrlConfig = GsonUtils.fromJson("{\"och_url\":\"https://tech.zhidaozhixing.com\"}", UrlConfig::class.java) - /** - * 最外层设置的Url - */ - @Volatile - @JvmField - var launchAutopilotGear: Set? = null - /** * 当前应用是否支持patch升级 */ From a609e3dfdb8dbc5e3aa127f7fc1c48f265aefc9a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Jan 2025 10:45:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.10.0]=20[fix]=20[=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B9=BF=E5=91=8A=E6=B2=A1=E6=9C=89=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wigets/media/MediaLoopPlayView.kt | 7 +++++ .../wigets/media/MediaPlayerCustomView.kt | 29 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt index 2d508bd2a4..3c95f294e2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt @@ -384,6 +384,13 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter return } } + if(currentItemView is AdvanceImageView){ + if(mItemViewList.size == 1){ + currentItemView.displayImage() + startImageCountDownTimer() + return + } + } if (currentPosition == mItemViewList.size - 1) { //已经到最后一个, 从头开始 mViewPager.post { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt index f2d870f1dc..899639d571 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt @@ -1,4 +1,5 @@ import android.content.Context +import android.graphics.Bitmap import android.media.AudioManager import android.net.Uri import android.text.TextUtils @@ -6,7 +7,11 @@ import android.util.AttributeSet import android.widget.ImageView import android.widget.RelativeLayout import com.bumptech.glide.Glide +import com.bumptech.glide.load.DataSource +import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions +import com.bumptech.glide.request.target.Target import com.mogo.eagle.core.utilcode.download.callback.IDownloadListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger @@ -436,7 +441,29 @@ class AdvanceImageView @JvmOverloads constructor( .error(placeholderDrawable) .fallback(placeholderDrawable) .centerCrop() - ).into(it) + ).listener(object :RequestListener{ + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target?, + isFirstResource: Boolean + ): Boolean { + MediaPlayLogger.printErrorLog("图片加载失败:${e?.message}") + return false + } + + override fun onResourceReady( + resource: Bitmap?, + model: Any?, + target: Target?, + dataSource: DataSource?, + isFirstResource: Boolean + ): Boolean { + return false + } + + }) + .into(it) } } } \ No newline at end of file