[3.4.0] merge

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -19,6 +19,7 @@ class TrafficLightNetWorkModel {
     }
 
     fun requestRoadID(
+        tileID: Long,
         lat: Double,
         lon: Double,
         bearing: Double,

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -734,19 +734,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
         )
     }
 
-    /**
-     * 10、云端下发任务暂停/恢复指令到pad（type: 100010）-> sweeper_task_cloud_suspend_resume.proto
-     *
-     * @param header            头
-     * @param messageType       消息类型
-     * @param reqNo             请求编号
-     * @param sysTime           当前时间戳
-     * @param bigTaskActionPush 数据
-     */
-    override fun onSweeperFutianCloudTaskCloudSuspendResume(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskActionPush: SweeperTaskCloudSuspendResume.BigTaskActionPush?) {
-        CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskCloudSuspendResume(messageType, reqNo, sysTime, bigTaskActionPush)
-    }
-
     /**
      * 清扫车云端任务未知类型
      *

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt

@@ -86,6 +86,7 @@ class RomaTaxiView @JvmOverloads constructor(
                     ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
                 }
                 ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
+
             } else {
                 romaMode = false
                 if(normalRes!=0){