Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

app/build.gradle

@@ -195,16 +195,12 @@ android {
         // launcher app
         launcher {
             dimension "basic"
-            // 是否启动位置服务
-            buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true'
             // 是否作为 launcher 运行
             buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
             buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
             buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
             buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
             buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime()
-            // 是否支持目的地导航策略
-            buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'false'
         }
         // 配置网络环境，QA、线上、演示
         qa {

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

@@ -70,18 +70,13 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
         }
         DebugConfig.setNetMode(mode)
         DebugConfig.setDebug(BuildConfig.DEBUG)
-        DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE)
         DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER)
-        DebugConfig.setUseMockObuData(false)
         DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE)
         DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product)
         DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID)
-        DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
-        DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush(BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH)
         DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME)
-        DebugConfig.setObuType(
-                SharedPrefsMgr.getInstance(context).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI)
-        )
+        DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
+
     }
 
     private fun initOtherConfig(context: Context) {

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

@@ -18,7 +18,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.constants.HostConst
 import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
-import com.mogo.commons.device.Devices
+import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.network.NetConfigUtils
 import com.mogo.commons.network.Utils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -232,10 +232,6 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
      */
     private fun asyncInit() {
         ThreadPoolService.execute {
-            if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
-                Devices.init(AbsMogoApplication.getApp())
-                Devices.checkBindState()
-            }
             //初始化网络配置
             NetConfigUtils.init()
 
@@ -319,7 +315,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                 )
                 override fun onConnectFailure() {
                     CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectFailure")
-                    DebugConfig.setDownloadSnapshot(false)
+                    MogoStatusManager.getInstance().setCloudSocketMode(TAG,false)
                 }
 
                 @ChainLog(
@@ -332,7 +328,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                 )
                 override fun onConnectSuccess() {
                     CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectSuccess")
-                    DebugConfig.setDownloadSnapshot(true)
+                    MogoStatusManager.getInstance().setCloudSocketMode(TAG,true)
                 }
 
                 @ChainLog(
@@ -345,7 +341,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                 )
                 override fun onConnectLost() {
                     CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectLost")
-                    DebugConfig.setDownloadSnapshot(false)
+                    MogoStatusManager.getInstance().setCloudSocketMode(TAG,false)
                 }
 
                 @ChainLog(