[6.10.0]
[common] [bridge]
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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?)
|
||||
|
||||
}
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user