From 3806ac1be672ac86fcec7dfd029dea6e746dc955 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 10 Jul 2020 10:50:14 +0800 Subject: [PATCH] rm guideshow module --- app/build.gradle | 3 --- .../com/mogo/launcher/MogoApplication.java | 2 -- modules/mogo-module-apps/build.gradle | 1 - .../mogo/module/apps/AppServiceHandler.java | 18 -------------- modules/mogo-module-media/build.gradle | 1 - .../module/media/MediaCardViewFragment.java | 24 ++++++------------- .../module/media/ServiceMediaHandler.java | 10 -------- .../mogo/module/media/window/MediaWindow.java | 4 ---- modules/mogo-module-search/build.gradle | 1 - .../navi/constants/SearchApisHolder.java | 10 -------- .../navi/ui/search/ChoosePathFragment.kt | 3 --- 11 files changed, 7 insertions(+), 70 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bf73e67930..9447dedf85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -196,13 +196,10 @@ dependencies { implementation rootProject.ext.dependencies.carcallprovider implementation rootProject.ext.dependencies.carcall - implementation rootProject.ext.dependencies.guideshowprovider - implementation rootProject.ext.dependencies.guideshow implementation rootProject.ext.dependencies.modulepush, { exclude group: 'com.mogo.module', module: 'module-common' } - implementation rootProject.ext.dependencies.moduleadcard implementation rootProject.ext.dependencies.moduleV2x implementation rootProject.ext.dependencies.moduletanlu, { diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index d3a7f941e2..5aab18e177 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -9,7 +9,6 @@ import com.auto.zhidao.logsdk.CrashSystem; import com.bytedance.boost_multidex.BoostMultiDex; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; -import com.mogo.module.adcard.AdCardConstants; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoModule; @@ -53,7 +52,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(AuthorizeConstant.PATH_AGREEMENT_FRAGMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 - MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); if (DebugConfig.isLauncher()) { MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); } diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index e9dc018ba2..fa04f473f9 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -45,7 +45,6 @@ dependencies { implementation rootProject.ext.dependencies.material annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.androidxrecyclerview - implementation rootProject.ext.dependencies.guideshowprovider if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogomap diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java index 9bf52fd3b0..043d2cd2bf 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java @@ -4,22 +4,10 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.marker.IMogoMarkerManager; -import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.common.entity.MarkerResponse; -import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.guideshow.provider.GuideShowProviderConstant; -import com.mogo.module.guideshow.provider.IGuideShowProvider; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cardmanager.IMogoCardManager; -import com.mogo.service.connection.IMogoSocketManager; -import com.mogo.service.imageloader.IMogoImageloader; -import com.mogo.service.map.IMogoMapService; -import com.mogo.service.statusmanager.IMogoStatusManager; /** * author : zyz @@ -35,13 +23,11 @@ public class AppServiceHandler { private static IMogoServiceApis mApis; private static IMogoCardManager mMogoCardManager; private static IMogoAnalytics mMogoAnalytics; - private static IGuideShowProvider mMogoGuideShow; public static void init( final Context context ) { mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( context ); mMogoCardManager = mApis.getCardManagerApi(); mMogoAnalytics = mApis.getAnalyticsApi(); - mMogoGuideShow = ( IGuideShowProvider ) ARouter.getInstance().build( GuideShowProviderConstant.GUIDE_SHOW_PROVIDER ).navigation( context ); } @@ -53,10 +39,6 @@ public class AppServiceHandler { return mMogoAnalytics; } - public static IGuideShowProvider getMogoGuideShow() { - return mMogoGuideShow; - } - public static IMogoServiceApis getApis() { if ( mApis == null ) { mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( AbsMogoApplication.getApp() ); diff --git a/modules/mogo-module-media/build.gradle b/modules/mogo-module-media/build.gradle index d734d287e0..0ddfae0634 100644 --- a/modules/mogo-module-media/build.gradle +++ b/modules/mogo-module-media/build.gradle @@ -40,7 +40,6 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.guideshowprovider implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java index 7708d29202..52651147a6 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java @@ -16,9 +16,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.SimpleTarget; @@ -74,9 +71,6 @@ import com.mogo.utils.UiThreadHandler; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; - -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -180,7 +174,7 @@ public class MediaCardViewFragment extends MvpFragment() { @Override - public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + public void onResourceReady( Bitmap resource, Transition transition) { new Thread(new Runnable() { @Override @@ -752,12 +746,12 @@ public class MediaCardViewFragment extends MvpFragment