Merge branch 'dev_robotaxi-d-app-module_280_220608_2.8.0' into 'test_robotaxi-d-app-module_280_220608_2.8.0.1'

Dev robotaxi d app module 280 220608 2.8.0

See merge request zhjt/AndroidApp/MoGoEagleEye!39

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java

@@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.GsonUtils;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.bus.bean.BusRoutesResult;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.model.BusOrderModel;
@@ -70,22 +71,27 @@ public class BusTrajectoryManager {
         if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载");
+            ToastUtils.showShort("轨迹开始下载");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功");
+            ToastUtils.showShort("轨迹下载成功");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地无对应轨迹");
+            ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地有对应轨迹，认为成功");
+            ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
             // 5. 轨迹管理_轨迹下载超时
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时");
+            ToastUtils.showShort("轨迹下载超时");
         }
     }
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java

@@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.GsonUtils;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.taxi.constant.TaxiConst;
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
@@ -68,22 +69,27 @@ public class TaxiTrajectoryManager {
         if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载");
+            ToastUtils.showShort("轨迹开始下载");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功");
+            ToastUtils.showShort("轨迹下载成功");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地无对应轨迹");
+            ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地有对应轨迹，认为成功");
+            ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
             // 5. 轨迹管理_轨迹下载超时
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时");
+            ToastUtils.showShort("轨迹下载超时");
         }
      }
 

app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt

@@ -213,6 +213,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
             val mStartParams: HashMap<String, Any> = HashMap()
             mStartParams["start_time"] = TimeUtils.getNowMills()
             mStartParams["app_version"] = AppUtils.getAppVersionName()
+            mStartParams["app_flavor"] = DebugConfig.getProductFlavor();
             mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
 
             AnalyticsManager.track("app_start_time", mStartParams)

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt

@@ -46,7 +46,7 @@ class MapPointCloudSubscriber private constructor() : IMoGoSubscriber, IMoGoAuto
                 isDrawPointCloud = true
                 PointCloudHelper.setIsDrawPointCloud(true)//打开点云绘制
             }
-
+            PointCloudHelper.setIsDrawPointCloud(true)//打开点云绘制
 
             /**
              * 更新点云数据