Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into test_MogoAP_eagle-1030_211020_8.0.14.2

core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java

@@ -63,7 +63,7 @@ public class SmallMapDirectionView
     private Marker mStartMarker;
     private Marker mEndMarker;
 
-    private int zoomLevel = 13;
+    private int zoomLevel = 15;
     private List<LatLng> mCoordinatesLatLng = new ArrayList<>();
     private List<MogoLatLng> mCoordinatesLatLngCurrent = new ArrayList<>();
     private Polyline mPolyline;
@@ -217,7 +217,7 @@ public class SmallMapDirectionView
                 clearPolyline();
                 mCoordinatesLatLng.clear();
             }
-             cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).build();
+             cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
         } else {
             //设置希望展示的地图缩放级别
              cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java

@@ -41,7 +41,7 @@ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 {
                     @Override
                     public void run() {
                         int speed = (int) (mLocation.getSpeed() * 3.6f);
-                        if (speed > speedLimmit){
+                        if (speed > 0 && speedLimmit > 0){
                             CallerHmiManager.INSTANCE.showLimitingVelocity(speedLimmit);
                         }else {
                             CallerHmiManager.INSTANCE.disableLimitingVelocity();

modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt

@@ -63,7 +63,10 @@ enum class EventTypeEnum(
     ),
 
     //结冰
-    FOURS_ICE("10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr, content = "前方路面结冰", tts = "路面结冰"),
+    FOURS_ICE(
+            "10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr,
+            "前方路面结冰", "路面结冰"
+    ),
 
     //停车场
     FOURS_PARKING("10012", "停车场", "停车场",  content = "停车场附近", tts = "停车场"),

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -31,6 +31,7 @@ import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.api.CallChatApi;
+import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
 import com.mogo.module.main.cards.MogoModulesManager;
@@ -51,6 +52,9 @@ import com.zhidao.adasconfig.api.AdasConfigApiController;
 import com.zhidao.adasconfig.common.log.LoggerController;
 import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author congtaowang
  * @since 2019-12-23
@@ -176,6 +180,8 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         if (hasFocus) {
+            // 统计代码
+            final Map<String, Object> properties = new HashMap<>();
             long hotStartTime = AppLaunchTimeUtils.getTimeCalculate(AppLaunchTimeUtils.HOT_START);
             if (AppLaunchTimeUtils.sColdStartTime > 0 && hotStartTime > 0) {
                 // 真正的冷启动时间 = Application启动时间 + 热启动时间
@@ -184,14 +190,17 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
                 if (coldStartTime < 50000) {
                     // 上传冷启动时间coldStartTime
                     Logger.i(TAG, "coldStartTime:" + coldStartTime);
+                    properties.put("app_launch_coldStartTime", coldStartTime);
                 }
             } else if (hotStartTime > 0) {
                 // 过滤掉异常启动时间
                 if (hotStartTime < 30000) {
                     // 上传热启动时间hotStartTime
                     Logger.i(TAG, "hotStartTime:" + hotStartTime);
+                    properties.put("app_launch_hotStartTime", hotStartTime);
                 }
             }
+            MogoApisHandler.getInstance().getApis().getAnalyticsApi().track("app_launch_time", properties);
         }
     }