[2.13.0-arch-opt] merge

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IOchBusView.kt

@@ -1,16 +0,0 @@
-package com.mogo.eagle.core.function.api.hmi.view
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.LinearLayout
-
-/**
- * 定义红绿灯View具备的功能接口
- */
-abstract class IOchBusView(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
-        LinearLayout(context, attrs, defStyleAttr) {
-
-    open fun showBusOperation(){}
-
-    open fun changerOperationStatus(isOut:Boolean){}
-}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt

@@ -10,7 +10,6 @@ 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
@@ -80,26 +79,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
      */
     fun setCloudWeaknessTraffic(isOpen: Boolean)
 
-    /**
-     * 开关DebugView
-     */
-    fun toggleDebugView()
-
-    /**
-     * 开关SOPSettingView
-     */
-    fun toggleSOPView()
-
-    /**
-     * 展示VR下V2X预警
-     *
-     * @param poiType      V2X类型
-     * @param alertContent 提醒文本
-     * @param ttsContent   tts语音播报消息
-     * @param tag          tag绑定弹窗的标志
-     */
-    fun showWarningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, tag: String?, listener: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long)
-
     /**
      * 不展示顶部弹窗，其它保留
      */
@@ -210,10 +189,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
 
     fun hideToolsView()
 
-    fun showMaskView()
-
-    fun hideMaskView()
-
     /**
      * 加载全览模式图层
      */
@@ -256,12 +231,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
      */
     fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo)
 
-    /**
-     *注册工控机升级提示圆点View的回调
-     * @param 提示圆点View
-     */
-    fun registerUpgradeTipsCallback(tipsView: () -> View)
-
     /**
      * 工控机重启返回结果
      * @param code
@@ -279,8 +248,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
 
     fun showVideoDialog(infList: List<Infrastructure>)
 
-    fun setBusOperationView(view:IOchBusView)
-
     /**
      * 设置状态栏暗夜或明亮模式
      * 默认 light