[Change]

1、新增针对bug中乘客屏幕地图宽度设置 2、删除OCH的沉浸式的顶部适配，交给实现方自己添加72px高度（联想pad）可以参考fragment_hmi.xml android:paddingTop="72px"实现方案 Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-04-12 15:23:29 +08:00
parent 2d5d8d8400
commit ef0909e642
5 changed files with 33 additions and 56 deletions
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -67,7 +67,6 @@ public class MogoApplication extends MainMoGoApplication {
        DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product);
        DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID);
        DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush(BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH);
-        DebugConfig.setMapBased(BuildConfig.IS_MAP_BASED);
        DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME);
        DebugConfig.setObuType(SharedPrefsMgr.getInstance(this).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI));

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
@@ -18,7 +18,6 @@ import androidx.fragment.app.Fragment;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.context.ContextHolderUtil;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.BaseFragment;
 import com.mogo.commons.mvp.MvpActivity;
 import com.mogo.commons.mvp.MvpFragment;
@@ -44,9 +43,7 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.fragmentmanager.FragmentStackTransactionListener;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.service.statusmanager.StatusDescriptor;

 import java.util.HashMap;
 import java.util.Map;
@@ -59,7 +56,6 @@ import java.util.Map;
 */
 public class MainActivity extends MvpActivity<MainView, MainPresenter> implements MainView,
        IMogoLocationListener,
-        IMogoStatusChangedListener,
        FragmentStackTransactionListener {

    protected static final String TAG = "MainActivity";
@@ -122,10 +118,12 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        super.onCreate(savedInstanceState);
        calculateStartTime();
        ContextHolderUtil.holdContext(this);
+        // 加载模块
        mPresenter.postLoadModuleMsg();
+        // 监听网络状态
        NetworkUtils.listenNetStrength(this);
+        // 浓雾预警
        DisplayEffectsHelper.getInstance().init(clSpecialEffect);
-        mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this);

        mPresenter.checkPermission(this);
    }
@@ -185,26 +183,23 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
            listenerRegister.registerMarkerClickListener(EventDispatchCenter.getInstance());
        }

-        if (DebugConfig.isMapBased()) {
-            EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "map loaded." + Thread.currentThread().getName());
-                // 延时加载其他模块
-                getWindow().getDecorView().postDelayed(() -> {
-                    loadOthersModules();
-                    loadFunctionFragment();
+        EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
+            CallerLogger.INSTANCE.d(M_HMI + TAG, "map loaded." + Thread.currentThread().getName());
+            // 延时加载其他模块
+            getWindow().getDecorView().postDelayed(() -> {
+                loadOthersModules();
+                loadFunctionFragment();

-                    // TODO 这里临时兼容进入VR模式
-                    MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
-                    // 设置地图样式
-                    MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
-                }, 1000);
-                CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
-            });
-            loadFunctionMapView();
-        } else {
-            loadOthersModules();
-        }
+                // TODO 这里临时兼容进入VR模式，标记状态机。有些业务（OCH）会根据状态判断加载
+                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
+                // 设置地图样式
+                MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
+            }, 1000);
+            CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
+        });

+        // 加载地图
+        loadFunctionMapView();
    }

    @Override
@@ -265,7 +260,9 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
     */
    private void loadFunctionMapView() {
        MvpFragment fragmentHdMap = (MvpFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_MAP).navigation();
-        addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_map_fragment_container);
+        if (fragmentHdMap != null) {
+            addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_map_fragment_container);
+        }
    }

    @NonNull
@@ -306,10 +303,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement

    }

-    protected boolean doWhenBackPressed() {
-        return false;
-    }
-
    @Override
    protected void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
@@ -347,18 +340,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        ProcessUtils.killAllBackgroundProcesses();
    }

-    @Override
-    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            if (isTrue) {
-                clSpecialEffect.setVisibility(View.VISIBLE);
-            } else {
-                clSpecialEffect.setVisibility(View.GONE);
-            }
-
-        }
-    }
-
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
--- 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
@@ -7,13 +7,16 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Process;
 import android.text.TextUtils;
+import android.widget.FrameLayout;

 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.hmi.R;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.service.intent.IMogoIntentListener;

@@ -38,6 +41,13 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
    @Override
    protected void initViews() {
        super.initViews();
+        // 这里在初始化完GUI后，做一些个性化的定制
+        // 小巴车的乘客屏幕
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) &&
+                AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            FrameLayout frameLayout = findViewById(R.id.module_main_id_map_fragment_container);
+            frameLayout.setPadding(0, 0, 560, 0);
+        }
    }

    @Override
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -13,11 +13,11 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

+    <!--浓雾预警动画-->
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/cl_special_effect"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:visibility="gone"
        tools:visibility="visible">

        <ImageView
@@ -57,8 +57,7 @@
        <FrameLayout
            android:id="@+id/module_main_id_och_fragment"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="72px" />
+            android:layout_height="match_parent" />

        <!--小地图视图-->
        <FrameLayout
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -243,18 +243,6 @@ public class DebugConfig {
        return needRequestUserInfo;
    }

-    /**
-     * 是否基于地图
-     */
-    private static boolean isMapBased = true;
-
-    public static boolean isMapBased() {
-        return isMapBased;
-    }
-
-    public static void setMapBased(boolean isMapBased) {
-        DebugConfig.isMapBased = isMapBased;
-    }

    /**
     * 是否需要实时上报坐标位置