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

[6.5.1]Bus考试合并到主分支

Browse Source
This commit is contained in:
xuxinchao
2024-07-29 16:01:09 +08:00
parent b65c5b3b23
commit fae45e0cd4
10 changed files with 143 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -14,6 +14,7 @@ import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_SOCKET_AUT
import android.content.Context;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -2408,6 +2409,40 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
return sendSetParamReq(AdasConstants.MapSystemParamType.RAMP_THETA_VALID_VALUE, String.valueOf(enable));
}
/**
* 座椅压力
* TODO 目前仅襄阳牌照考试支持
*
* @param driver 主驾是否有人
* @param copilot 副驾是否有人
* @param backRow 后排是否有人
* @return boolean
*/
@Override
public long sendSeatPressure(boolean driver, boolean copilot, boolean backRow) {
Log.i(TAG, "主驾是否有人=" + driver + " 副驾是否有人=" + copilot + " 后排是否有人=" + backRow);
int value = 255;
if (driver && !copilot && !backRow) {
value = 0;
} else if (!driver && copilot && !backRow) {
value = 1;
} else if (driver && copilot && !backRow) {
value = 2;
} else if (!driver && !copilot && backRow) {
value = 3;
} else if (driver && !copilot && backRow) {
value = 4;
} else if (!driver && copilot && backRow) {
value = 5;
} else if (driver && copilot && backRow) {
value = 6;
} else if (!driver && !copilot && !backRow) {
value = 7;
}
Log.i(TAG, "\n0:表示仅主驾位有人\n1:表示仅副驾位有人\n2:表示主驾和副驾同时有人\n3:表示仅后排有人\n4:表示主驾有人+后排有人\n5:表示副驾有人+后排有人\n6:表示主驾和副驾同时有人+后排有人\n7: 所有座位都无人\n255:缺省\n下发数据=" + value);
return sendSetParamReq(15, String.valueOf(value));
}
/**
* 弱网减速停车策略开关
* 此方法存在域控回执，监听{@link OnAdasListener#onReceiveReceivedAck(ReceivedAck)}回调.使用方法：将此方法的返回值与{@link ReceivedAck#getMsgId()}进行比较，如果相同判断{@link ReceivedAck#getStatus()}是否等于{@link ReceivedAck.Status#NORMAL}，详情参见CheckSystemView中的onReceiveReceivedAck

14
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
View File

@@ -935,6 +935,20 @@ public class AdasManager implements IAdasNetCommApi {
return mChannel == null ? -1L : mChannel.sendPlanningLaneChangeCmd(laneChangeCmd);
}
/**
* 座椅压力
* TODO 目前仅襄阳牌照考试支持
*
* @param driver 主驾是否有人
* @param copilot 副驾是否有人
* @param backRow 后排是否有人
* @return boolean
*/
@Override
public long sendSeatPressure(boolean driver, boolean copilot, boolean backRow) {
return mChannel == null ? -1L : mChannel.sendSeatPressure(driver, copilot, backRow);
}
/**
* 给Planning发送指令
* 此方法存在域控回执，监听{@link OnAdasListener#onReceiveReceivedAck(ReceivedAck)}回调.使用方法：将此方法的返回值与{@link ReceivedAck#getMsgId()}进行比较，如果相同判断{@link ReceivedAck#getStatus()}是否等于{@link ReceivedAck.Status#NORMAL}，详情参见CheckSystemView中的onReceiveReceivedAck

11
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
View File

@@ -899,6 +899,17 @@ public interface IAdasNetCommApi {
*/
long sendRampThetaValid(int enable);
/**
* 座椅压力
* TODO 目前仅襄阳牌照考试支持
*
* @param driver 主驾是否有人
* @param copilot 副驾是否有人
* @param backRow 后排是否有人
* @return boolean
*/
long sendSeatPressure(boolean driver, boolean copilot, boolean backRow);
/**
* 弱网减速停车策略开关
* 此方法存在域控回执，监听{@link OnAdasListener#onReceiveReceivedAck(ReceivedAck)}回调.使用方法：将此方法的返回值与{@link ReceivedAck#getMsgId()}进行比较，如果相同判断{@link ReceivedAck#getStatus()}是否等于{@link ReceivedAck.Status#NORMAL}，详情参见CheckSystemView中的onReceiveReceivedAck

1
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java
View File

@@ -16,6 +16,7 @@ public class AdasChain {
//operation by user
public static final String CHAIN_CODE_ADAS_START_AUTOPILOT = "CHAIN_CODE_ADAS_START_AUTOPILOT";
public static final String CHAIN_CODE_ADAS_SEND_PLANNING_CMD = "CHAIN_CODE_ADAS_SEND_PLANNING_CMD";
public static final String CHAIN_CODE_ADAS_SEND_GLOBAL_PATH = "CHAIN_CODE_ADAS_SEND_GLOBAL_PATH";
public static final String CHAIN_CODE_ADAS_SEND_SYSTEM_CMD = "CHAIN_CODE_ADAS_SEND_SYSTEM_CMD";
public static final String CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD = "CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD";