Merge branch 'robosweeper-d-app-module_290_0816' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into robosweeper-d-app-module_290_0816

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -4,6 +4,7 @@ import android.Manifest.permission
 import android.content.Context
 import android.util.Log
 import androidx.annotation.RequiresPermission
+import chassis.SpecialVehicleTaskCmdOuterClass
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
@@ -545,4 +546,9 @@ class MoGoAutopilotProvider :
         Log.d(TAG, "---- sendStatusQueryReq ----")
         AdasManager.getInstance().sendStatusQueryReq()
     }
+
+    override fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd) {
+        Log.d(TAG, "---- sendSweeperFuTianTaskCmd ----")
+        AdasManager.getInstance().sendRoboSweeperFuTianTaskCmd(fuTianTaskCmd)
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.mogo.eagle.core.function.autopilot.adapter
 
-import android.util.*
 import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
@@ -45,7 +44,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPointCloudList
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager.invokeAutopilotRecordResult
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.network.utils.*
 import com.zhidao.support.adas.high.AdasManager
 import com.zhidao.support.adas.high.OnAdasListener
 import com.zhidao.support.adas.high.common.ProtocolStatus
@@ -57,7 +55,6 @@ import mogo_msg.MogoReportMsg
 import perception.TrafficLightOuterClass
 import prediction.Prediction
 import record_cache.RecordPanelOuterClass
-import rule_segement.MogoPointCloudOuterClass
 import system_master.SystemStatusInfo
 
 /**
@@ -162,7 +159,10 @@ class MoGoAdasListenerImpl : OnAdasListener {
             CallerAutopilotVehicleStateListenerManager.invokeAutopilotThrottle(vehicleState.throttle)
             //刹车
             CallerAutopilotVehicleStateListenerManager.invokeAutopilotBrake(vehicleState.brake)
-
+            //清扫车（福田）清扫控制系统状态
+            vehicleState.sweeperFutianCleanSystemState?.also {
+                CallerAutopilotVehicleStateListenerManager.invokeSweeperFutianCleanSystemState(it)
+            }
         } else {
             CallerAutopilotVehicleStateListenerManager.invokeAutopilotDataException(header.timestamp.toLong())
         }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
@@ -23,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import org.jetbrains.annotations.NotNull;
 
 import chassis.Chassis;
+import chassis.VehicleStateOuterClass;
 import mogo.telematics.pad.MessagePad;
 
 public class MoGoHandAdasMsgManager implements
@@ -166,4 +168,9 @@ public class MoGoHandAdasMsgManager implements
     public void onAutopilotBrake(float brake) {
 
     }
+
+    @Override
+    public void onSweeperFutianCleanSystemState(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
+
+    }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt

@@ -4,6 +4,7 @@ import android.content.*
 import android.util.Log
 import chassis.Chassis.GearPosition
 import chassis.Chassis.LightSwitch
+import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.utilcode.kotlin.*
@@ -81,6 +82,11 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
         timeOutCheck()
     }
 
+    override fun onSweeperFutianCleanSystemState(cleanSystemState: VehicleStateOuterClass.SweeperFuTianCleanSystemState) {
+        send(CanStatus(isCanEnabled()))
+        timeOutCheck()
+    }
+
     override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) {
         super.onAutopilotGuardian(guardianInfo)
         send(CanStatus(isCanEnabled()))

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -19,6 +19,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import chassis.Chassis
+import chassis.VehicleStateOuterClass
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
@@ -1984,6 +1985,13 @@ class DebugSettingView @JvmOverloads constructor(
 
     }
 
+    /**
+     * 清扫车（福田）清扫控制系统状态
+     */
+    override fun onSweeperFutianCleanSystemState(cleanSystemState: VehicleStateOuterClass.SweeperFuTianCleanSystemState) {
+
+    }
+
     /**
      * 吐司提示
      */

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

@@ -28,6 +28,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import org.jetbrains.annotations.NotNull;
 
 import chassis.Chassis;
+import chassis.VehicleStateOuterClass;
 import mogo.telematics.pad.MessagePad;
 import mogo_msg.MogoReportMsg;
 import system_master.SystemStatusInfo;
@@ -170,6 +171,10 @@ public class SteeringWheelView extends ConstraintLayout {
 
     private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() {
 
+        @Override
+        public void onSweeperFutianCleanSystemState(@NonNull VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
+        }
+
         /**
          * @param brake 刹车
          */

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

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import org.jetbrains.annotations.NotNull;
 
 import chassis.Chassis;
+import chassis.VehicleStateOuterClass;
 
 /**
  * @author Jing
@@ -123,6 +124,10 @@ public class TrafficDataView extends ConstraintLayout {
     }
 
     private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() {
+        @Override
+        public void onSweeperFutianCleanSystemState(@NonNull VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
+        }
+
         /**
          * 车辆转向灯
          * @param lightSwitch