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

[Fix]解决合并的冲突

Browse Source
This commit is contained in:
chenfufeng
2023-02-17 21:05:38 +08:00
parent df3e018c30
commit 18f3954545
9 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt
View File

@@ -6,5 +6,7 @@ package com.mogo.eagle.core.function.api.hmi.autopilot
* 自动驾驶控制按钮回调监听
*/
interface IMoGoCheckAutoPilotBtnListener {
fun onCheck(isChecked: Boolean)
fun onCheck(isChecked: Boolean) {}
fun updateHDDataCacheStatus(isCached: Boolean) {}
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
View File

@@ -1,20 +0,0 @@
package com.mogo.eagle.core.function.api.hmi.warning
import android.view.View
import android.view.ViewGroup
import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.map.Infrastructure
import com.mogo.eagle.core.data.notice.NoticeNormalData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.data.report.ReportEntity
import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy
import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
/**
* @author xiaoyuzhou
* @date 2021/8/2 7:36 下午
*/
interface IMoGoWaringProvider : IMoGoHmiViewProxy {
fun updateHDDataCacheStatus(isCached: Boolean)
}