From f706807228f457d688941978ecaabf16dfb7c467 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 6 Mar 2023 11:53:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[m1]=20[1.1.2]=20[=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E5=88=B0=E7=AB=99=E7=BB=93=E6=9D=9F=E8=87=AA=E9=A9=BE?= =?UTF-8?q?=E3=80=81=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=9D=A0=E8=BE=B9=E5=81=9C=E8=BD=A6=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/CharterPassengerModel.kt | 2 ++ .../mogo/och/bus/passenger/ui/view/LineSiteView.kt | 5 ++++- .../magic/mogo/och/charter/model/DriverM1Model.kt | 13 ++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 63be6ad799..a87e3aec60 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -688,6 +688,8 @@ object CharterPassengerModel { if (null != data && 0 == data.code) { VoiceManager.arrivedStation(orderInfo!!.siteName!!) broadcastList["${it}$endKey"] = true + // 到站结束自驾 + CallerAutoPilotControlManager.cancelAutoPilot() } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index 6bf6c872a5..720290509d 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -256,7 +256,10 @@ class LineSiteView @JvmOverloads constructor( } } tv_switch_line.onClick { - if (gnssSpeed < 0.01) { + if (gnssSpeed < 0.5) { + // TODO: 自驾中 需要 靠边停车中、到站 + // TODO: 没有自驾中 需要 靠边停车中、到站 + // 可以切换路径 setEnableLineStatus(true) queryLineList() diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index c01607fc4f..29849d1137 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -6,11 +6,6 @@ import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.utils.TextUtils import com.amap.api.maps.model.LatLng import com.elegant.network.utils.GsonUtil -import com.magic.mogo.och.charter.manager.CharterAnalyticsManager -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.ARRIVE_STATION -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.END_TRIP -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.START_TRIP import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.bean.CheckOrderCountDownResponse import com.magic.mogo.och.charter.bean.QueryBusinessStatusResponse @@ -20,6 +15,11 @@ import com.magic.mogo.och.charter.callback.ChangeDestCallback import com.magic.mogo.och.charter.callback.DriverM1OrderCallback import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.constant.CharterConst +import com.magic.mogo.och.charter.manager.CharterAnalyticsManager +import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager +import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.ARRIVE_STATION +import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.END_TRIP +import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.START_TRIP import com.magic.mogo.och.charter.manager.CharterTrajectoryManager import com.magic.mogo.och.charter.net.DriverM1ServiceManager import com.mogo.aicloud.services.socket.IMogoOnMessageListener @@ -30,6 +30,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager @@ -410,6 +411,7 @@ class DriverM1Model { */ fun restartAutopilot() { d(SceneConstant.M_CHARTER_D + TAG, "司机端-启动自动驾驶===") + CallerAutoPilotControlManager.sendPlanningCmd(2) //只去启动自动驾驶 startAutopilot() } @@ -677,6 +679,7 @@ class DriverM1Model { override fun onSuccess(data: BaseData?) { if (data != null && data.code == 0){ d(SceneConstant.M_CHARTER_D + TAG, "confirmed station .") + CallerAutoPilotControlManager.cancelAutoPilot() queryCurrentServiceStatus() sendCommitMsgToClient(true) } From d2fd81d576edcb9b150b1bd2d88a95c88ddbad84 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 6 Mar 2023 14:59:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[m1]MIS=E5=92=8CHttpDNS=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/commons/constants/HostConst.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java index 62e5713ece..e57616cd34 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java @@ -1,6 +1,7 @@ package com.mogo.commons.constants; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; public class HostConst { public static final String DEVA_HOST = "http://dzt-deva.zhidaozhixing.com"; @@ -28,17 +29,27 @@ public class HostConst { public static String getHost() { String host = HOST_RELEASE; - switch (DebugConfig.getNetMode()) { - case DebugConfig.NET_MODE_DEV: - case DebugConfig.NET_MODE_QA: - host = HOST_DEV; - break; + if(FunctionBuildConfig.urlJson.getEagleMisUrl().isEmpty()){ + switch (DebugConfig.getNetMode()) { + case DebugConfig.NET_MODE_DEV: + case DebugConfig.NET_MODE_QA: + host = HOST_DEV; + break; + } + return host; + }else{ + return FunctionBuildConfig.urlJson.getEagleMisUrl(); } - return host; + } public static String getEagleHost(){ - return HOST_EAGLE_QA; + if(FunctionBuildConfig.urlJson.getEagleDnsUrl().isEmpty()){ + return HOST_EAGLE_QA; + }else{ + return FunctionBuildConfig.urlJson.getEagleDnsUrl(); + } + }