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

Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0

Browse Source
This commit is contained in:
bxb
2023-01-09 18:50:02 +08:00
parent 639a528246 c2c4d3c6d2
commit bd31ae6f35
27 changed files with 726 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
View File

@@ -40,8 +40,8 @@ import java.util.HashMap;
import java.util.List;
import chassis.Chassis;
import chassis.ChassisStatesOuterClass;
import chassis.SpecialVehicleTaskCmdOuterClass;
import chassis.VehicleStateOuterClass;
/**
* 清扫车操作面板View
@@ -179,7 +179,7 @@ public class SweeperOperatePanelView extends LinearLayout {
}
@Override
public boolean onCheckIfCmdSuccess(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
boolean success = false;
if (cleanSystemState == null) {
return success;
@@ -285,7 +285,7 @@ public class SweeperOperatePanelView extends LinearLayout {
}
@Override
public boolean onCheckIfCmdSuccess(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
boolean success = false;
if (cleanSystemState == null) {
return success;
@@ -403,7 +403,7 @@ public class SweeperOperatePanelView extends LinearLayout {
}
@Override
public boolean onCheckIfCmdSuccess(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
boolean success = false;
if (cleanSystemState == null) {
return success;
@@ -491,7 +491,7 @@ public class SweeperOperatePanelView extends LinearLayout {
}
@Override
public boolean onCheckIfCmdSuccess(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
public boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
boolean success = false;
if (cleanSystemState == null) {
return success;
@@ -791,7 +791,7 @@ public class SweeperOperatePanelView extends LinearLayout {
}
@Override
public void onSweeperFutianCleanSystemState(@NonNull VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
public void onSweeperFutianCleanSystemState(@NonNull ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
long current = System.currentTimeMillis();
if (current - mCurrentTimeMillis <= VEHICLE_STATE_INTERVAL_MILLIS) {
return;
@@ -842,7 +842,7 @@ public class SweeperOperatePanelView extends LinearLayout {
mSyncingVehicleState = true;
}
private synchronized void onSyncVehicleStateCallBack(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
private synchronized void onSyncVehicleStateCallBack(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
if (cleanSystemState == null) return;
mSyncingVehicleState = false;
// 清扫作业开启状态（以电机状态为true代表Open成功，实际控制端控制步骤为：1.发送远程控制上装指令 2.发送电机启动指令）
@@ -934,7 +934,7 @@ public class SweeperOperatePanelView extends LinearLayout {
* @param cleanSystemState
* @return
*/
private boolean checkIfCleanModePureSweep(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
private boolean checkIfCleanModePureSweep(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
// 作业模式状态
// 洗扫
boolean clean_mode_wash_sweep = cleanSystemState.getSecuModWashSweepSts();
@@ -1051,7 +1051,7 @@ public class SweeperOperatePanelView extends LinearLayout {
void onCountDownTick(int senonds);
boolean onCheckIfCmdSuccess(VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState);
boolean onCheckIfCmdSuccess(ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState);
void onCmdSuccess();