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

[6.10.0]

Browse Source 
[common]
[bridge]
This commit is contained in:
yangyakun
2025-01-14 14:26:05 +08:00
parent 95942c2700
commit c8ca3fd493
12 changed files with 108 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
OCH/common/biz/build.gradle
View File

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

12
OCH/common/bridge/build.gradle
View File

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

33
OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt Normal file
View File

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

22
OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
View File

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

26
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeManager.kt Normal file
View File

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

10
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeService.kt Normal file
View File

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

1
OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
View File

@@ -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"

5
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt
View File

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

5
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
View File

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

4
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt
View File

@@ -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<UnmannedState, TaskUiIntent>(),
val endStation = MogoLocation()
endStation.longitude = curTaskAndOrder.endSite!!.gcjLon
endStation.latitude = curTaskAndOrder.endSite!!.gcjLat
TrajectoryAndDistanceManager.setStationPoint(
BridgeManager.setDistanceStation(
startStation,
endStation,
curTaskAndOrder.lineId

5
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt
View File

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