统一升级和cmdb域名，联调cmdb功能

2022-10-10 16:22:40 +08:00
parent 26de263f26 39b37149cd
commit 362dc2af17
18 changed files with 179 additions and 65 deletions
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt
@@ -82,10 +82,10 @@ class OchCommonLoginPresenter(view: TaxiLoginDialogFragment?) :
            }, {
                CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "倒计时onError:${it}")
                it.printStackTrace()
-                mView?.setCountDownText(context.getString(R.string.module_och_taxi_login_get_code),true)
+                mView?.setCountDownText(AbsMogoApplication.getApp().getString(R.string.module_och_taxi_login_get_code),true)
            }, {
                CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "倒计时onComplete")
-                mView?.setCountDownText(context.getString(R.string.module_och_taxi_login_get_code),true)
+                mView?.setCountDownText(AbsMogoApplication.getApp().getString(R.string.module_och_taxi_login_get_code),true)
            })
    }

--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -787,13 +787,17 @@ public class TaxiModel {
        TaxiTrajectoryManager.getInstance().syncTrajectoryInfo();
        SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER,
                GsonUtil.jsonFromObject(data));
-        if (FunctionBuildConfig.isDemoMode
-                && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) {
-            // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
-            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
-            CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true);
-            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
-            CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
+        if (FunctionBuildConfig.isDemoMode) {
+            if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()){
+                // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
+                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true);
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
+            }
+            if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()){
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
+            }
        }
    }

@@ -1165,8 +1169,9 @@ public class TaxiModel {

            if (FunctionBuildConfig.isDemoMode) {
                // 当美化模式（演示模式）开启时: 到达目的地，置false
-                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
+                // 2022.10.08 到达目的地时候取消自动起自驾， 服务完成取消引导线和自动驾驶按钮状态
+//                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+//                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
                CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
            }
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
@@ -425,7 +425,7 @@ public class TaxiServiceManager {
                        ,orderNo,loc))
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(getSubscribeImpl(context, callback, "arriveTerminal"));
+                .subscribe(getSubscribeImpl(context, callback, "orderCompleted"));

    }

--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -25,6 +25,7 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager
 import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer
+import com.mogo.eagle.core.function.autopilot.telematic.EventListener
 import com.mogo.eagle.core.function.autopilot.telematic.IMsgHandler
 import com.mogo.eagle.core.function.autopilot.telematic.TeleMsgHandler
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
@@ -72,6 +73,8 @@ class MoGoAutopilotProvider :
    private var mContext: Context? = null
    private lateinit var msgHandler: IMsgHandler
    private var timer: Timer? = null
+    @Volatile
+    private var isInit = false

    override val functionName: String
        get() = TAG
@@ -146,13 +149,24 @@ class MoGoAutopilotProvider :
                }
            }, MoGoAiCloudClientConfig.getInstance().sn)
        } else {
-            val options = AdasOptions
-                .Builder()
-                .setIpcConnectionMode(AdasOptions.IPC_CONNECTION_MODE.FIXATION)
-                .setIpcFixationIP(AdasManager.getInstance().getIPCFixationIPList(mContext))
-                .setClient(false)// 乘客端直连工控机改为false
-                .build()
-            AdasManager.getInstance().create(options, MoGoAdasMsgConnectStatusListenerImpl())
+            msgHandler.setListener(object : EventListener {
+                override fun connectDevice(isSupportMulti: Boolean) {
+                    if (!isInit) {
+                        isInit = true
+                        if (isSupportMulti) {
+                            // 直连工控机
+                            directConnect()
+                        } else {
+                            val options = AdasOptions
+                                .Builder()
+                                .setClient(true)
+                                .build()
+                            AdasManager.getInstance().create(options, MoGoAdasMsgConnectStatusListenerImpl())
+                            listenDeviceData()
+                        }
+                    }
+                }
+            })
            NSDNettyManager.getInstance()
                .searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn,
                    AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode),
@@ -179,10 +193,7 @@ class MoGoAutopilotProvider :

        // 监听ADAS-SDK获取到的工控机数据(乘客也需注册)
        AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
-        // 乘客屏监听工控机基础信息回调
-        if (!AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-            CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
-        }
+        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
        CallerLogger.i("$M_ADAS_IMPL$TAG", "initServer……")
        // 同步数据给工控机的服务
        AsyncDataToAutopilotServer.INSTANCE.initServer()
@@ -190,6 +201,47 @@ class MoGoAutopilotProvider :
        setRainMode(FunctionBuildConfig.isRainMode)
    }

+    private fun directConnect() {
+        val options = AdasOptions
+            .Builder()
+            .setIpcConnectionMode(AdasOptions.IPC_CONNECTION_MODE.FIXATION)
+            .setIpcFixationIP(AdasManager.getInstance().getIPCFixationIPList(mContext))
+            .setClient(false)// 乘客端直连工控机改为false
+            .build()
+        AdasManager.getInstance().create(options, MoGoAdasMsgConnectStatusListenerImpl())
+    }
+
+    /**
+     * 司机屏转发工控机发过来的数据，乘客屏接收解析后的数据保持原流程不变
+     */
+    private fun listenDeviceData() {
+        AdasManager.getInstance().setOnMultiDeviceListener(object : OnMultiDeviceListener {
+            override fun onForwardingDriverIPCMessage(bytes: ByteArray?) {
+                if (bytes == null)
+                    return
+                // 发送数据给乘客端
+                if (NSDNettyManager.getInstance().isServerStart) {
+                    msgHandler.synWriteTime()
+                    NSDNettyManager.getInstance()
+                        .sendMsgToAllClients(MogoProtocolMsg(NORMAL_DATA, bytes.size, bytes))
+                } else {
+                    CallerLogger.d("$M_ADAS_IMPL$TAG", "司机端Server未启动！")
+                }
+            }
+
+            override fun onForwardingPassengerIPCMessage(bytes: ByteArray?) {
+                if (bytes == null)
+                    return
+                NSDNettyManager.getInstance()
+                    .sendMogoProtocolMsgToServer(
+                        MogoProtocolMsg(NORMAL_DATA, bytes.size, bytes),
+                        null
+                    )
+            }
+
+        })
+    }
+
    /**
     * 连接自动驾驶域控制器
     *
@@ -561,10 +613,23 @@ class MoGoAutopilotProvider :
    }

    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
-        // 乘客屏才监听
-        CallerBindingcarManager.getBindingcarProvider()
-            .getBindingcarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
-        invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            if (!isInit) {
+                isInit = true
+                if (carConfigResp.dockVersion.contains("2.3.0")) {// 不支持多连接
+                    // 司机屏转发工控机发过来的数据
+                    listenDeviceData()
+                }
+            }
+            msgHandler.synMsgToAllClients()
+        } else {// 乘客屏
+            CallerBindingcarManager.getBindingcarProvider()
+                .getBindingcarInfo(
+                    carConfigResp.macAddress,
+                    MoGoAiCloudClientConfig.getInstance().sn
+                )
+            invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")
+        }
    }

    @ChainLog(
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/EventListener.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/EventListener.kt
@@ -0,0 +1,5 @@
+package com.mogo.eagle.core.function.autopilot.telematic
+
+interface EventListener {
+    fun connectDevice(isSupportMulti: Boolean)
+}
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/IMsgHandler.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/IMsgHandler.kt
@@ -19,4 +19,6 @@ interface IMsgHandler {
    fun getTeleTimeStamp(): Long

    fun synMsgToAllClients()
+
+    fun setListener(eventListener: EventListener?)
 }
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt
@@ -47,6 +47,8 @@ class TeleMsgHandler : IMsgHandler {
    @Volatile
    private var timestamp = 0L

+    private var listener: EventListener? = null
+
    override fun handleMsgFromServer(msg: MogoProtocolMsg?, channel: Channel?) {
        msg?.let {
            when (it.protocolType) {
@@ -86,6 +88,7 @@ class TeleMsgHandler : IMsgHandler {
                    AppConfigInfo.plateNumber = carConfig.plateNumber
                    AppConfigInfo.iPCMacAddress = carConfig.macAddress
                    AppConfigInfo.dockerVersion = carConfig.dockVersion
+                    listener?.connectDevice(!carConfig.dockVersion.contains("2.3.0"))
                    invokeNettyConnResult(
                        "司机屏发送给乘客屏配置信息为:${
                            TextFormat.printer().escapingNonAscii(false).printToString(carConfig)
@@ -255,6 +258,10 @@ class TeleMsgHandler : IMsgHandler {
        return wrTimeStamp
    }

+    override fun setListener(eventListener: EventListener?) {
+        listener = eventListener
+    }
+
    private fun reqServerSN() {
        if (NettyTcpClient.sSERVER_SN.isNullOrEmpty()) {
            ProcessLifecycleOwner.get().lifecycleScope.launch {
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/BindHostConst.kt
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/BindHostConst.kt
@@ -0,0 +1,26 @@
+package com.mogo.eagle.core.function
+
+import com.mogo.commons.debug.DebugConfig
+
+/**
+ * cmdb 域名
+ */
+class BindHostConst {
+
+    companion object {
+        private const val UPGRADE_APP_HOST_DEV = "https://eagle-qa.zhidaozhixing.com/"
+        private const val UPGRADE_APP_HOST = "http://eagle-mis.zhidaozhixing.com/"
+
+        @JvmStatic
+        fun getBaseUrl(): String {
+            return when (DebugConfig.getNetMode()) {
+                DebugConfig.NET_MODE_DEV -> UPGRADE_APP_HOST_DEV
+                DebugConfig.NET_MODE_QA -> UPGRADE_APP_HOST_DEV
+                DebugConfig.NET_MODE_DEMO -> UPGRADE_APP_HOST
+                DebugConfig.NET_MODE_RELEASE -> UPGRADE_APP_HOST
+                else -> UPGRADE_APP_HOST
+            }
+        }
+    }
+
+}
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java
@@ -4,20 +4,13 @@ import android.content.Context;
 import android.util.Log;

 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.constants.SharedPrefsConstants;
-import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
-import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
 import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
-import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
+import com.mogo.eagle.core.function.BindHostConst;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
-import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.AppUtils;
-import com.mogo.eagle.core.utilcode.util.GsonUtils;
-import com.mogo.module.common.constants.HostConst;

 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -39,7 +32,7 @@ public class UpgradeAppNetWorkManager {


    private UpgradeAppNetWorkManager() {
-        mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.UPGRADE_APP_HOST)
+        mUpgradeApiService = MoGoRetrofitFactory.getInstance(BindHostConst.getBaseUrl())
                .create(UpgradeApiService.class);
    }

@@ -64,7 +57,7 @@ public class UpgradeAppNetWorkManager {
        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
        int versionCode = AppUtils.getAppVersionCode();
        CallerLogger.INSTANCE.d(TAG, "getAppUpgradeInfo mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
-        Log.d("Upgrade", "mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
+        Log.d(TAG, "mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
        RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
        mUpgradeApiService.getUpgradeInfo(requestBody)
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java
@@ -22,7 +22,7 @@ public interface BindingcarApiService {
     * @return {@link BindingcarInfo}
     */
    @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("pad/selectPadByMac")
+    @POST("eagleEye-mis/cmdbapi/pad/selectPadByMac")
    Observable<BindingcarInfo> getBindingcarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody);

    /**
@@ -31,7 +31,7 @@ public interface BindingcarApiService {
     * @return {@link ModifyBindingcarInfo}
     */
    @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("pad/updatePadByMac")
+    @POST("eagleEye-mis/cmdbapi/pad/updatePadByMac")
    Observable<ModifyBindingcarInfo> modifyBindingcarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody);

 }
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
@@ -6,6 +6,7 @@ import android.util.Log;
 import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
+import com.mogo.eagle.core.function.BindHostConst;
 import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
 import com.mogo.eagle.core.function.bindingcar.R;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
@@ -37,7 +38,7 @@ public class BindingcarNetWorkManager {
    private static final String TAG = "BindingcarNetManager";

    private BindingcarNetWorkManager() {
-        mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.CMDB_HOST)
+        mBindingcarApiService = MoGoRetrofitFactory.getInstance(BindHostConst.getBaseUrl())
                .create(BindingcarApiService.class);
    }

@@ -63,13 +64,6 @@ public class BindingcarNetWorkManager {
 //        String macAddress1 = "48:b0:2d:4d:b9:63";
 //        String sn = "X20202203105S688HZ";

-//        modifyBindingcar(macAddress1, sn, new BindingcarCallBack() {
-//            @Override
-//            public void callBackResult(ModifyBindingcarInfo modifyBindingcarInfo) {
-//
-//            }
-//        }, screenType);
-
        BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType);
        RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
        mBindingcarApiService.getBindingcarInfo(requestBody)
@@ -97,7 +91,6 @@ public class BindingcarNetWorkManager {
 //                            if (info.getData().getVendor().equals("一汽红旗")) { //TODO
 //                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9);
 //                            }
-
 //                            else if (info.getData().getVendor().equals("东风汽车集团")) {
 //                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
 //                            } else if (info.getData().getVendor().equals("金旅星辰")) {
@@ -113,7 +106,6 @@ public class BindingcarNetWorkManager {
                    @Override
                    public void onError(@NonNull Throwable e) {
                        CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
-                        Log.e(TAG, "onError ------ > e = " + e);
                    }

                    @Override
@@ -150,7 +142,6 @@ public class BindingcarNetWorkManager {
                    @Override
                    public void onError(@NonNull Throwable e) {
                        CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
-                        Log.e(TAG, "onError ----2-- > e = " + e);
                    }

                    @Override
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -26,6 +26,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver;
@@ -218,7 +219,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
            if (currentTime - oldTime > 6) {
                SharedPrefsMgr.getInstance(getContext()).putLong("old_time_up", System.currentTimeMillis() / 1000);
 //                ToastUtils.showShort("长按 ↑↑↑ 开启自动驾驶");
-                CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
+//                CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
+                CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
+
            }

            return true;
@@ -337,7 +340,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
            } else if (event.getAction() == KeyEvent.ACTION_UP) {
                if (numberE == 1) {
 //                    ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
-                    CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
+//                    CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
+                    CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
                }
                numberE = 0;
                isLongPressE = false;
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
@@ -85,12 +85,17 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
    // 默认未连接
    var ipcConnStatus = 0x01

+    /**
+     * 记录最后一次启动自动驾驶需要的参数，结束自动驾驶后设置为null
+     */
+    var autopilotControlParameters: AutopilotControlParameters? = null
+
    override fun toString(): String {
        return "connectIP=$connectIP, connectPort=$connectPort, " +
                "connectStatus=$connectStatus, connectDescribe=$connectStatusDescribe, version=$version, dockVersion=$dockVersion," +
                " locationStatus=$locationStatus), locationLat=$locationLat, locationLon=$locationLon," +
                " satelliteTime=$satelliteTime, speed=$speed, state=$state, reason=$reason, camera=$camera," +
-                " radar=$radar, rtk=$rtk, pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus"
+                " radar=$radar, rtk=$rtk, pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus, autopilotControlParameters=$autopilotControlParameters"
    }

    public override fun clone(): AutopilotStatusInfo {
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
@@ -67,6 +67,8 @@ object CallerAutoPilotManager {
            return
        }
        providerApi?.startAutoPilot(controlParameters)
+        // 更新记录在全局的控制参数
+        CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(controlParameters)
    }

    /**
@@ -94,6 +96,8 @@ object CallerAutoPilotManager {
        // 司机屏才能取消自动驾驶
        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
            providerApi?.cancelAutoPilot()
+            // 更新记录在全局的控制参数
+            CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
        }
    }

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.autopilot

 import android.util.*
 import androidx.annotation.Nullable
+import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.base.CallerBase
@@ -24,7 +25,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {

    // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步
    private val M_AUTOPILOT_STATUS_LISTENERS: ConcurrentHashMap<String, IMoGoAutopilotStatusListener> =
-        ConcurrentHashMap()
+            ConcurrentHashMap()

    @Volatile
    private var autoPilotMessageCode: String = ""
@@ -93,8 +94,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     * @param listener 监听回调
     */
    fun addListener(
-        @Nullable tag: String,
-        @Nullable listener: IMoGoAutopilotStatusListener
+            @Nullable tag: String,
+            @Nullable listener: IMoGoAutopilotStatusListener
    ) {
        if (M_AUTOPILOT_STATUS_LISTENERS.containsKey(tag)) {
            return
@@ -201,10 +202,18 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     */
    fun invokeAutopilotStatusRespByQuery(statusInfo: SystemStatusInfo.StatusInfo?) {
        statusInfo?.also {
-            M_AUTOPILOT_STATUS_LISTENERS.forEach{ itx ->
+            M_AUTOPILOT_STATUS_LISTENERS.forEach { itx ->
                val listener = itx.value
                listener.onAutopilotStatusRespByQuery(it)
            }
        }
    }
+
+    /**
+     * 更新自动驾驶控制参数，结束自动驾驶时候需要更新为null，且更新时候同时触发onAutopilotStatusResponse回调
+     */
+    fun updateAutopilotControlParameters(autopilotControlParameters: AutopilotControlParameters? = null) {
+        mAutopilotStatusInfo.autopilotControlParameters = autopilotControlParameters
+        invokeAutoPilotStatus(mAutopilotStatusInfo)
+    }
 }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/REEADME.md
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/REEADME.md
@@ -0,0 +1,6 @@
+#### CallerAutoPilotStatusListenerManager  管理自动驾驶中的状态及参数信息
+
+AutopilotStatusInfo：
+连接信息
+实时经纬度、速度、车辆硬件状态
+最后一次启动自动驾驶时候的启动参数 AutopilotControlParameters
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -3,7 +3,6 @@ package com.mogo.map;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Point;
-import android.util.Log;
 import android.util.Pair;

 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -117,7 +116,6 @@ public class AMapWrapper implements IMogoMap {
        optionsArrayList.forEach((s, trackedObject) -> {
            MarkerSimpleData markerOptions = ObjectUtils.fromTrafficData(trackedObject);
            if (markerOptions != null) {
-                Log.i("EmArrow0926","markerOpt : " + markerOptions.toString());
                markerOptionsArrayList.add(markerOptions);
            }
        });
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java
@@ -19,10 +19,4 @@ public class HostConst {
    public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com";
    public static final String SOCKET_CENTER_DOMAIN = "socketRegion";

-//    public static final String UPGRADE_APP_HOST_TEST = "http://10.0.200.12:32423?/";
-    public static final String UPGRADE_APP_HOST = "http://eagle-mis.zhidaozhixing.com/";
-
-    public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/";
-
-
 }