diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index 4791e27a9d..ac5e8a79e8 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -22,24 +22,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.elegant.network.ParamsBuilder; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.data.BaseData; -import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.eagle.core.function.check.R; -import com.mogo.eagle.core.function.check.model.CheckItemInfo; import com.mogo.eagle.core.function.check.net.CheckApiServiceFactory; import com.mogo.eagle.core.function.check.net.CheckResultData; +import com.mogo.eagle.core.utilcode.util.ActivityUtils; +import com.mogo.eagle.core.utilcode.util.AppUtils; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.module.common.view.ImageViewClipBounds; import com.mogo.module.common.view.SpacesItemDecoration; import com.mogo.module.service.receiver.MogoReceiver; -import com.mogo.utils.TipToast; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.NetworkStatusUtil; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Map; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -269,6 +266,7 @@ public class CheckActivity extends AppCompatActivity { public static void start(Context context) { Intent starter = new Intent(context, CheckActivity.class); + starter.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(starter); } @@ -277,11 +275,14 @@ public class CheckActivity extends AppCompatActivity { */ public static void showDialog(Context context) { try { - if (dialog != null) { - dialog.cancel(); + if (AppUtils.isAppRunning(getPackageName(context)) && + (ActivityUtils.getTopActivity() instanceof CheckActivity == false)) { + if (dialog != null) { + dialog.cancel(); + } + dialog = new CheckDialog(context, true); + dialog.show(); } - dialog = new CheckDialog(context, true); - dialog.show(); } catch (Exception e) { e.printStackTrace(); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java index 8582b990c9..d71cec30b7 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java @@ -20,10 +20,10 @@ public class VehicleMonitoring implements Handler.Callback { private static final String TAG = "VehicleMonitoring"; private final Context mContext; private final Handler mHandler = new Handler(this); - //自动驾驶状态下10分钟间隔弹框提示一次 - private static final long AUTO_CHECK_STATUS_DELAY = 10 * 60 * 1000;//自动驾驶状态下10分钟弹框提示一次 - //非自动驾驶测试数据 后期根据需求做修改 2min - private static final long MANUAL_CHECK_STATUS_DELAY = 2 * 60 * 1000; + //自动驾驶状态下**分钟间隔弹框提示一次 后期根据需求做修改,暂定30秒自检一次 + private static final long AUTO_CHECK_STATUS_DELAY = 30 * 1000; + //非自动驾驶测试数据 后期根据需求做修改 + private static final long MANUAL_CHECK_STATUS_DELAY = 30 * 1000; //自动驾驶状态 private static int AutopilotStatus = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus();