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

Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-d_230217_1.0.1'

Browse Source 
[Fix]解决合并的冲突

See merge request zhjt/AndroidApp/MoGoEagleEye!550
This commit is contained in:
wangmingjun
2023-02-17 13:11:38 +00:00
parent dcd02be11c 18f3954545
commit 30a06cd575
9 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt
View File

@@ -30,5 +30,11 @@ object CallerHmiListenerManager : CallerBase<IMoGoCheckAutoPilotBtnListener>() {
}
}
fun invokeHDDataCacheStatus(isCached: Boolean) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.updateHDDataCacheStatus(isCached)
}
}
}

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

@@ -211,8 +211,4 @@ object CallerHmiManager {
fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) {
hmiProviderApi?.updateStatusBarDownloadView(insert, tag, progress)
}
fun updateHDDataCacheStatus(isCached: Boolean) {
waringProviderApi?.updateHDDataCacheStatus(isCached)
}
}

5
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
View File

@@ -6,8 +6,7 @@ import com.mogo.eagle.core.function.api.map.IMogoMapService
import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.map.hdcache.IHdCacheListener
import com.mogo.map.listener.IMogoHosListenerRegister
import com.mogo.map.location.IMogoLocationClient
import com.mogo.map.location.IMogoGDLocationClient
import com.mogo.map.marker.IMogoMarkerManager
import com.mogo.map.overlay.IMogoOverlayManager
import com.mogo.map.uicontroller.IMogoMapUIController
@@ -44,7 +43,7 @@ object CallerMapUIServiceManager {
return serviceProvider?.overlayManager
}
fun getGDLocationServer(context: Context):IMogoGDLocationClient?{
fun getGDLocationServer(context: Context): IMogoGDLocationClient?{
return serviceProvider?.getGDLocationServer(context)
}
}