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

Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

Browse Source
This commit is contained in:
wangmingjun
2023-03-06 16:37:27 +08:00
parent 91ab0d0931 d2fd81d576
commit ef0b645359
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -688,6 +688,8 @@ object CharterPassengerModel {
if (null != data && 0 == data.code) {
VoiceManager.arrivedStation(orderInfo!!.siteName!!)
broadcastList["${it}$endKey"] = true
// 到站结束自驾
CallerAutoPilotControlManager.cancelAutoPilot()
}
}

5
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
View File

@@ -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()

13
OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -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
@@ -412,6 +413,7 @@ class DriverM1Model {
*/
fun restartAutopilot() {
d(SceneConstant.M_CHARTER_D + TAG, "司机端-启动自动驾驶===")
CallerAutoPilotControlManager.sendPlanningCmd(2)
//只去启动自动驾驶
startAutopilot()
}
@@ -679,6 +681,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)
}

25
foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
View File

@@ -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();
}
}