[6.4.0][merge] 解决冲突

2024-04-16 19:14:04 +08:00
parent e4de6ab743 adedc2b131
commit 26eb87434c
422 changed files with 4757 additions and 5533 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -82,7 +82,6 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,

    override fun initViews() {
        injectFloatView()
-        injectStatusBar()
        window.setBackgroundDrawable(null)
        initConnectInfoRV()
        CallerHmiManager.init(this)
@@ -95,28 +94,6 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
        PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG)
    }

-    private fun injectStatusBar() {
-        val decorView = this.window.decorView as? FrameLayout ?: return
-        val contentView =
-            (decorView.findViewById<View>(android.R.id.content) as? ViewGroup)?.getChildAt(0)
-                ?: return
-        contentView.fitsSystemWindows = false
-        decorView.clipToPadding = false
-        var statusBarView = decorView.findViewWithTag<View>("status_bar")
-        if (statusBarView == null) {
-            val statusBar = CallerHmiFloatViewManager.getView(this)
-            statusBarView = statusBar ?: StatusBarView(this)
-            statusBarView.tag = "status_bar"
-        }
-        val statusBarLP = FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT,
-        )
-        statusBarLP.topMargin = 0
-        statusBarLP.gravity = Gravity.TOP
-        decorView.addView(statusBarView, statusBarLP)
-    }
-
    // todo 优化 车聊聊
    private fun injectFloatView() {
        val decorView = this.window.decorView as? FrameLayout ?: return
@@ -201,23 +178,22 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
        MogoStatusManager.getInstance().setVrMode(TAG, true)
        MogoModulesManager.getInstance().init(this)
        loadOthersModules()
-        mogoMapListenerHandler.registerHostMapListener(TAG, object : IMogoMapListener {
-            override fun onMapLoaded() {
-                // 延时加载其他模块
-                window.decorView.post {
-                    MogoStatusManager.getInstance().setScreenCoverMode(TAG, true)
-                    HdMapBuildConfig.isMapLoaded = true
-                    mPresenter!!.delayOperations()
-                    loadFunctionFragment()
-                    // 设置地图样式
-                    mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR)
-                }
-                i(
-                    SceneConstant.M_HMI + TAG,
-                    "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"
-                )
-            }
-        })
+        mPresenter!!.delayOperations()
+//        mogoMapListenerHandler.registerHostMapListener(TAG, object : IMogoMapListener {
+//            override fun onMapLoaded() {
+//                // 延时加载其他模块
+//                window.decorView.post {
+//                    MogoStatusManager.getInstance().setScreenCoverMode(TAG, true)
+//                    HdMapBuildConfig.isMapLoaded = true
+//                    // 设置地图样式
+//                    mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR)
+//                }
+//                i(
+//                    SceneConstant.M_HMI + TAG,
+//                    "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"
+//                )
+//            }
+//        })
    }

    /**
@@ -349,7 +325,7 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
        super.onDestroy()
        CallerAutoPilotStatusListenerManager.removeListener(TAG)
        CallerRequestActivityHandleManager.removeListener(TAG)
-        mogoMapListenerHandler.unregisterHostMapListener(TAG)
+        //mogoMapListenerHandler.unregisterHostMapListener(TAG)
        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false)
        d(SceneConstant.M_HMI + TAG, "destroy.")
        ContextHolderUtil.releaseContext()
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -111,31 +111,18 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
    private void loadOCHModule() {
        IMoGoFunctionProvider ochProvider;
        // 兼容处理之前联想PAD及小巴车多个设备部署不同APP方案
-        if (!DebugConfig.isMultiDisplay()) {
-            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                        .build("/driver/api")
-                        .navigation(getContext());
-            } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
-                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                        .build("/passenger/api")
-                        .navigation(getContext());
-            } else {
-                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                        .build("/noop/api")
-                        .navigation(getContext());
-            }
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
+                    .build("/driver/api")
+                    .navigation(getContext());
+        } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+            ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
+                    .build("/passenger/api")
+                    .navigation(getContext());
        } else {
-            // 目前只有金旅星辰乘客屏是连接的双屏
-            if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                        .build("/passenger/api")
-                        .navigation(getContext());
-            } else {
-                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
-                        .build("/noop/api")
-                        .navigation(getContext());
-            }
+            ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
+                    .build("/noop/api")
+                    .navigation(getContext());
        }

        if (ochProvider != null) {
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
@@ -174,9 +174,9 @@ class SmallMapView @JvmOverloads constructor(
        // 关闭显示实时路况图层，aMap是地图控制器对象。
        mAMap?.isTrafficEnabled = false
        // 设置 锚点 图标
-        iconRes = if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+        iconRes = if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
            R.drawable.map_bus_icon
-        } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) {
+        } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) {
            R.drawable.map_m2_icon
        } else {
            R.drawable.map_car_icon
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -257,12 +257,13 @@ class HttpDnsStartUp : AndroidStartup<Boolean>(), IMoGoCloudListener {
            // 初始化网络配置
            NetConfigUtils.init()
            // 加入启动统计
-            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
-            MogoAnalyticUtils.track("app_start_time", mStartParams)
+//            todo 钟超 登陆后调用 获取 app_flavor
+//            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
+//            MogoAnalyticUtils.track("app_start_time", mStartParams)
        }
    }