[V630] refactor: targetSdk 27->29后，application.startActivity()需要增加Intent.FLAG_ACTIVITY_NEW_TASK，兼容处理；

2024-03-06 16:03:21 +08:00
parent b40b9115cf
commit 34d74fbb91
9 changed files with 26 additions and 13 deletions
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
+import com.mogo.eagle.core.utilcode.util.ActivityUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.overlay.core.Level;
@@ -529,7 +530,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
            }
            if ((int)mSwitchLine.getTag() == 0){//切换路线
                Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);
-                startActivity(intent);
+                ActivityUtils.startActivity(intent);
            }else {//结束任务
                OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder();
                OCHCommitDialog closeLineConfirmDialog = builder
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
+import com.mogo.eagle.core.utilcode.util.ActivityUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.overlay.core.Level;
@@ -519,7 +520,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
            }
            if ((int)mSwitchLine.getTag() == 0){//切换路线
                Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);
-                startActivity(intent);
+                ActivityUtils.startActivity(intent);
            }else {//结束任务
                OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder();
                OCHCommitDialog closeLineConfirmDialog = builder
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt
@@ -6,6 +6,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.taxi.base.BaseViewModel
@@ -38,7 +39,7 @@ class TaxiRoutingFragmentViewModel : BaseViewModel<TaxiRoutingUiState, TaxiRouti
            is TaxiRoutingUiIntent.StartChooseLineAction -> {
                DebugView.printInfoMsg("[选择任务] 跳转到选择任务列表")
                val intent = Intent(mContext, TaxiRoutingChooseLineActivity::class.java)
-                mContext?.startActivity(intent)
+                ActivityUtils.startActivity(intent)
            }

            is TaxiRoutingUiIntent.ShowRoutingTask -> {
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt
@@ -123,7 +123,9 @@ class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
        launch(Dispatchers.Main) {
            Toast.makeText(Utils.getApp(), "发现系统环境不一致，正在重启...", Toast.LENGTH_SHORT).show()
            delay(50)
-            Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
+            Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName)?.also {
+                ActivityUtils.startActivity(it)
+            }
            Process.killProcess(Process.myPid())
        }
    }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt
@@ -7,6 +7,7 @@ import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.EnvConfig
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.commons.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.Utils


@@ -85,7 +86,9 @@ object EnvChangeManager {
    }

    private fun restartApp() {
-        Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
+        Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName)?.also {
+            ActivityUtils.startActivity(it)
+        }
        Process.killProcess(Process.myPid())
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -2168,7 +2168,7 @@ internal class DebugSettingView @JvmOverloads constructor(
        Intent(Intent.ACTION_MAIN).apply {
            addCategory(Intent.CATEGORY_HOME)
            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            context.startActivity(this)
+            ActivityUtils.startActivity(this)
            Process.killProcess(Process.myPid())
            exitProcess(0)
        }
@@ -2247,8 +2247,9 @@ internal class DebugSettingView @JvmOverloads constructor(
    }

    private fun restartApp() {
-        Utils.getApp()
-            .startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
+        Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName)?.also {
+            ActivityUtils.startActivity(it)
+        }
        Process.killProcess(Process.myPid())
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.utils.KeyBoardUtil
 import com.mogo.eagle.core.function.msgbox.MsgBoxConfig
 import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.service_biz.BizConfig
@@ -263,7 +264,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
        Intent(Intent.ACTION_MAIN).apply {
            addCategory(Intent.CATEGORY_HOME)
            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            context.startActivity(this)
+            ActivityUtils.startActivity(this)
            Process.killProcess(Process.myPid())
            exitProcess(0)
        }
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/BackgrounderPermission.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/BackgrounderPermission.java
@@ -12,6 +12,8 @@ import android.util.Log;

 import androidx.annotation.RequiresApi;

+import com.mogo.eagle.core.utilcode.util.ActivityUtils;
+

 /**
 * 长时间后台运行权限检查
@@ -41,8 +43,7 @@ public class BackgrounderPermission {

    public void showPermissionLongBackgroundRunningDialog(Context context) {
        Intent intent = new Intent(context, PermissionLongBackgroundRunningDialog.class);
-        context.startActivity(intent);
-
+        ActivityUtils.startActivity(intent);
    }

    void onBackgrounderPermission(boolean isBackgrounderPermission) {
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt
@@ -54,7 +54,7 @@ class ApkInstaller {
                val intent = Intent(context, InstallApkSessionApi::class.java)
                intent.putExtra("APK_FILE_PATH", apkFile.absolutePath)
                block?.also { InstallApkSessionApi.listener = it }
-                context.startActivity(intent)
+                ActivityUtils.startActivity(intent)
            }
        }

@@ -161,7 +161,9 @@ class InstallApkSessionApi: AppCompatActivity() {
                    Log.i(TAG, "--- InstallApkSessionApi -- confirm  --")
                    // This test app isn't privileged, so the user has to confirm the install.
                    val confirmIntent = extras[Intent.EXTRA_INTENT] as? Intent
-                    startActivity(confirmIntent)
+                    confirmIntent?.also {
+                        ActivityUtils.startActivity(it)
+                    }
                    finish()
                }
                STATUS_SUCCESS -> {