265 调整小地图路线宽度.更换起终点icon

2022-04-07 20:32:43 +08:00
parent 24821b618f
commit cde0d82777
8 changed files with 35 additions and 31 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ if (!isAndroidTestBuild()) {
 }

 //if (!isAndroidTestBuild()) {
-//    apply plugin: 'apm-plugin'
+    apply plugin: 'apm-plugin'
 //}

 //if (!isAndroidTestBuild()) {
@@ -263,29 +263,29 @@ dependencies {
 }

 //if (!isAndroidTestBuild()) {
-//    ApmPlugin {
-//        // 是否进行插桩
-//        enable true
-//        // 是否在Debug包插桩，默认不插桩
-//        enableInDebug true
-//        // DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR");
-//        // INFO 级别Log会汇总所有被插桩处理的类供查看，路径 app/build/ByteX/ApmPlugin
-//        logLevel "DEBUG"
-//        // 启动分析开关：监控App启动耗时，需要同时开启pageLoadSwitch
-//        startSwitch = true
-//        // 页面响应开关：监控Activity的生命周期耗时
-//        pageLoadSwitch = true
-//        // 网络监控开关：监控okhttp3的网络请求
-//        okHttp3Switch = true
-//        // 白名单下的包进行插桩，需要填写要插装类所在的包名，支持前缀配置
-//        whiteList = [
-//                "com.mogo"
-//        ]
-//        // 黑名单包下类不进行插桩，可以配置包名和类名，没有可以填空
-//        blackList = [
-//
-//        ]
-//    }
+    ApmPlugin {
+        // 是否进行插桩
+        enable true
+        // 是否在Debug包插桩，默认不插桩
+        enableInDebug true
+        // DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR");
+        // INFO 级别Log会汇总所有被插桩处理的类供查看，路径 app/build/ByteX/ApmPlugin
+        logLevel "DEBUG"
+        // 启动分析开关：监控App启动耗时，需要同时开启pageLoadSwitch
+        startSwitch = true
+        // 页面响应开关：监控Activity的生命周期耗时
+        pageLoadSwitch = true
+        // 网络监控开关：监控okhttp3的网络请求
+        okHttp3Switch = false
+        // 白名单下的包进行插桩，需要填写要插装类所在的包名，支持前缀配置
+        whiteList = [
+                "com.mogo"
+        ]
+        // 黑名单包下类不进行插桩，可以配置包名和类名，没有可以填空
+        blackList = [
+
+        ]
+    }
 //}

 android.applicationVariants.all { variant ->
--- a/config.gradle
+++ b/config.gradle
@@ -166,7 +166,7 @@ ext {
            crashreportapmbyte           : "com.mogo.test:crashreport-apmbyte:${CRASHREPORT_APMBYTE_VERSION}",
            crashreportnoop              : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",
            crashreportupgrade           : "com.mogo.test:crashreport-upgrade:${CRASHREPORT_UPGRADE_VERSION}",
-            apm_insight                  : 'com.volcengine:apm_insight:1.4.4.cn',
+            apm_insight                  : 'com.volcengine:apm_insight:1.4.5.cn',
            apm_insight_crash            : 'com.volcengine:apm_insight_crash:1.4.2',

            //========================= TTS语音 Maven 版本管理 =========================
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -137,8 +137,8 @@
        <!--限速牌子-->
        <com.mogo.eagle.core.function.hmi.ui.widget.LimitingVelocityView
            android:id="@+id/viewLimitingVelocity"
-            android:layout_width="130px"
-            android:layout_height="130px"
+            android:layout_width="120px"
+            android:layout_height="120px"
            android:layout_marginTop="30px"
            android:layout_marginEnd="40px"
            android:background="@drawable/bg_waring_limiting_velocity"
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
@@ -262,7 +262,7 @@ public class SmallMapDirectionView
                        new PolylineOptions()
                                .addAll(mCoordinatesLatLng)
                                .color(Color.argb(255, 31, 127, 255))
-                                .width(5));
+                                .width(6));

            }
 //            else {
--- a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
+++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
--- a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
+++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
--- 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
@@ -180,6 +180,8 @@ public class MogoRouteOverlayManager implements
        }
 //        CallerLogger.INSTANCE.d(M_OLD_ROUTE + TAG , "onLocationChanged: size = "+ mTrajectoryList.size()+" ----- "+mLocation.getLongitude()+"-"+mLocation.getLatitude());
        ArrayList list = new ArrayList();
+        MogoLatLng carlatLng = new MogoLatLng(CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(),CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon());
+        list.add(carlatLng);
        for (MogoLatLng latLng : temp) {
 //            if(!isPointOnCarFront(mLocation,latLng)){
            list.add(latLng);
@@ -191,6 +193,7 @@ public class MogoRouteOverlayManager implements
        }
    }

+
    public boolean isPointOnCarFront(MogoLocation carLocal, MogoLatLng pointLocal) {
        double carLon = carLocal.getLongitude();
        double carLat = carLocal.getLatitude();
--- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
+++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
@@ -53,10 +53,10 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
                        return map;
                    }
                });
-        crash.config().setChannel("eagle");
+        String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context);
+        crash.config().setChannel("MAP_SDK_VERSION:"+mapSDKVersion);
        //可选，可以设置自定义did,不设置会使用内部默认的
        crash.config().setDeviceId(MoGoAiCloudClientConfig.getInstance().getSn());
-        String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context);
        crash.addTags(MAP_SDK_VERSION, mapSDKVersion);
 //        crash.setReportUrl("www.xxx.com"); // 私有化部署：私有化部署才配置上报地址
 //        crash.addTags("key", "value"); // 自定义筛选tag, 按需添加、可多次覆盖
@@ -66,6 +66,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
        dimension.put("Devices_SN_DeviceId", MoGoAiCloudClientConfig.getInstance().getSn() + "__" + DeviceIdUtils.getDeviceId(context));
        dimension.put("Devices_SN_WidevineID_MD5", MoGoAiCloudClientConfig.getInstance().getSn() + "__" + DeviceIdUtils.getWidevineIDWithMd5(context));
        dimension.put("Devices_SN_WidevineID", MoGoAiCloudClientConfig.getInstance().getSn() + "__" + DeviceIdUtils.getWidevineID(context));
+        dimension.put(MAP_SDK_VERSION, mapSDKVersion);
        HashMap<String, Double> metric = new HashMap<>();
        //指标值
        //metric.put("Devices_ID_metric", (double) 100);
@@ -95,7 +96,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
        //是否打印日志，注：线上release版本要配置为false
        builder.debugMode(true);
        //支持用户自定义user_id把平台数据和自己用户关联起来，可以不配置
-        builder.userId(MoGoAiCloudClientConfig.getInstance().getSn());
+//        builder.userId(MoGoAiCloudClientConfig.getInstance().getSn());
        //私有化部署：配置数据上报的域名 （私有化部署才需要配置，内部有默认域名），测试支持设置http://www.xxx.com  默认是https协议
 //        builder.defaultReportDomain("www.xxx.com");
        //设置渠道。1.3.16版本增加接口