[Delete]

整理adas控制接口 Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-07 15:57:16 +08:00
parent ceee1d9c9a
commit 39e2518a70
10 changed files with 6 additions and 76 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -419,7 +419,7 @@ class DebugSettingView @JvmOverloads constructor(
        UiThreadHandler.post {
            tvAutopilotInfo.post {
                tvCarInfo.text =
-                        "GPS时间：${autoPilotCarStateInfo?.values?.receiverDataTime}\n" +
+                        "GPS时间：${autoPilotCarStateInfo?.values?.satelliteTime}\n" +
                                "自车经纬度：\n${autoPilotCarStateInfo?.values?.lon}\n${autoPilotCarStateInfo?.values?.lat}\n"
            }
        }
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -330,8 +330,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
        MogoModulePaths.addModule(new MogoModule(PushUIConstants.PATH, "PUSH_UI"));
        // ADAS模块（旧，慢慢被 域控制器模块 替换掉）
        MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider"));
-        // ADAS模块（旧，慢慢被 域控制器模块 替换掉）
-        MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider"));

        if (!DebugConfig.isLauncher()) {
            PersistentManager
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
@@ -59,17 +59,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >

    @Override
    public void changeTo2dMode() {
-        try {
-            mMogoMapView.getMap().getUIController()
-                    .changeMapMode(
-                            MogoApisHandler.getInstance()
-                                    .getApis()
-                                    .getAdasControllerApi()
-                                    .getCurrentSkinMode()
-                    );
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
+        // do not implement
    }

    @Override
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -1,7 +1,5 @@
 package com.mogo.module.main;

-import static com.mogo.module.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE;
-
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -52,6 +50,8 @@ import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 import java.util.HashMap;
 import java.util.Map;

+import static com.mogo.module.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE;
+
 /**
 * @author congtaowang
 * @since 2019-12-23
@@ -199,7 +199,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        if (DebugConfig.isMapBased()) {
            EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
                Logger.d(TAG, "map loaded." + Thread.currentThread().getName());
-                resetMapUiStyle();
                // 延时加载其他模块
                getWindow().getDecorView().postDelayed(new Runnable() {
                    @Override
@@ -232,11 +231,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        }
    }

-    private void resetMapUiStyle() {
-        final EnumMapUI mapUI = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getCurrentSkinMode();
-        mServiceApis.getMapServiceApi().getMapUIController().changeMapMode(mapUI);
-    }
-
    /**
     * 加载其它模块
     */
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASControlStatusChangedListener.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASControlStatusChangedListener.java
@@ -2,14 +2,13 @@ package com.mogo.service.adas;

 import com.mogo.map.uicontroller.EnumMapUI;

-public
 /**
 * @author congtaowang
 * @since 2020/8/31
 *
 * adas 控制状态变化监听
 */
-interface IMogoADASControlStatusChangedListener {
+public interface IMogoADASControlStatusChangedListener {

    /**
     * 地图模式切换
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
@@ -19,13 +19,6 @@ public interface IMogoADASController extends IProvider {

    void release();

-    /**
-     * 获取当前皮肤状态
-     *
-     * @return
-     */
-    EnumMapUI getCurrentSkinMode();
-
    /**
     * 给adas传递数据
     *
@@ -75,7 +68,6 @@ public interface IMogoADASController extends IProvider {
     */
    double getLastLon();

-
    /**
     * 获取由工控机传回的GPS星历时间
     *
@@ -83,5 +75,4 @@ public interface IMogoADASController extends IProvider {
     */
    String getSatelliteTime();

-
 }
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasDataCallback.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasDataCallback.java
@@ -1,14 +0,0 @@
-package com.mogo.service.adas;
-
-/**
- * adas 数据回调接口
- *
- * @author tongchenfei
- */
-public interface IMogoAdasDataCallback {
-    /**
-     * adas 数据回调
-     * @param msg 具体数据
-     */
-    void onAdasDataCallback(String msg);
-}
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
@@ -2,14 +2,13 @@ package com.mogo.service.adas;

 import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;

-public
 /**
 * @author congtaowang
 * @since 2021/1/18
 *
 * 自动驾驶到站回调
 */
-interface IMogoAdasOCHCallback {
+public interface IMogoAdasOCHCallback {

    /**
     * 不可自动驾驶，目前场景是刚开机，adas还未和工控机连接
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRecognizedDataCallback.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRecognizedDataCallback.java
@@ -1,20 +0,0 @@
-package com.mogo.service.adas;
-
-
-import com.mogo.eagle.core.data.traffic.TrafficData;
-
-import java.util.List;
-
-/**
- * adas 物体识别数据回调接口
- *
- * @author tongchenfei
- */
-public interface IMogoAdasRecognizedDataCallback {
-    /**
-     * adas 数据回调
-     *
-     * @param resultList 具体识别的物体数据
-     */
-    void onAdasDataCallback(List<TrafficData> resultList);
-}
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -14,7 +14,6 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
-import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.adas.AdasProvider;
 import com.mogo.module.adas.IAdasDataListener;
 import com.mogo.service.adas.IMogoADASController;
@@ -115,12 +114,6 @@ public class MogoADASController implements IMogoADASController {
        }
    }

-
-    @Override
-    public EnumMapUI getCurrentSkinMode() {
-        return EnumMapUI.Type_VR;
-    }
-
    @Override
    public void aiCloudToAdasData(AutopilotControlParameters result) {
        try {