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

[6.4.0][merge] 解决冲突

Browse Source
This commit is contained in:
renwj
2024-04-16 19:14:04 +08:00
parent e4de6ab743 adedc2b131
commit 26eb87434c
422 changed files with 4757 additions and 5533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,10 +4,7 @@ import android.content.Context
import android.view.View
import android.widget.FrameLayout
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_FLOAT_VIEW_MANAGER
import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_STATUS_VIEW_MANAGER
import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
import com.mogo.eagle.core.function.api.hmi.view.IViewLayoutSet
/**
@@ -18,9 +15,6 @@ object CallerHmiFloatViewManager {
private val floatViewProviderApi
get() = ARouter.getInstance().build(PATH_FLOAT_VIEW_MANAGER)
.navigation() as? IViewLayoutSet
private val statusViewProviderApi
get() = ARouter.getInstance().build(PATH_STATUS_VIEW_MANAGER)
.navigation() as? IStatusViewLayout
fun addView(view: View, params: FrameLayout.LayoutParams, movable: Boolean) {
floatViewProviderApi?.addView(view, params, movable)
@@ -30,11 +24,4 @@ object CallerHmiFloatViewManager {
floatViewProviderApi?.removeView(view)
}
fun getView(context:Context):View?{
return if (DebugConfig.isReplaceStatusview()){
statusViewProviderApi?.getStatusView(context)
}else{
null
}
}
}