From 6d37f3ed2885191394824f5f41968729b31ecf8b Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 17 Jan 2023 19:44:44 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81=E5=90=88=E5=B9=B63.0=E5=88=86=E6=94=AF=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../fragment/BaseSweeperTabFragment.java | 22 +-- .../sweeper/view/SweeperTrafficDataView.kt | 164 +++++++++--------- .../mogo/launcher/stageone/ConfigStartUp.kt | 3 +- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 17 +- .../compile_library_classes/debug/classes.jar | Bin 595755 -> 595851 bytes .../runtime_library_classes/debug/classes.jar | Bin 595755 -> 595851 bytes .../incApCache/debug/classpath-structure.bin | Bin 2945367 -> 2945507 bytes .../tmp/kapt3/incApCache/debug/java-cache.bin | Bin 110566 -> 110629 bytes .../status/flow/can/CanImpl.class | Bin 5804 -> 6047 bytes .../status/flow/can/CanImpl.java | 7 +- .../status/flow/can/CanImpl.kapt_metadata | Bin 8829 -> 9360 bytes .../status/flow/can/CanImpl$Companion.class | Bin 939 -> 939 bytes .../status/flow/can/CanImpl$state$2.class | Bin 1372 -> 1372 bytes .../flow/can/CanImpl$timeOutCheck$1.class | Bin 3983 -> 3983 bytes .../status/flow/can/CanImpl.class | Bin 14448 -> 14759 bytes .../status/flow/can/CanImpl.kt | 10 -- .../upgrade/UpgradeApiService.java | 1 - .../hmi/ui/setting/DebugSettingView.kt | 21 --- .../IMoGoAutopilotVehicleStateListener.kt | 4 - .../IMoGoSweeperFutianCleanSystemListener.kt | 7 + ...lerAutopilotVehicleStateListenerManager.kt | 19 -- ...SweeperFutianCleanSystemListenerManager.kt | 11 ++ .../utilcode/mogo/AppIdentityModeUtils.kt | 1 + .../support/adas/high/OnAdasListener.java | 1 + 24 files changed, 119 insertions(+), 169 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index 00cda91fc7..fe71c27688 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -1,6 +1,7 @@ package com.mogo.och.sweeper.fragment; -import android.animation.ObjectAnimator; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; + import android.content.Intent; import android.view.LayoutInflater; import android.view.View; @@ -8,7 +9,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; -import android.widget.TextView; + +import androidx.constraintlayout.widget.Group; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; @@ -16,39 +18,23 @@ import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.data.config.HmiBuildConfig; -import com.mogo.eagle.core.data.constants.DataTypes; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; -import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.MogoMapUIController; -import com.mogo.map.MogoMarkerManager; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.constant.SweeperConst; import com.mogo.och.sweeper.ui.SweeperOperatePanelView; import com.mogo.och.sweeper.view.SweeperTrafficDataView; import com.mogo.och.sweeper.view.SweeperWorkModeView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.Group; -import mogo.telematics.pad.MessagePad; -import record_cache.RecordPanelOuterClass; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; - /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 *

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt index 8304f7a6af..b83891b903 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt @@ -10,13 +10,11 @@ import chassis.Chassis.GearPosition import chassis.Chassis.LightSwitch import chassis.ChassisStatesOuterClass.BMSSystemStates import chassis.ChassisStatesOuterClass.SweeperFuTianTaskSystemStates -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener +import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.v2x.LimitingVelocityListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager.addListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager.removeListener +import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.setProxyTrafficLightView -import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager.addListener -import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager.removeListener +import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -24,7 +22,14 @@ import com.mogo.och.sweeper.R import planning.RoboSweeperTaskIndexOuterClass import kotlin.math.abs -class SweeperTrafficDataView : ConstraintLayout { +class SweeperTrafficDataView : ConstraintLayout, + IMoGoBatteryManagementSystemListener, + IMoGoChassisLamplightListener, + IMoGoChassisSteeringStateListener, + IMoGoChassisThrottleStateListener, + IMoGoChassisGearStateListener, + IMoGoSweeperFutianCleanSystemListener +{ private var tapPositionView //方向盘 : TapPositionView? = null private var speedImage //速度图标 @@ -67,92 +72,95 @@ class SweeperTrafficDataView : ConstraintLayout { override fun onAttachedToWindow() { super.onAttachedToWindow() - addListener(TAG, mIMoGoAutopilotVehicleStateListener) + CallerBatteryManagementSystemListenerManager.addListener(TAG, this) + CallerChassisSteeringStateListenerManager.addListener(TAG, this) + CallerChassisLamplightListenerManager.addListener(TAG, this) + CallerChassisGearStateListenerManager.addListener(TAG, this) + CallerChassisThrottleStateListenerManager.addListener(TAG, this) + CallerSweeperFutianCleanSystemListenerManager.addListener(TAG, this) //增加限速监听 - addListener(TAG, limitingVelocityListener) + CallLimitingVelocityListenerManager.addListener(TAG, limitingVelocityListener) setProxyTrafficLightView(trafficLight!!) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() - removeListener(mIMoGoAutopilotVehicleStateListener) - removeListener(limitingVelocityListener) + CallerBatteryManagementSystemListenerManager.removeListener(TAG ) + CallerChassisSteeringStateListenerManager.removeListener(TAG) + CallerChassisLamplightListenerManager.removeListener(TAG) + CallerChassisGearStateListenerManager.removeListener(TAG) + CallerChassisThrottleStateListenerManager.removeListener(TAG) + CallerSweeperFutianCleanSystemListenerManager.removeListener(TAG) + + CallLimitingVelocityListenerManager.removeListener(limitingVelocityListener) } - private val mIMoGoAutopilotVehicleStateListener: IMoGoAutopilotVehicleStateListener = object : IMoGoAutopilotVehicleStateListener { - override fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex) {} - override fun onSweeperFutianCleanSystemState(cleanSystemState: SweeperFuTianTaskSystemStates) { - if (cleanSystemState.hasSecuCleanWaterTankLow()) { //清水箱水位低不能清洗作业报警信号 - ivBgWaterWarning?.visibility = VISIBLE - ivWater?.isSelected = true + override fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex) {} + override fun onSweeperFutianCleanSystemState(cleanSystemState: SweeperFuTianTaskSystemStates) { + if (cleanSystemState.hasSecuCleanWaterTankLow()) { //清水箱水位低不能清洗作业报警信号 + ivBgWaterWarning?.visibility = VISIBLE + ivWater?.isSelected = true + } else { + ivBgWaterWarning?.visibility = GONE + ivWater?.isSelected = false + } + } + + override fun onBatteryManagementSystemStates(states: BMSSystemStates) { + tvBattery?.text = String.format("%s%", states.bmsSoc) + } + + override fun onAutopilotThrottle(throttle: Float) { + + } + + /** + * 车辆转向灯 + * @param lightSwitch + */ + override fun onAutopilotLightSwitchData(lightSwitch: LightSwitch?) { + //转向灯状态 0是正常 1是左转 2是右转 + if (lightSwitch != null) { + d(TAG, "车辆转向灯:$lightSwitch") + if (lightSwitch.number == 1) { + sweeperTurnSignal?.showLeftSignal() + } else if (lightSwitch.number == 2) { + sweeperTurnSignal?.showRightSignal() } else { - ivBgWaterWarning?.visibility = GONE - ivWater?.isSelected = false + sweeperTurnSignal?.showDirection() } } + } - override fun onBMSSystemStates(bmsSystemStates: BMSSystemStates) { - tvBattery?.text = String.format("%s%", bmsSystemStates.bmsSoc) + /** + * 刹车灯 + * @param brakeLight + */ + override fun onAutopilotBrakeLightData(brakeLight: Boolean) { + d(TAG, "刹车灯:$brakeLight") + } + + /** + * 方向盘转向角 左+右- + * @param steering + */ + override fun onAutopilotSteeringData(steering: Float) { + var steering = steering + d(TAG, "steering原始值====$steering") + if (abs(steering) < 1) { + steering = 0f } + d(TAG, "steering忽略小数点后====" + steering.toInt()) + } - /** - * 车辆转向灯 - * @param lightSwitch - */ - override fun onAutopilotLightSwitchData(lightSwitch: LightSwitch?) { - //转向灯状态 0是正常 1是左转 2是右转 - if (lightSwitch != null) { - d(TAG, "车辆转向灯:$lightSwitch") - if (lightSwitch.number == 1) { - sweeperTurnSignal?.showLeftSignal() - } else if (lightSwitch.number == 2) { - sweeperTurnSignal?.showRightSignal() - } else { - sweeperTurnSignal?.showDirection() - } - } - } - - /** - * 刹车灯 - * @param brakeLight - */ - override fun onAutopilotBrakeLightData(brakeLight: Boolean) { - d(TAG, "刹车灯:$brakeLight") - } - - /** - * 方向盘转向角 左+右- - * @param steering - */ - override fun onAutopilotSteeringData(steering: Float) { - var steering = steering - d(TAG, "steering原始值====$steering") - if (abs(steering) < 1) { - steering = 0f - } - d(TAG, "steering忽略小数点后====" + steering.toInt()) - } - - /** - * 档位 - * @param gear - */ - override fun onAutopilotGearData(gear: GearPosition) { - d(TAG, "司机屏档位$gear") - ThreadUtils.runOnUiThread { - tapPositionView?.updateWithGear(gear) - } - } - - override fun onAutopilotDataException(timestamp: Long) {} - override fun onAutopilotAcc(carAcc: Float) {} - override fun onAutopilotBrake(brake: Float) { - d(TAG, "刹车:$brake") - } - - override fun onAutopilotThrottle(throttle: Float) { - d(TAG, "油门:$throttle") + /** + * 档位 + * @param gear + */ + override fun onAutopilotGearData(gear: GearPosition) { + d(TAG, "司机屏档位$gear") + ThreadUtils.runOnUiThread { + tapPositionView?.updateWithGear(gear) } } diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index 006f28e5fe..8b39af9dc6 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -94,7 +94,8 @@ class ConfigStartUp : AndroidStartup() { CrashReportConstants.buglyAppID = "ac71228f85" if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) || - AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)|| + AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { //控制HMI展示元素 将不用手动调用setXXXXXViewVisibility HmiBuildConfig.isShowSpeedView = false HmiBuildConfig.isShowAutopilotStatusView = false diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index e817aa6431..0730dbd1c8 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -51,7 +51,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListener import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager.invokeAutopilotRotting import com.mogo.eagle.core.function.call.autopilot.CallerPlanningTrajectoryListenerManager.invokeAutopilotTrajectory import com.mogo.eagle.core.function.call.autopilot.CallerStartAutopilotFailedListenerManager.invokeStartAutopilotFailed -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.zhidao.support.adas.high.AdasManager @@ -256,10 +255,6 @@ class MoGoAdasListenerImpl : OnAdasListener { //电量 CallerBatteryManagementSystemListenerManager.invokeBatteryManagementSystemStates(it) } - chassisStates.bmsSystemStates?.let { - //电池管理系统 - CallerAutopilotVehicleStateListenerManager.invokeBMSSystemStates(it) - } chassisStates.taskSystemStates?.let { taskSystemStates -> taskSystemStates.sweeperFutianTaskSystemStates?.let { //清扫车（福田）清扫控制系统状态 @@ -547,20 +542,10 @@ class MoGoAdasListenerImpl : OnAdasListener { override fun onSweeperTaskIndexData(header: MessagePad.Header?, roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex?) { roboSweeperTaskIndex?.let { //清扫车（福田）清扫控制系统状态 - CallerAutopilotVehicleStateListenerManager.invokeSweeperFutianCleanTaskIndexData(it) + CallerSweeperFutianCleanSystemListenerManager.invokeSweeperFutianCleanTaskIndexData(it) } } - /** - * 清扫车指标数据 - * - * @param header 头 - * @param roboSweeperTaskIndex 数据 - */ - override fun onSweeperTaskIndexData(header: MessagePad.Header?, roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex?) { - - } - /** * Bag管理应答 * diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_library_classes/debug/classes.jar b/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_library_classes/debug/classes.jar index efc1b4f360c7fb173738a74495c7ac4595707381..a0520a399b8be699292604b2894e431355c93ea0 100644 GIT binary patch delta 9234 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 delta 9150 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 diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/runtime_library_classes/debug/classes.jar b/core/function-impl/mogo-core-function-devatools/build/intermediates/runtime_library_classes/debug/classes.jar index efc1b4f360c7fb173738a74495c7ac4595707381..a0520a399b8be699292604b2894e431355c93ea0 100644 GIT binary patch delta 9234 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 delta 9150 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 diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin index 4c93d6e3c55ffaef2d933a3323a555cdc00a71ed..7f96cf4b905374c07c0fb0efc6841942710c1f55 100644 GIT binary patch delta 12587 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 DaZ`_7 delta 12653 zcmZ{K2Urxz^Y)Ij~8Z zTW8A6bn9b0K~B&k=$Ba^Gr0H3S=}-$%s0GMc(|{ZuWxI0XiIgQmOkM=6WWG_`Lqjf z$KDqxo%No`D6xv&Ms}Qes%3ZA`_9BtD=eja(F5j8+XMS^eKdu{_ zM~1oXtfE@pf$PB@%;h_BJ)z>tE-&KE*#Hf1#s!E*V(0UA>}@h{LgrgF zu592uzMeHH^_Q7VR!>v6n3@m~*&SN%H6m@ ztn`(koweYN7C~VNVbKW@G0`LsV(%O4d2oYS#RV%*ZV1ct&{J|l*}Lig>2Y*2Z^aE` z^OE_l+;Em%s54e;ZiG&ETcq&LtWFBwo-IhBDx=sH=)U`)bm2xb?<~G)9^7^{h4*EF z^LbN#tgJh;OyWJ+<@vk`JDo&z#)%G3((p!Lt+??*MdU4*Qz~!31+xlEl`E4pOxV~| z-jY+-^h;^gOC3FNXe?jkj!S@C%O9E9HzpYQ~MrVA}e{JbY_(cXhAey%s1iZ z%GBa2N?Odf=QP?`$l&c+m!-ThtR&U+OyEpd^Ch%F=V@22R?}2mfXU(ny<5UtSqd&l z2y+v*6xm7nuN_lUovk)syKA)88gQvK;}#p0rY%jJw$4jw+JeHur^bhclIisScE*I& z&7}3WK-@vX$x@ib3ocoR`fb?iOxi#h(gq@-3A>+3`(=^1fhx0jYa^-Oi&4d&TO#fp zh}gC)(p}0d<7h)l=8cWDnWnO)0#fy)YNd77WQ({LogyaCs%aN;bpuXmnV+o@JFR1$H2R?`=6A~+zM9O$<={d z$<)~fcHAna3AJ(LRc&%&%G}^JKf0R~i%QVs`6qhGyG&JoO5l`o3SR84tW7*T_Ua36jw9x9yEyw&i}ko2tnjn4DYuhZPH}YScCpfd^z0~M+*7%VD`lz%u68*C zPnmK*i>{_;mjmnir>7Hhu~fNWBto}L6>b4>>S+-PGkZp=CsH$e#i<+kRcUF{D=K23 z;G?*hX%V4hcC>?a}Y%Q;<&mCif@_8?=g1zBY&AH>OG@rbCf;pe^v}fbxDm(5Zn{vvt z6?aNp1%iz=)yhWPX=Yii?4~CSlwB|2UAQx3wHx;fn|FieD|juf#I4_yPTX0>kyBZv zxv^m#**Ru;zA-uCquhv@T=6vH&TAd9miE{PPG!wq$bC;8xyar}OIk`ob@WWx^R>JMe_7_t=3Vl%VdjOrId?@E=Ndhg2^&yI&(GhOx{&TW zSDE^i+>tq(scgAxpuF?e@h04Loi$atj-FZ_z}^rSBoXzno^IBx3q6);uCn27!7&ZA ze)xSI`SP}S0u`>O4bfpeUzh(~=E|m=^{mHY*VA$K2c0|WC|<=#p%Hh7sV&HBcg4*p zEYs#ibVIv`$?eD87bn!uQspV`+DaJj#XZ2XZp~ivdPdwsaqZ2qQaN*vbjI*>16}_f z>#Tp(Mt(Xg*vR{fy)C=Hk$0(M^N&-u!}ZYJNeAm#8vR_g>NO3rJ+s}yw{Y;ItipL| z+tTMAtw$a8EBWNxUt>&MS2lJFZ|~p_@yOd#kC&yawm7$^DC&NK!vW%Yuq6-&KwQ42 z)Nb+9ZA}L%JH6PsAqq`3tKE0l6(zGT^04~ijNoWd>AqO zm0=&^CV)@7x2@vkfWwR8hc_H{dbGn`;zGddzdS!%lXK*R>xPjAKaD6KgEbur!L^1Z z{i9Cy3S=S#i}t@6d16JIZ4-}JdTjjr%r)ZXf?xBr=WW}vOW{#} zm3OgNWN?ExTDvlZ!9V?G9-8I<^|i%OgAq=p&cr2w&t>)@&tu-W+7D~sH)EH4BXRS< zpK~?e@W-39Wz9NdIKSPyU(=e%WC%`4#a+O zZ`nZkBEzF&pY=&QMO-%1K)ej%dm*!3N0fyHK6@U&`4WE_Tn^g>@p6b$>bu>!=AZZ? z=*WwZ@m}MxdUDx)i1Q#mxUp5?@}(};Q_LNVoc>+ah&aY9c9FOM;taD-W2c3s^q5z+ zbab@!lD~;t!@5Ac7UBy9c@rXCJ~$8>=Sn40A3e z@h=cBeDk<^N6gEiQx!Kmo+x~ew$HNx5MPAY*=?nBuSH3N-W}Vr#B^&Ha7USj#F{G* z&sgzVec<)+*DbTEe@|cbbPsXAflsvk*}a3?vrgMu)*p2zwemA@*tLq~Tf3ItcTMbk z=BvxTyie{J{dMqm4bK_venfhzsGV9&^m^uwPqT3OW+7k>29S9u>oe0>!U08*k(q4mX9RiY{ z@K^lPm45UHwgi6ybc_hy2uR@23_WOs2?8hUL4YDE^&}t#5Ww{!^d=zTfe)^)Y=Ec$ z5(=;=DfQEqVE_rwM)XKBh(!rqa7biIrpFR5HnrEFIFtZ$Qg!TnvCZ!sZd|%LBYvPW zk~ld5cHjWrCPz^jHb-lD`oXnpSWQDvK!Sqq*v4whl6)MMF%HRK?Xh8P=!`9xiZCZt zS5saZo5W41r4#Z4olxR1Hq@y-wlJ-Jxb~NRaEH?TXB-oWApH&^1Q7JanY;JZ)KU zG3Ap97&VotpR`zDz_#{Wr9kWZ-kVQF7?q5q)+(pfDyLH!>k#@z1awC0YT<^1HWzAn z`VsQFoyIi>YZl)uE1*OVBOnY0EH$#0aK@6$C7Wm4sCU z9OtVE(90*Fw`dy6L-J?=jh2K!Qd~=UEOJRE@r7C*x>5s_m8~PdO@)No zvh`X{*M1RkJlfwtnT>=^1SFK9xS1d|x`pym+DaKTgpqF}6cZ%9?UYBS;gKB#cmxUd ze^>_(MKokgfWe&v$>=W1mk>$`KNEHnq=s;<5ogeYazfvKXrE+z2^NG^tW=?})*PfP z#*SeeBETw!dzb)!Vn0i*KrW?n%3x7Q+!4wf63}Z5^C;mMp+eZJ+;6huR5(F6NkBS9 zki+4&lsQe%oeh+wbcQl$338-g2()K5EnlEtspl6dFD3L0JbZbH+L!%G zxJ-~5xI%d}h~XpsMu2QJ;VJ^q^+XQstceZSRhpPtl;8y%1-6KG3g94@d1eC!eRTA_G=-&f^)Q@hImz?sD@=|(4 z8Pu2TKb8bD;-}E7EIT^grbF4E`wg8+oLjZ_ZQU-^cfy3Q@KCi+NJtxRFW(7mz13}7 zdHMLX^kUu*ot^dId>LD}mp){AJy)8S?RcPkpg>I4i7Ec4)MJ1BsjN?7Q%kj#1B-RG zH)MXR42;>7C!Y1$Z$3&d3X2K>MAT*5|DsR(eejvTGety&ScJeg`Ji;*`iYx6+(qp@N1NX$)iDA1V4UoDKS@44|+l z_1cvQ!HJRh66waOJ}P}E<|#zQq~OA6`liQyR(4>=D7e6lL0v)7fhj&wU&o4}jB#Qp zW4sv32(BHiD9?7o{0X|Exs(Quv}D4&T}^C8uY= ztXJ^v+(i2N>nzR}DLYf>@<)+`2r+yi_!l-!0@cwJqmCnIOs@Ua{-@es?IUY{wU7GY zSNmw4ul6xN3XHHvf6DD^VjS9N#*`lhOX6w*Bn`NDod`fe4!75l!jnQAU|LN$!op6t zYXrm~D)BuaFAM1vf+YEB#EJkL|)&`dPI<>d(eX(mFSbQ<<^P-<0+g z!K9c#7zHndh|%|0!CWz>B((OC6myML<`lye)(L9o_Mt#Sk`O-7#w($kdsWqdOBTWb zDYc>m%(~3To(cAx>Zt7Sut;Tt9??hr*uUiRybp2{E4RT3F|qw3qJ`mykwO|)(=aYw zr!Q33o-M9Jomo(OJQqmBEvy}d$PlMQXxK_mWsQax2|)%Sn6g+5rYsSIDNDs*N~TUQ zg#wHSrexO+$SgzOyqT?@sv(ynE=Zw`2tAb8X_BvL@ddv+YJId-Nku zjLlNLCdNTwAu(~GL^3u&U)7tUiCylPJJyk{%u!Xfs6!9WDSNFNQ8@~Qg@BsaYUIz?-wrf%KC!qrnF6G*n6d1u(Ta1=m9#IZ(&H87%4ZxDBD4Qu8$ zBqpX?WK2Bfa$_y4?5vT>gx^H}>QV7j>7+g2D&Z$vW0gI>nLhjv(pPn1(Z;I!{1(}$ zno?bZR&L&8a4Q@1l;UUGzWb16nW*IYg0NUT?!>N`s4TecEW4hOJB1P}ogJG~C^5E> z0%E&#+%(=)Wz3h*u_&}!Y)UJv6f@C~-8WUaQE>5l0BSe>SDp zdvy+|yJj?+ee~ZyOWxDrEd*D;N2OifK8HE&uf4V_{3y<7G z6rLg{y08uwv=|SI;i+;QG}=xQZ_aL7sOs@Y{u9YMD(>fCh02wpio(A>d=F<;;M8+t zZxt$U3Nn(heiUS+Q$lN#cxRo1_at^>XED(H{meS0vs{l^sSH^gE0qhyA%&p15dAuX zyw)UXI8iY2`+q|T;jpv+wc*G{TB|JB{WEl$D6J^B)S7~56qCe%450UASFBa9Id}$FqUc7g_l< zE)4W_4>^@dTwit|uOnF}h(|+w^6^W*8(kMWUM{#-IKVRC32|ds6vQDA$Im?7-m1mW3D>$! z`LL|&2-*&11rSe!IJ;AC`wwQj3}5uVvuwuA`U{DRU>6~t4srWw(UBKYn)h9~_{OSo zs~t|n&1PRAo(pm7zh7qRkJvdWs(05R%6LAOI1Ou7m&EfRKC}PcChnJ#m7nJ1ZQyTR z#@obvHWuPEh&NQ4k1^kJdsR|eU1PteBXFHdXG50!Os|U**3ZJ zE61Dq-Sh7?(Z~D7Ch(=5PtV->;L=-{(dP62ZJPoA;f+c0blu8{-(Kc6Fv?38o>(uU z)K`*8um$fJil!I4-5YIoXI-A*nFVIfTg*s+_bP?KQh)!dRk0Jc_h>S`Zh-wC#KGl? z)v5Kz9~gD)Z?1*awtvq=o+1v{dU|Sc>3$ViX)SY zo&_EIa%c&0CE(46PkpWF>ficwU}9#%tv^mHh{Ow=qIm~H&G3y^cjSiNem17!EtVx- zy%aav>`Fen>23E%B!C4{??AUliH(!GVm*B72eyr$@61| zci=F&`|LKv9Rh#)((`wRQdX>rkBij&`P%oB9g*;%!oy&>n`xNgdi%HKI}X12gf)OS zB1KkqllvKm4$gGUk~eCzWK$#JD!^C#J$ymxoe=}0j#h;XXQw9-cLMyZ^7X$zsc!qk zIyc{GjOGhoh~OnfV&c&>%f-?aWq5^C7%LU(3uZw}d$j9xvfY(d zSes|Tcbl46Ug^2`*$J0MVH<-iu_(@!9d}ge)nOMJNT-IGlWL~$64af0thAqB*^p$(35l^??sSwaOm)aJ_Oi>9H}n>^$hWGq90`-L?d`x3MAk- zg7E=_frLSXAi`jRWPAwaVI1|bZH5t$a8|+A2<uyB9FtcE>lh6|VKf1~ zk~#wg$dJYm(C}CS^_s%vVq`p+eqqd*AnB_q4_!1ofe=D~j%1gzLU0@0xYqP1i~!|u z!bAdki6x<1A%eYBoavdL`66f4a_58StJuu2$GJ}IP~TdU_6zO zMnHYZ1{#+*$iX9}6Huq8tkr*ev_LDslS68Zva$>UW(-)wGF2-3LFfbQWfRa2j&ayT zS$B{*RF)P5oQvfv^?y0#a|!wcL*``VV6P#6(!bnLc{Ks{VLP9IIt2vG@freB9s#g^{SARHvJc0X^$86KP6X#Ni&jeCo#_b;RRkA;E5VJ>kkE+WPH0T<&>$ra0E6ivOL%^*cb8A7_Zq^pG){oWZblLJh`hM?f{nJ0sK6~EJ`+45a z^Zxuin>#$0+xY?C@1jIbKgd>fvFk?Z+)Jw-tmTuO&7PKKUntZRI#}^g`0=p!NHEwE zY^(Q04(|vBg0Wrg(O}!X&Av$Fe_?s1fpXnf&)5Roa@I=~w_3T|D3`1CY?PlG_>7fu zw~&z00NZu=Q7#$Wm#y8Vrq{To^GO!UXd^N1*Y17X0v>fCnUc!2G zIEQhWX=Mcy`bsO+oIHVb~IeBxAJ=u-93=ni?WjUt(Riax&5bw_A7 z_(SSk+-&4uQ(Iha>5rTEvIIBqr|Oz2maiKr6mNnszpL7NqH1#gRvmwuc}&sf$tw-J zLsjiBl8FxP#K=fjZ%=yknWOA8D9!e^yDVQS4EsuRg*)VU7uP73k{VJn|0+(s^BA)R zo7Cw8%ME*tn9Ed2M>j>L7gq0)Zc=QPikB&q&gWUcdX@YwLv={Hmz(6{9u}&T(N((p z1rEV(x!S|S?8z+9_#&EGwb7fVjA3&Tw{&$ za8Ra7{#Cf)6~2MzvOtHJ*H39v`c61uNmP}KmKgTq>dQA%y6ObyVaV*gS}%Q_)tGLX zU+_ANSvlEz%A~!olc(5b@cDnK^Xl?+LeKUy2I)-t+*<^g5!20tn0c2TAK)VVs^$jV zYOc?ruAI!1i9u>4e~`cUAvMIO2J>=u6}$C{5w^p1)tkS$CHS``hTF?rEZvd)sik!muDWaK5RjG%oh6_!AxZH delta 932 zcmYk5e@N749LMkVHBV1hNS#`(<)viPjn)mKoU&PLQ7}q(mZR7_(`07enceDkZQ{k& z50#Rh)(0a?ZAEktHN;0oMK@@JD5fx!_D2&28%Q;_1uM2{&-Z)#qkkTFKA-3Pd|sc= z`+3ezxqtoH-8szN4a}Fp^{kdXiX3VCf(&`w#CAPY#f>xxgs9a|YUrN9%W^q@pAxAK z@k;tmS4U>4tZJrA{;6Sw+=^4G?uWh7x0(0wNoXZkrLvxMeQ^tSEZ$D3-%(@5B@!$) zRVr&qm)}1m${PJq9rK}F-As(gvL$3_qugcDD8mhuuubkZP(+i8C-Y@qBMb7kMqJq~ z;mD5W(9(D7W1rYC4G~w7#5XcW>Ke&q%X0)Pwy_|M&J;mhCBv^~+KPP<*OH@^1yVkf zEGgd1ay_@13Wz=@&2Qnh#gHR)pRrY6srqn_oDUJ;g#I_goHVYe!KRn2%xn6!c9xTI zHEN$5)-AjE#o|sX`ID-bTyCrCi4MbCU|G?xN6bcjNJ^#Po;+kB}{S zJxz@!}8{1RsVE1>S*`Ue-F*R_#!cl9Zo*=u`J`}Q- zu=r0JWzf*M+w8zjwfDy&btq9Rt%r>pO_F@kv}7tz!{-i>964-W%co+7?;z#sz)`z- z*v{8_x{oy$->0@o^ zoBi~`grk)wr)XqMjG<0;qxKJQ8h+E`gS5hwe(Mb1Sv-}?h330_aE`U`x9XmZX>->f skguyQG7IL)q6Eju(W42(!vBBxb?H4zjcS|pst4nn?6;X!8g)hg1JeLUe*gdg diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incrementalData/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.class b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incrementalData/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.class index a40280c1d00890fa69605b1a65176feca3952b07..d8cc351021dbcae3beb7b4fc1f2179549f688d71 100644 GIT binary patch delta 752 zcmbu5&rTCj6vn@EG1DngGi@xX#04Z8aA8UaCPwL$@-O^T2q1|G1qM4}rA%vQDpi3N zU*SFgJb)Y0g^3H(xM0BsUcfgnVM$y-I5SMl5ZJMp`JMZn?|ixUe1Ec&xN~s!^A~^~ zY!i~QJ(AoTt0>CLM(y`5$s^^l{G+JypOTM=W)bI4ZBiSxc%#;qmR6{X()FECjAELW zY!zLt-HN6&QzI>7s@5lesCu}cAhO+rlx&OW_1>@=sy--KGwY^VG)u!}Cudl*hP^s! zWzEW<;TVK_rNVN-H~eoA^oe5Lu&kW5l9;~6Fj;oY(m>v@?T6R3Ul49Pxiyn*azgt? zi}FzGpttoC&7f4e^G4bAndm814JddwtHK zcqz;?zrn|=;t)zf@gn{eY*Yg`cOMuFY%r;yxT243pCw@y8(eXYRqG~AA3Xt@^7pWwlQxbV`JeQn$MUI delta 496 zcmbQQzebn$)W2Q(7#J8#7-|_AY$pa9ZM1J@V>3R`aA*eOoC$3FS0Ko?`or2\b\u0012\u0004\u0012\u00020\u00020\u00012\u00020\u00032\u00020\u00042\u00020\u00052\u00020\u00062\u00020\u00072\u00020\b2\u00020\t2\u00020\n2\u00020\u000b:\u0001>B\r\u0012\u0006\u0010\f\u001a\u00020\r\u00a2\u0006\u0002\u0010\u000eJ\b\u0010\u0017\u001a\u00020\u0018H\u0002J\u0010\u0010\u0019\u001a\u00020\u001a2\u0006\u0010\u001b\u001a\u00020\u001cH\u0016J\u0010\u0010\u001d\u001a\u00020\u001a2\u0006\u0010\u001e\u001a\u00020\u001cH\u0016J\u0010\u0010\u001f\u001a\u00020\u001a2\u0006\u0010 \u001a\u00020\u0018H\u0016J\u0010\u0010!\u001a\u00020\u001a2\u0006\u0010\"\u001a\u00020#H\u0016J\u0010\u0010$\u001a\u00020\u001a2\u0006\u0010%\u001a\u00020&H\u0016J\u0012\u0010\'\u001a\u00020\u001a2\b\u0010(\u001a\u0004\u0018\u00010)H\u0016J\u001a\u0010*\u001a\u00020\u001a2\u0006\u0010+\u001a\u00020,2\b\u0010-\u001a\u0004\u0018\u00010.H\u0016J\u0012\u0010/\u001a\u00020\u001a2\b\u00100\u001a\u0004\u0018\u000101H\u0016J\u0010\u00102\u001a\u00020\u001a2\u0006\u0010+\u001a\u000203H\u0016J\u0010\u00104\u001a\u00020\u001a2\u0006\u00105\u001a\u00020\u001cH\u0016J\u0010\u00106\u001a\u00020\u001a2\u0006\u00107\u001a\u00020\u001cH\u0016J\b\u00108\u001a\u00020\u001aH\u0016J\b\u00109\u001a\u00020\u001aH\u0016J\u0010\u0010:\u001a\u00020\u001a2\u0006\u0010;\u001a\u00020\u001a\u00020?H\u0016J\b\u0010@\u001a\u00020\u001aH\u0002R\u0010\u0010\u000f\u001a\u0004\u0018\u00010\u0010X\u0082\u000e\u00a2\u0006\u0002\n\u0000R\u001b\u0010\u0011\u001a\u00020\u00128BX\u0082\u0084\u0002\u00a2\u0006\f\n\u0004\b\u0015\u0010\u0016\u001a\u0004\b\u0013\u0010\u0014\u00a8\u0006B"}, d2 = {"Lcom/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl;", "Lcom/zhjt/mogo_core_function_devatools/status/flow/IFlow;", "Lcom/zhjt/mogo_core_function_devatools/status/entity/CanStatus;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisAccStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisSteeringStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisGearStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisBrakeStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisThrottleStateListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoChassisLamplightListener;", "Lcom/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCleanSystemListener;", "ctx", "Landroid/content/Context;", "(Landroid/content/Context;)V", "job", "Lkotlinx/coroutines/Job;", "state", "Ljava/util/concurrent/atomic/AtomicInteger;", "getState", "()Ljava/util/concurrent/atomic/AtomicInteger;", "state$delegate", "Lkotlin/Lazy;", "isCanEnabled", "", "onAutopilotAcc", "", "carAcc", "", "onAutopilotBrake", "brake", "onAutopilotBrakeLightData", "brakeLight", "onAutopilotDataException", "timestamp", "", "onAutopilotGearData", "gear", "Lchassis/Chassis$GearPosition;", "onAutopilotGuardian", "guardianInfo", "Lmogo_msg/MogoReportMsg$MogoReportMessage;", "onAutopilotIpcConnectStatusChanged", "status", "", "reason", "", "onAutopilotLightSwitchData", "lightSwitch", "Lchassis/Chassis$LightSwitch;", "onAutopilotStatusRespByQuery", "Lsystem_master/SystemStatusInfo$StatusInfo;", "onAutopilotSteeringData", "steering", "onAutopilotThrottle", "throttle", "onCreate", "onDestroy", "onSweeperFutianCleanSystemState", "cleanSystemState", "Lchassis/ChassisStatesOuterClass$SweeperFuTianTaskSystemStates;", "onSweeperFutianTaskIndexData", "roboSweeperTaskIndex", "Lplanning/RoboSweeperTaskIndexOuterClass$RoboSweeperTaskIndex;", "timeOutCheck", "Companion", "mogo-core-function-devatools_debug"}) public final class CanImpl extends com.zhjt.mogo_core_function_devatools.status.flow.IFlow implements com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisAccStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisSteeringStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisGearStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisBrakeStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisThrottleStateListener, com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener, com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener, com.mogo.eagle.core.function.api.autopilot.IMoGoSweeperFutianCleanSystemListener { @org.jetbrains.annotations.NotNull() public static final com.zhjt.mogo_core_function_devatools.status.flow.can.CanImpl.Companion Companion = null; @@ -72,6 +72,11 @@ public final class CanImpl extends com.zhjt.mogo_core_function_devatools.status. chassis.ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) { } + @java.lang.Override() + public void onSweeperFutianTaskIndexData(@org.jetbrains.annotations.NotNull() + planning.RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex roboSweeperTaskIndex) { + } + @java.lang.Override() public void onAutopilotGuardian(@org.jetbrains.annotations.Nullable() mogo_msg.MogoReportMsg.MogoReportMessage guardianInfo) { diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata index b1a3efbb62539d66dd83d40994c41baf72a65d3f..ea8e5eec55f72a1f1292e7611e7efe25efdf7815 100644 GIT binary patch delta 680 zcmezCGQm@D&07Z6Dh37?1|VPrVyTIOznKFVd?qjCw43b9c#N@dqM*a%5T;#BtlFCe zm{}QFSOpl0!Ls2jZJk%Qw&G6lP@BXD9*-{o{JbxN-9XZc|2PBZerj&>LBy$w%0>vGDLR1b_v~ z`1Ug|Vh9DZ8~IPL@JccSfjQFz4l++?m=9z-Y@Q`3#>m1az%U!cn>UH6IAk{py=e+a;f!E`FT)3x|Nn>Cg#C? t3JwfdSmcBWKP2%` zj$(>bNnBN8n32vU_N`f|jxbh-oN&ijgT^7jbqv>a6{

>jchuLU^M;WriB0#KTL& z16_bgVZM26_}X?x@>)^05ekqM_}5q`Yg)||CX~X2Kyh!UC}Vnov;d3dYnp>mp*OuU zmc0zOEElZ(9YzG)vsUOl6uFLR`-+3GjvA~8XT0l!nM<(2gV6tX@lkeRG!PXnEYqz? z?;KUhx{7MIiU%ailq5{?lqf#+lv-&OV=tx^J)>b5=2iqho%a%}qm>RIaaEezi3m>J zK`b-WQ!n4D18?0|tqR9_yH@b*O1R^* delta 19 Zcmcb^b%$$11q-9*lNY;=%O5u72M@ttI#)kYg1 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 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt index df80dc8616..b0f3df3085 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt @@ -5,12 +5,6 @@ import android.util.Log import chassis.Chassis.GearPosition import chassis.Chassis.LightSwitch import chassis.ChassisStatesOuterClass -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager -import com.mogo.eagle.core.utilcode.kotlin.safeCancel import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.utilcode.kotlin.safeCancel @@ -24,7 +18,6 @@ import mogo_msg.MogoReportMsg.MogoReportMessage import planning.RoboSweeperTaskIndexOuterClass import system_master.SystemStatusInfo.StatusInfo import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.atomic.AtomicInteger internal class CanImpl(ctx: Context) : IFlow(ctx), @@ -113,9 +106,6 @@ internal class CanImpl(ctx: Context) : timeOutCheck() } - override fun onBMSSystemStates(bmsSystemStates: ChassisStatesOuterClass.BMSSystemStates) { - - } override fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates) { send(CanStatus(isCanEnabled())) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.java index 02f5f818b4..49af8f57fc 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.java @@ -7,7 +7,6 @@ import okhttp3.RequestBody; import retrofit2.http.Body; import retrofit2.http.Headers; import retrofit2.http.POST; -import retrofit2.http.Query; /** * @author lixiaopeng diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 7ddc5218a3..379c962b4b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -15,8 +15,6 @@ import androidx.annotation.RequiresApi import androidx.appcompat.widget.PopupMenu import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import androidx.core.view.MenuCompat -import androidx.recyclerview.widget.LinearLayoutManager import androidx.core.view.* import chassis.Chassis import chassis.ChassisStatesOuterClass @@ -47,7 +45,6 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListen import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener -import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy import com.mogo.eagle.core.function.business.routeoverlay.* import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager @@ -79,8 +76,6 @@ import com.mogo.eagle.core.utilcode.util.* import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* import com.zhidao.easysocket.utils.L -import com.zhidao.support.adas.high.other.permission.BackgrounderPermission -import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.mogo_core_function_devatools.env.* import kotlinx.android.synthetic.main.view_debug_setting.view.* import mogo.telematics.pad.MessagePad @@ -88,23 +83,11 @@ import mogo_msg.MogoReportMsg import planning.RoboSweeperTaskIndexOuterClass import java.text.SimpleDateFormat import java.util.* -import kotlin.collections.ArrayList -import kotlin.collections.List -import kotlin.collections.Map -import kotlin.collections.MutableList -import kotlin.collections.MutableMap -import kotlin.collections.arrayListOf import kotlin.collections.component1 import kotlin.collections.component2 import kotlin.collections.component3 import kotlin.collections.component4 -import kotlin.collections.first -import kotlin.collections.forEach -import kotlin.collections.iterator -import kotlin.collections.mutableMapOf -import kotlin.collections.removeLast import kotlin.collections.set -import kotlin.collections.sortByDescending import kotlin.math.abs @@ -2076,10 +2059,6 @@ class DebugSettingView @JvmOverloads constructor( } - override fun onBMSSystemStates(bmsSystemStates: ChassisStatesOuterClass.BMSSystemStates) { - - } - /** * 清扫车（福田）清扫控制系统状态 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt index 978e4ea0d5..dffc550030 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt @@ -1,9 +1,5 @@ package com.mogo.eagle.core.function.api.autopilot -import chassis.Chassis -import chassis.ChassisStatesOuterClass -import planning.RoboSweeperTaskIndexOuterClass - /** * 车辆底盘 数据 回调监听 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCleanSystemListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCleanSystemListener.kt index e255f5a660..b4a3bf9093 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCleanSystemListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoSweeperFutianCleanSystemListener.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.api.autopilot import chassis.ChassisStatesOuterClass +import planning.RoboSweeperTaskIndexOuterClass /** * 清扫车（福田）清扫控制系统状态 @@ -10,4 +11,10 @@ interface IMoGoSweeperFutianCleanSystemListener { * 清扫车（福田）清扫控制系统状态 */ fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates) + + + /** + * 清扫车（福田）指标数据 贴边数据 + */ + fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt index 021636cd70..0b846cdd23 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt @@ -34,23 +34,4 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase 2 isBus(appIdentityMode) && isPassenger(appIdentityMode) -> 3 isBus(appIdentityMode) && isDriver(appIdentityMode) -> 4 + isSweeper(appIdentityMode) -> 6 else -> 0 } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java index 8e91c05be5..53291c61ae 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java @@ -6,6 +6,7 @@ import com.zhidao.support.adas.high.common.ProtocolStatus; import bag_manager.BagManagerOuterClass; import chassis.ChassisStatesOuterClass; +import chassis.VehicleStateOuterClass; import function_state_management.FunctionStates; import mogo.telematics.pad.MessagePad; import mogo_msg.MogoReportMsg;