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

Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0

Browse Source 
# Conflicts:
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
This commit is contained in:
yangyakun
2024-12-26 15:31:03 +08:00
parent 61f9ec5f09 0ff3f34599
commit 434d781511
57 changed files with 822 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
View File

@@ -24,9 +24,6 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
@Volatile
private var inOrder: Boolean = false
@Volatile
private var orderId: String = ""
private val isLoginStatus by lazy { AtomicBoolean(false) }
override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) {
@@ -35,7 +32,6 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
listener.invokeLoginNo(loginNo)
listener.invokeCarNo(no)
listener.invokeOrderStatus(inOrder)
listener.invokeAutopilotOrderId(orderId)
}
fun invokeLoginNo(loginNo: String?) {
@@ -96,23 +92,12 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
return isLoginStatus.get()
}
fun invokeOrderID(orderId: String) {
this.orderId = orderId
M_LISTENERS.forEach {
it.value.invokeAutopilotOrderId(orderId)
}
}
fun invokeOchInfo(ochInfo: OchInfo) {
M_LISTENERS.forEach {
it.value.invokeOchInfo(ochInfo)
}
}
fun getOrderId(): String {
return orderId
}
fun getCarModel(): Carmodel? {
return carModel
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt
View File

@@ -48,8 +48,4 @@ object CallerDataCenterBizManager: IOchFunctionCallNotify {
dataCenterBizProviderApi?.notifyLoginStatus(isLogin)
}
override fun notifyOrderID(orderID: String) {
dataCenterBizProviderApi?.notifyOrderID(orderID)
}
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt
View File

@@ -130,8 +130,4 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
override fun onOrderRemoval() {
CallerDataCenterBizManager.notifyOrderRemoval()
}
override fun setOchAutopilotOrderId(orderId: String) {
CallerDataCenterBizManager.notifyOrderID(orderId)
}
}