Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2

# Conflicts: # OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml # OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt # OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml # OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml # OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml # app/src/main/java/com/mogo/launcher/MogoApplication.java # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml # core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml # gradle.properties
2022-11-18 10:36:15 +08:00
parent 0aadcd8763 2b38bf67c0
commit 1607c60435
527 changed files with 18862 additions and 3434 deletions
--- 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,7 +19,10 @@ 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 BINDING_SN_HOST = "https://mygateway.zhidaozhixing.com/cmdbapi/"; //中台提供的接口服务
-    public static final String BINDING_SN_HOST_TEST = "https://mygateway.zhidaozhixing.com/cmdbapitest/"; //中台提供的接口服务测试
+//    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/";
+

 }
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
@@ -15,7 +15,6 @@ import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;

@@ -65,21 +64,20 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
    /**
     * 识别物移动
     *
-     * @param data
     */
-    public void renderWarnData(V2XWarningEntity data) {
+    public void renderWarnData(double lon, double lat, int type, double collisionlat, double collisionLon, double angle, long showTime) {
        MarkerLocation location = new MarkerLocation();
-        location.setLat(data.getLat());
-        location.setLon(data.getLon());
-
+        location.setLat(lat);
+        location.setLon(lon);
+        location.setAngle(angle);
        MarkerShowEntity markerShowEntity = new MarkerShowEntity();
        markerShowEntity.setMarkerLocation(location);
        markerShowEntity.setMarkerType(TYPE_MARKER_CLOUD_WARN_DATA);
-        IMogoMarker marker = drawMarker(markerShowEntity, modeResType(data.getType()));
-        marker.addDynamicAnchorPosition(new MogoLatLng(data.getCollisionLat(), data.getCollisionLon()), (float) data.getHeading(), (long) (data.getShowTime() * 1000));
+        IMogoMarker marker = drawMarker(markerShowEntity, modeResType(type));
+//        marker.addDynamicAnchorPosition(new MogoLatLng(collisionlat, collisionLon), (float) heading, showTime * 1000);
        UiThreadHandler.postDelayed(() -> {
            marker.remove();
-        }, data.getShowTime() * 1000);
+        }, showTime * 1000);

    }

@@ -103,6 +101,8 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
                .data(markerShowEntity)
                .latitude(markerShowEntity.getMarkerLocation().getLat())
                .longitude(markerShowEntity.getMarkerLocation().getLon())
+                .controlAngle(true)
+                .rotate((float) markerShowEntity.getMarkerLocation().getAngle())
                .setGps(true);
        IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
        options.icon3DRes(getModelRes(modeResType)); //TODO
@@ -132,12 +132,11 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
    /**
     * 绘制停止线 marker
     *
-     * @param data
     */
-    public void renderStopLineData(V2XWarningEntity data) {
+    public void renderStopLineData(double lon, double lat) {
        MarkerLocation location = new MarkerLocation();
-        location.setLat(data.getLat());
-        location.setLon(data.getLon());
+        location.setLat(lat);
+        location.setLon(lon);

        MarkerShowEntity markerShowEntity = new MarkerShowEntity();
        markerShowEntity.setMarkerLocation(location);
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
@@ -28,14 +28,14 @@ enum class EventTypeEnum(

    //施工
    FOURS_ROAD_WORK(
-            "10006", "道路施工", "前方施工", R.drawable.icon_warning_v2x_road_construction,
-            "前方施工", "道路施工"
+            "10006", "道路施工", "道路施工", R.drawable.icon_warning_v2x_road_construction,
+            "道路施工", "道路施工"
    ),

    //施工-AI云下发
    AI_ROAD_WORK(
-        "100061", "道路施工", "前方施工", R.drawable.icon_warning_v2x_road_construction,
-        "前方施工", "道路施工"
+        "100061", "道路施工", "道路施工", R.drawable.icon_warning_v2x_road_construction,
+        "道路施工", "道路施工"
    ),

    //拥堵
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Trigonometric.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Trigonometric.java
@@ -37,10 +37,10 @@ public class Trigonometric {
    /**
     * 根据角度获取指定距离点的经纬度
     */
-    public static MogoLatLng getNewLocation(MogoLatLng st, double distance, double angle) {
-        mRadLo = st.getLon() * Math.PI / 180.;
-        mRadLa = st.getLat() * Math.PI / 180.;
-        Ec = radius_s + (radius_b - radius_s) * (90. - st.lat) / 90;
+    public static MogoLatLng getNewLocation(double lon, double lat, double distance, double angle) {
+        mRadLo = lon * Math.PI / 180.;
+        mRadLa = lat * Math.PI / 180.;
+        Ec = radius_s + (radius_b - radius_s) * (90. - lat) / 90;
        Ed = Ec * Math.cos(mRadLa);

        double dx = distance * Math.sin(Math.toRadians(angle));
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -158,7 +158,7 @@ public class MogoServices implements IMogoMapListener,
            if (!mLastStatusIsVr) {
                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
                if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-                    AIAssist.getInstance(mContext).speakTTSVoice("已开启鹰眼模式");
+                    //AIAssist.getInstance(mContext).speakTTSVoice("已开启鹰眼模式");
                }
                mLastStatusIsVr = true;
            }
@@ -167,7 +167,7 @@ public class MogoServices implements IMogoMapListener,
                mLastStatusIsVr = false;
                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, false);
                if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-                    AIAssist.getInstance(mContext).speakTTSVoice("已退出鹰眼模式");
+                    //AIAssist.getInstance(mContext).speakTTSVoice("已退出鹰眼模式");
                }
            }
        }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
@@ -66,13 +66,11 @@ public class MogoRouteOverlayManager implements
            return;
        }
        if (isArriveAtStation.get() && autopilotMode.get() != 1) {
-            Logger.d(TAG, "--- onLocationChanged 1 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
            RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
            return;
        }
        boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
        if (!force && autopilotMode.get() != 1) {
-            Logger.d(TAG, "--- onLocationChanged 2 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
            RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
            return;
        }
@@ -80,7 +78,6 @@ public class MogoRouteOverlayManager implements
            if (!queue.isEmpty()) {
                List<MessagePad.TrajectoryPoint> items = queue.pollLast();
                if (items != null && !items.isEmpty()) {
-                    Logger.d(TAG, "--- onLocationChanged -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
                    RouteOverlayDrawer.getInstance().drawTrajectoryList(items, location.getBearing());
                }
            }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteStrategy.kt
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteStrategy.kt
@@ -41,7 +41,7 @@ class ColorfulStrategy(private val colors: List<Int> = emptyList(), var isLightO
 object RouteStrategy {

    @Volatile
-    private var isEnable = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+    private var isEnable = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)

    private var strategy: Strategy? = null