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

Merge branch 'dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0_bailing

Browse Source
This commit is contained in:
yangyakun
2024-05-08 14:22:08 +08:00
parent a611fad5cd 3ed5fbf31c
commit ee34a34a68
9 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
View File

@@ -77,6 +77,7 @@ import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.common.module.utils.ToastUtilsOch;
import com.mogo.och.common.module.voice.VoiceNotice;
import org.jetbrains.annotations.NotNull;
@@ -642,6 +643,7 @@ public class OrderModel {
}
if(!StringUtils.isEmpty(resion)){
ToastUtils.showShort(resion);
VoiceNotice.showNotice(resion);
return;
}

4
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt
View File

@@ -723,7 +723,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
return if (distance <= OchCommonConst.AUTOMATIC_PLANNING_MAX_DISTANCE) {
""
} else {
"距离起始站点过远：${distance}米"
"距离起始站点超过15米"
}
}
@@ -749,7 +749,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
}
}
OchChainLogManager.writeChainLog("启动自驾距离判断","距离轨迹线超过15m,无法启动自驾", eventID = OchChainLogManager.EVENT_KEY_INFO_AUTOPILOT_DISTANCE)
return "距离轨迹线超过15m,无法启动自驾"
return "距离轨迹线超过15米"
}
}

10
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
View File

@@ -25,6 +25,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils;
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
import com.mogo.och.common.module.voice.VoiceNotice;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.util.ShuttleVoiceManager;
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
@@ -491,6 +492,10 @@ public class OrderModel {
*/
public void abortTask() {
CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask");
if(busRoutesResult==null){
ToastUtils.showLong("数据异常、请稍后再试");
return;
}
OrderServiceManager.abortTask(mContext, busRoutesResult.getTaskId()
, new OchCommonServiceCallback<BaseData>() {
@Override
@@ -660,6 +665,7 @@ public class OrderModel {
}
if(!StringUtils.isEmpty(resion)){
ToastUtils.showShort(resion);
VoiceNotice.showNotice(resion);
return;
}
//4、ssm 给出数据
@@ -814,6 +820,10 @@ public class OrderModel {
*/
public void leaveStation() {
CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex);
if(busRoutesResult==null){
ToastUtils.showLong("数据异常、请稍后再试");
return;
}
String nextStationName = "";
String nextStationNameKr = "";
MogoLocation nextStationPoint = new MogoLocation();

1
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -950,6 +950,7 @@ public class TaxiModel {
}
if(!StringUtils.isEmpty(resion)){
ToastUtils.showShort(resion);
VoiceNotice.showNotice(resion);
return;
}

1
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
View File

@@ -83,6 +83,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
}
if (!StringUtils.isEmpty(resion)) {
ToastUtils.showShort(resion)
VoiceNotice.showNotice(resion);
return resion
}
// 4、ssm 给出数据

1
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -1248,6 +1248,7 @@ object TaxiTaskModel {
val resion = TrajectoryAndDistanceManager.canStartAutopilot(it.lineId)
if(!StringUtils.isEmpty(resion)){
ToastUtils.showShort(resion);
VoiceNotice.showNotice(resion);
return;
}
}

7
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt
View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting
import android.content.Context
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.widget.FrameLayout
import androidx.recyclerview.widget.LinearLayoutManager
@@ -235,7 +236,11 @@ class StatusSummaryView @JvmOverloads constructor(
override fun authCrtFile(device: String, root: String) {
super.authCrtFile(device, root)
Log.i("emArrow","authCrtFile : $device, certFileResult: ${CallerAutopilotCarConfigListenerManager.getCertFileResult()}")
UiThreadHandler.post ({
if(CallerAutopilotCarConfigListenerManager.getCertFileResult().contains("成功校验")){
return@post
}
if (data.size < 6) return@post
data[5].desc = "本机证书已下载"
data[5].isException = false
@@ -255,7 +260,7 @@ class StatusSummaryView @JvmOverloads constructor(
override fun onCertificationResult(msg: String) {
super.onCertificationResult(msg)
// Log.i("emArrow","onCertificationResult : $msg")
Log.i("emArrow","onCertificationResult : $msg")
if (!SharedPrefsMgr.getInstance().getBoolean(
"${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}",
MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt
View File

@@ -1,5 +1,6 @@
package com.mogo.eagle.core.function.call.autopilot
import android.util.Log
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
import com.mogo.eagle.core.function.call.base.CallerBase
import mogo.telematics.pad.MessagePad
@@ -40,6 +41,7 @@ object CallerAutopilotCarConfigListenerManager : CallerBase<IMoGoAutopilotCarCon
@Synchronized
fun invokeAutopilotCertFileResult(msg: String) {
Log.i("emArrow","invokeAutopilotCertFileResult : $msg")
certFileMsg = msg
M_LISTENERS.forEach {
val listener = it.value

5
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java
View File

@@ -2,7 +2,6 @@ package com.zhidao.support.adas.high.common.autopilot.ability;
import androidx.annotation.NonNull;
import com.zhidao.support.adas.high.common.CupidLogUtils;
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason;
import java.util.ArrayList;
@@ -143,10 +142,10 @@ public abstract class BaseAutopilotAbilityChassis {
if (oldThrottle == Float.MAX_VALUE) {
oldThrottle = throttle;
} else {
CupidLogUtils.log(TAG, "方向盘当前角度=" + oldThrottle + " 方向盘1秒前角度=" + throttle);
// CupidLogUtils.log(TAG, "方向盘当前角度=" + oldThrottle + " 方向盘1秒前角度=" + throttle);
boolean isTurning = Math.abs(throttle - oldThrottle) > 8.0F;
oldThrottle = throttle;
CupidLogUtils.log(TAG, "方向盘是否转动=" + isTurning);
// CupidLogUtils.log(TAG, "方向盘是否转动=" + isTurning);
if (isTurning) {
unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, REASON_CHASSIS_STEERING);
}