Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'

Dev robotaxi d app module 2110 220915 2.11.0

See merge request zhjt/AndroidApp/MoGoEagleEye!265

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt

@@ -258,15 +258,15 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
             mShownByMe.isAccessible = true
             mDismissed.setBoolean(this, false)
             mShownByMe.setBoolean(this, true)
+            if (isAdded) { //解决方法就是添加这行代码，如果已经添加了，就移除掉然后再show，就不会出现Fragment already added的错误了。
+                return
+            }
+            val ft: FragmentTransaction = manager.beginTransaction()
+            ft.add(this, tag)
+            ft.commitAllowingStateLoss()
         } catch (e: Exception) {
             Log.e("DialogFragment", "show", e.fillInStackTrace())
         }
-        if (isAdded) { //解决方法就是添加这行代码，如果已经添加了，就移除掉然后再show，就不会出现Fragment already added的错误了。
-            return
-        }
-        val ft: FragmentTransaction = manager.beginTransaction()
-        ft.add(this, tag)
-        ft.commitAllowingStateLoss()
     }
 
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java

@@ -26,8 +26,8 @@ import com.kwai.koom.base.MonitorManager;
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor;
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig;
 import com.kwai.koom.nativeoom.leakmonitor.LeakRecord;
-import com.mogo.cloud.commons.BuildConfig;
 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;
@@ -217,7 +217,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
      */
     public void startUpInStage2() {
         StartupConfig config = null;
-        if (BuildConfig.DEBUG) {
+        if (DebugConfig.isDebug()) {
             config = new StartupConfig.Builder()
                     .setLoggerLevel(LoggerLevel.DEBUG)
                     .setOpenStatistics(true)
@@ -283,8 +283,10 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 
         // 启动一些基本的服务：定位等
         startBaseService();
-        // 启动Native内存泄漏监测
-        startLeakMonitor();
+        if (DebugConfig.isDebug()) {
+            // 启动Native内存泄漏监测
+            startLeakMonitor();
+        }
     }
 
     /**
@@ -305,12 +307,10 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
                 .setMonitorThreshold(16)
                 .setNativeHeapAllocatedThreshold(0)
                 .setSelectedSoList(new String[]{"libhdmap", "libmap",
-                        "libAMapSDK_NAVI_v8_0_1", "librouting", "libZegoExpressEngine",
-                        "libUtils", "libcommon", "libcntts", "libduiutils",
-                        "libdatamgr", "libdatascript", "libguidance", "libndsprovider",
-                        "libndssqlite", "libpbjni", "libsearch"
+                        "libAMapSDK_NAVI_v8_0_1", "libZegoExpressEngine",
+                        "libcntts"
                 })
-                .setEnableLocalSymbolic(BuildConfig.DEBUG)
+                .setEnableLocalSymbolic(DebugConfig.isDebug())
                 .setLeakListener(leaks -> {
                     StringBuilder stringBuilder = new StringBuilder();
                     if (!leaks.isEmpty()) {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -4,20 +4,16 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI
 
 import android.content.Context;
 import android.os.Process;
-import android.util.Log;
 
 import com.bytedance.boost_multidex.BoostMultiDex;
 import com.elegant.utils.UiThreadHandler;
-import com.kwai.koom.base.DefaultInitTask;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.data.app.AppConfigInfo;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
-import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.notice.PushUIConstants;
@@ -31,7 +27,6 @@ import com.mogo.map.MapApiPath;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.service.ServiceConst;
-import com.zhidao.support.adas.high.AdasManager;
 import com.zhidao.support.obu.ami.AmiClientManager;
 import com.zhjt.mogo_core_function_devatools.monitor.db.CpuInfo;
 import com.zhjt.mogo_core_function_devatools.monitor.db.MemInfo;
@@ -62,8 +57,9 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         initLogConfig();
         initTipToast();
         initModules();
-
-        initKoom();
+        if (DebugConfig.isDebug()) {
+            initKoom();
+        }
         //查询是否有版本的更新
         queryAppUpgrade();
         checkMonitorDb();