From 099fde5d4683e3fc26721e5bcf036866b1eea9ba Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 8 Nov 2021 18:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8TipToast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- OCH/mogo-och-bus/build.gradle | 2 ++ .../mogo/och/bus/fragment/OchBusFragment.java | 2 +- OCH/mogo-och-taxi/build.gradle | 2 ++ .../com/mogo/och/taxi/MogoOCHTaxiModel.java | 2 +- .../com/mogo/launcher/MogoApplication.java | 12 ++--------- .../utilcode/mogo/toast}/ResourcesHelper.java | 2 +- .../utilcode/mogo/toast}/TipDrawable.java | 2 +- .../core/utilcode/mogo/toast}/TipToast.java | 4 ++-- .../com/mogo/commons/AbsMogoApplication.java | 20 ++++++++++++++----- .../map/impl/amap/utils/MapStyleUtils.java | 2 +- libraries/map-custom/build.gradle | 2 ++ .../mogo/map/impl/custom/AMapViewWrapper.java | 2 +- modules/mogo-module-apps/build.gradle | 2 ++ .../module/apps/AppNavigatorPresenter.java | 2 +- .../mogo/module/apps/AppsPagerAdapter.java | 4 +--- .../module/apps/applaunch/AppLauncher.java | 6 +----- .../apps/applaunch/BaseAppLauncher.java | 2 +- .../applaunch/InternalFunctionLauncher.java | 6 +----- .../apps/view/OnAiAssistClickListener.java | 2 +- modules/mogo-module-carchatting/build.gradle | 2 ++ .../module/carchatting/biz/CallChatCenter.kt | 2 +- modules/mogo-module-extensions/build.gradle | 2 ++ .../extensions/entrance/EntranceFragment.java | 6 +++--- .../extensions/navi/VrModeNavInfoView.java | 2 +- .../utils/CameraLiveNoticeHelper.java | 2 +- modules/mogo-module-main/build.gradle | 2 ++ .../module/main/cards/MogoModulesManager.java | 3 +-- modules/mogo-module-map/build.gradle | 2 ++ .../com/mogo/module/map/MapPresenter.java | 2 +- modules/mogo-module-push/build.gradle | 2 ++ .../mogo/module/push/view/FloatViewOrigin.kt | 2 +- .../intent/AccStatusIntentHandler.java | 2 -- .../intent/AppOperationIntentHandler.java | 4 +--- .../service/intent/MockIntentHandler.java | 2 +- .../service/marker/MapMarkerManager.java | 6 +----- .../panel/OnlineCarPanelAdapter.java | 2 +- .../com/mogo/module/share/TanluManager.java | 4 ++-- .../module/share/manager/SeekHelpManager.kt | 2 +- .../mogo/module/share/manager/UploadHelper.kt | 11 ++++++---- .../v2x/adapter/holder/V2XBaseViewHolder.java | 2 +- .../holder/V2XHistoryBaseViewHolder.java | 2 +- .../listener/V2XMessageListener_401003.java | 2 +- .../listener/V2XMessageListener_401009.java | 2 +- .../v2x/scenario/impl/V2XScenarioManager.java | 2 +- .../scene/livecar/V2XPushLiveCarScenario.java | 2 +- .../livecar/V2XVoiceCallLiveScenario.java | 2 +- .../module/v2x/utils/RoadConditionUtils.java | 2 +- .../module/widgets/AutoNaviIntentHandler.java | 2 +- 48 files changed, 81 insertions(+), 77 deletions(-) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast}/ResourcesHelper.java (98%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast}/TipDrawable.java (98%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast}/TipToast.java (98%) diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 46e96e51f2..e303b6368b 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/OCH/mogo-och-bus/build.gradle @@ -52,6 +52,7 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_api } else { @@ -60,6 +61,7 @@ dependencies { implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-api') diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index a9beafd7c4..75bda62d70 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -14,7 +14,7 @@ import com.mogo.och.bus.bean.OchBusStation; import com.mogo.och.bus.presenter.OchBusPresenter; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import java.util.List; diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index 140784c914..11f721a2dc 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -48,6 +48,7 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_api } else { @@ -56,6 +57,7 @@ dependencies { implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-api') } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 9ea49264c6..f897b01a23 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -21,7 +21,7 @@ import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.utils.NetworkUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 516e2cb7b8..1ffc6c1ed7 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Process; import android.util.Log; -import com.alibaba.android.arouter.launcher.ARouter; import com.auto.zhidao.logsdk.CrashSystem; import com.bytedance.boost_multidex.BoostMultiDex; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; @@ -34,8 +33,6 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.utils.ObuConfig; import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; -import com.mogo.test.crashreport.ITestCrashReportProvider; -import com.mogo.test.crashreport.upgrade.UpgradeReportProvider; import com.mogo.test.crashreport.CrashReportConstants; import com.mogo.test.crashreport.upgrade.UpgradeReportConstants; import com.mogo.utils.ProcessUtils; @@ -55,7 +52,6 @@ public class MogoApplication extends AbsMogoApplication { private static final String TAG = "MogoApplication"; private long start; -// private volatile static RefWatcher refWatcher; @Override public void onCreate() { @@ -114,8 +110,8 @@ public class MogoApplication extends AbsMogoApplication { } @Override - protected void init() { - super.init(); + protected void initHttpDns() { + super.initHttpDns(); prepareBaseService(); } @@ -342,10 +338,6 @@ public class MogoApplication extends AbsMogoApplication { startService(intent); } -// if (refWatcher == null) { -// refWatcher = LeakCanary.install(this); -// } - Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ResourcesHelper.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/ResourcesHelper.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/ResourcesHelper.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/ResourcesHelper.java index 8afecd5fb2..07e92621a2 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ResourcesHelper.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/ResourcesHelper.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.eagle.core.utilcode.mogo.toast; import android.content.Context; import android.content.res.ColorStateList; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipDrawable.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipDrawable.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/TipDrawable.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipDrawable.java index 9be08550d2..d67f078846 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipDrawable.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipDrawable.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.eagle.core.utilcode.mogo.toast; import android.graphics.drawable.Drawable; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java index 13d023ea09..1eb4e366ce 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.eagle.core.utilcode.mogo.toast; /* * 2016/1/1 by congtaowang @@ -17,7 +17,7 @@ import android.view.Gravity; import android.view.View; import android.widget.Toast; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index c330c54261..94e122c543 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -25,8 +25,8 @@ import com.mogo.commons.network.X509TrustManagerImpl; import com.mogo.commons.storage.SpStorage; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.utils.ThreadPoolService; -import com.mogo.utils.TipDrawable; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.NetConfig; @@ -41,7 +41,7 @@ import okhttp3.Request; * @author congtaowang * @since 2019-12-23 *

- * 描述 + * 必须继承并实现列面的方法，这里完成了鹰眼基础服务的初始化操作 */ public abstract class AbsMogoApplication extends Application { @@ -62,10 +62,13 @@ public abstract class AbsMogoApplication extends Application { initARouter(); Utils.init(this); if (shouldInit()) { - init(); + initHttpDns(); } } + /** + * 初始化跨模块框架 ARouter + */ private void initARouter() { ARouter.init(sApp); // 初始化 arouter @@ -79,12 +82,19 @@ public abstract class AbsMogoApplication extends Application { return true; } - protected void init() { + /** + * 初始化 HttpDNS ，这里会通过一个接口获取所有鹰眼中使用的微服务域名以及端口号 + * 后续的网络请求会通过 HttpDnsInterceptor 进行拦截替换 + */ + protected void initHttpDns() { if (sApis == null) { sApis = MogoHttpDnsHandler.getHttpDnsApi(); } } + /** + * 初始化 自定义样式e饿 + */ protected void initTipToast() { TipToast.init(this, ((context, message, tipDrawable) -> { if (TextUtils.isEmpty(message)) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java index 82e1727d0a..f60caf9da8 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java @@ -7,7 +7,7 @@ import android.graphics.Color; import com.amap.api.navi.model.RouteOverlayOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.map.impl.amap.R; -import com.mogo.utils.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.utils.WindowUtils; /** diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index aab942a6f3..35e7435f46 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -65,6 +65,7 @@ dependencies { implementation rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogocommons + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call @@ -73,6 +74,7 @@ dependencies { implementation project(':libraries:mogo-map-api') implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index c0203db541..21f6101fb1 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -39,7 +39,7 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index be8db33d37..5736e7378c 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -62,6 +62,7 @@ dependencies { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":libraries:mogo-map-api") @@ -70,6 +71,7 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java index 39d5d63f83..08f08cc6ce 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java @@ -16,7 +16,7 @@ import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.LaunchUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPagerAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPagerAdapter.java index 472f22a110..cc91a149e1 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPagerAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPagerAdapter.java @@ -4,17 +4,15 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.GridView; import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; import com.mogo.module.apps.model.AppInfo; import com.mogo.module.apps.view.PagerIndicator; import com.mogo.module.apps.view.PagerSlidingTabStripV2; -import com.mogo.utils.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import java.util.List; import java.util.Map; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java index 077cc96031..5792dae42a 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java @@ -5,12 +5,8 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.mogo.module.apps.AppServiceHandler; -import com.mogo.module.apps.R; import com.mogo.module.apps.model.AppInfo; -import com.mogo.utils.LaunchUtils; -import com.mogo.utils.TipToast; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; /** * @author congtaowang diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java index 2b27fb3566..3a0b0307e2 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java @@ -5,7 +5,7 @@ import android.content.Context; import com.mogo.module.apps.AppServiceHandler; import com.mogo.module.apps.R; import com.mogo.utils.LaunchUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; /** diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java index cb59fc03d1..f5fd5cbdbc 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java @@ -6,16 +6,12 @@ import android.content.Intent; import android.text.TextUtils; import com.mogo.commons.AbsMogoApplication; -import com.mogo.module.apps.AppServiceHandler; import com.mogo.module.apps.AppsListActivity; import com.mogo.module.apps.R; import com.mogo.module.apps.model.AppEnum; import com.mogo.module.apps.model.AppInfo; -import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.utils.AppUtils; -import com.mogo.utils.LaunchUtils; -import com.mogo.utils.TipToast; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; /** * @author congtaowang diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java index 6325dd9535..1456bedd25 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java @@ -5,7 +5,7 @@ import android.view.View; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.device.Devices; import com.mogo.commons.voice.AIAssist; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; public /** diff --git a/modules/mogo-module-carchatting/build.gradle b/modules/mogo-module-carchatting/build.gradle index 1f5119ae5c..215c6318b3 100644 --- a/modules/mogo-module-carchatting/build.gradle +++ b/modules/mogo-module-carchatting/build.gradle @@ -75,6 +75,7 @@ dependencies { implementation rootProject.ext.dependencies.chat + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data } else { @@ -88,6 +89,7 @@ dependencies { implementation project(':modules:mogo-module-chat') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') } diff --git a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt index 0d0bb4abe1..312cec37a1 100644 --- a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt +++ b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt @@ -12,6 +12,7 @@ import com.mogo.chat.util.UserInfoHelper.currentCallType import com.mogo.chat.util.log import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.module.carchatting.R import com.mogo.module.carchatting.bean.UserInfo import com.mogo.module.carchatting.card.CallChatConstant.Companion.MODULE_NAME @@ -28,7 +29,6 @@ import com.mogo.module.carchatting.voice.VoiceUtil import com.mogo.service.IMogoServiceApis import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor -import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger import com.zhidao.carchattingprovider.MogoDriverInfo diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 962f469aa9..6eab6d0c2b 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -71,6 +71,7 @@ dependencies { implementation rootProject.ext.dependencies.moduleshare implementation rootProject.ext.dependencies.moduleservice + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_function_call @@ -83,6 +84,7 @@ dependencies { implementation project(':modules:mogo-module-share') implementation project(':modules:mogo-module-service') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-function-call') diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index b358c88c7c..b7ca28d211 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -46,6 +46,9 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.location.IMogoLocationClient; @@ -92,9 +95,6 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.windowview.IMogoTopViewStatusListener; import com.mogo.utils.LaunchUtils; -import com.mogo.utils.ResourcesHelper; -import com.mogo.utils.TipDrawable; -import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java index a00b1a9719..0e339b502c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java @@ -16,7 +16,7 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.module.extensions.R; import com.mogo.module.extensions.view.VerticalTrafficLightView; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import static com.mogo.module.common.constants.TrafficLightConst.TRAFFIC_LIGHT_COLOR_GRAY; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java index 240dd6e88d..4a7061362a 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java @@ -18,7 +18,7 @@ import com.mogo.module.extensions.live.CameraWindow3DAdapter; import com.mogo.module.extensions.live.PushDataType; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index a98f752697..e98ddbd047 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -60,6 +60,7 @@ dependencies { api rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call } else { @@ -70,6 +71,7 @@ dependencies { api project(':services:mogo-service') implementation project(':modules:mogo-module-carchattingprovider') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 472184b660..f04c7db768 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -15,10 +15,9 @@ import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.MainActivity; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.utils.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.utils.logger.Logger; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; diff --git a/modules/mogo-module-map/build.gradle b/modules/mogo-module-map/build.gradle index beeed8c4f0..df76110ecf 100644 --- a/modules/mogo-module-map/build.gradle +++ b/modules/mogo-module-map/build.gradle @@ -58,6 +58,7 @@ dependencies { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data } else { api project(":libraries:mogo-map") @@ -67,6 +68,7 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 96e1d723f8..ff243941c6 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -13,6 +13,7 @@ import com.mogo.commons.mvp.Presenter; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.commons.voice.VoicePreemptType; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.navi.IMogoNaviListener2; import com.mogo.map.navi.MogoNaviConfig; @@ -31,7 +32,6 @@ import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; import com.mogo.utils.AppUtils; -import com.mogo.utils.ResourcesHelper; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle index fbad8e21f1..fa7e8b8abe 100644 --- a/modules/mogo-module-push/build.gradle +++ b/modules/mogo-module-push/build.gradle @@ -69,6 +69,7 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogoserviceapi + implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":modules:mogo-module-push-base") @@ -77,6 +78,7 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':services:mogo-service-api') + implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatViewOrigin.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatViewOrigin.kt index d2b24659c9..703f4affd1 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatViewOrigin.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatViewOrigin.kt @@ -27,7 +27,7 @@ import com.mogo.module.push.view.roundimage.RoundedImageView import com.mogo.module.push.viewmodel.PushViewModel import com.mogo.service.windowview.IMogoTopViewManager import com.mogo.service.windowview.IMogoTopViewStatusListener -import com.mogo.utils.ResourcesHelper +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper import com.mogo.utils.ThreadPoolService import com.mogo.utils.UiThreadHandler import com.mogo.utils.glide.GlideApp diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 17f2bd0459..08845b191a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -3,13 +3,11 @@ package com.mogo.module.service.intent; import android.content.Context; import android.content.Intent; -import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.utils.CarSeries; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.launchercard.LauncherCardRefresher; import com.mogo.module.service.receiver.AccStatusReceiver; -import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; public diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java index 7b6ad75bf7..bf186b6fb9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java @@ -4,11 +4,9 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.mogo.module.common.MogoApisHandler; import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.module.service.ServiceConst; import com.mogo.utils.LaunchUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import org.json.JSONObject; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 67f459a76a..dcd582024b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -45,7 +45,7 @@ import com.mogo.module.service.R; import com.mogo.module.service.status.EnvStatusManager; import com.mogo.module.service.timedelay.TimeDelayUploadManager; import com.mogo.service.entrance.ButtonIndex; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index d284e8b6d0..a3d7e8672e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -6,7 +6,6 @@ import android.text.TextUtils; import com.mogo.cloud.socket.entity.SocketDownData; import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; @@ -14,9 +13,7 @@ import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; -import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.api.CallChatApi; -import com.mogo.module.common.drawer.IdentifyDataDrawer; import com.mogo.module.common.drawer.MarkerDrawer; import com.mogo.module.common.drawer.OnlineCarDrawer; import com.mogo.module.common.drawer.RoadConditionDrawer; @@ -37,9 +34,8 @@ import com.mogo.module.service.network.RefreshModel; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; -import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.module.IMogoBizActionDoneListener; -import com.mogo.utils.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.ViewUtils; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index 7ba6b29138..ae76a6c87b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -19,7 +19,7 @@ import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.Utils; -import com.mogo.utils.ResourcesHelper; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.CallChattingProviderConstant; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 84938ecf3c..039549abf4 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -51,8 +51,8 @@ import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.NetworkUtils; -import com.mogo.utils.TipDrawable; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index 5b3abcb486..009f4f295f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -15,7 +15,7 @@ import com.mogo.module.share.bean.SeekRecord import com.mogo.module.share.bean.SeekRequest import com.mogo.module.share.bean.getJson import com.mogo.module.share.net.ShareRtlApiService -import com.mogo.utils.TipToast +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.utils.logger.Logger import com.mogo.utils.network.RequestOptions import com.mogo.utils.storage.SharedPrefsMgr diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 038778129a..d474550c69 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -3,14 +3,13 @@ package com.mogo.module.share.manager import android.content.Context import android.util.Log import com.mogo.commons.voice.AIAssist -import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.module.common.enums.EventTypeEnum import com.mogo.module.share.R import com.mogo.module.share.constant.ShareConstants.* import com.mogo.service.share.TanluUploadParams import com.mogo.utils.NetworkUtils -import com.mogo.utils.TipDrawable -import com.mogo.utils.TipToast +import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.utils.logger.Logger import com.mogo.utils.storage.SharedPrefsMgr @@ -65,7 +64,11 @@ object UploadHelper { Logger.e("UploadHelper", "upload not net ") AIAssist.getInstance(context).speakTTSVoice("分享失败，请检查网络") @Suppress("DEPRECATION") - TipToast.tip("分享失败，请检查网络", TipDrawable(context.resources.getDrawable(R.drawable.module_share_upload_fail))) + TipToast.tip("分享失败，请检查网络", + TipDrawable( + context.resources.getDrawable(R.drawable.module_share_upload_fail) + ) + ) } } // } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java index 5ea6876be8..9a16953a84 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java @@ -24,7 +24,7 @@ import com.mogo.module.v2x.utils.ChartingUtil; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.CallChattingProviderConstant; import com.zhidao.carchattingprovider.ICarsChattingProvider; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java index e986afb070..07f97aad3b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java @@ -23,7 +23,7 @@ import com.mogo.module.v2x.utils.ChartingUtil; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.CallChattingProviderConstant; import com.zhidao.carchattingprovider.ICarsChattingProvider; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java index 13bc1eb85f..0eea909036 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java @@ -8,7 +8,7 @@ import com.mogo.module.v2x.scenario.impl.V2XScenarioManager; import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.module.v2x.utils.MarkerUtils; import com.mogo.service.cloud.socket.IMogoOnMessageListener; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java index f262976fe3..b9e36fd1e8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java @@ -5,7 +5,7 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XGiveLike; import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.service.cloud.socket.IMogoOnMessageListener; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index 6318626f00..8465087e30 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -25,7 +25,7 @@ import com.mogo.module.v2x.scenario.scene.route.V2XOptimalRouteVREventScenario; import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpScenario; import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario; import com.mogo.module.v2x.scenario.scene.warning.V2XFrontWarningScenario; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java index f9ff903ec6..b441443e8e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java @@ -14,7 +14,7 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.impl.AbsV2XScenario; import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.service.windowview.IMogoTopViewStatusListener; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; /** * author : donghongyu diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java index b198be20e3..0d9a4d41ba 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java @@ -13,7 +13,7 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.impl.AbsV2XScenario; import com.mogo.service.windowview.IMogoTopViewStatusListener; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.utils.logger.Logger; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java index 7b0497d7f7..9e2745fc8b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java @@ -3,7 +3,7 @@ package com.mogo.module.v2x.utils; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.utils.TipToast; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; /** * author : donghongyu diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java index e3ad6979e1..d631a039b4 100644 --- a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java +++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java @@ -10,6 +10,7 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; +import com.elegant.utils.ResourcesHelper; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.storage.SpStorage; @@ -19,7 +20,6 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.wm.WindowManagerView; import com.mogo.utils.CommonUtils; import com.mogo.utils.LaunchUtils; -import com.mogo.utils.ResourcesHelper; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger;