yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rm guideshow module

Browse Source
This commit is contained in:
wangcongtao
2020-07-10 10:50:14 +08:00
parent 036f627c2f
commit 3806ac1be6
11 changed files with 7 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@@ -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, {

2
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -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));
}

1
modules/mogo-module-apps/build.gradle
View File

@@ -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

18
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java
View File

@@ -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() );

1
modules/mogo-module-media/build.gradle
View File

@@ -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

24
modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java
View File

@@ -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<MediaView, MediaPresenter
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getViewLifecycleOwner().getLifecycle().addObserver(mPresenter);
mMediaVoiceListener = new MediaMogoVoiceListener();
@@ -219,12 +213,12 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
}
@Override
public void authorizeFailed(@NotNull String s) {
public void authorizeFailed(String s) {
//TipToast.shortTip("授权失败");
}
@Override
public void forbiddenVoiceWhenAuthorize(@NotNull String s) {
public void forbiddenVoiceWhenAuthorize(String s) {
Logger.d(TAG,"forbiddenVoiceWhenAuthorize");
}
});
@@ -407,7 +401,7 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
isFirstPlay = true;
}
@NonNull
@Override
protected MediaPresenter createPresenter() {
return new MediaPresenter(this);
@@ -732,7 +726,7 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
.load(bimgUrl)
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
public void onResourceReady( Bitmap resource, Transition<? super Bitmap> transition) {
new Thread(new Runnable() {
@Override
@@ -752,12 +746,12 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
}
@Override
public void onLoadStarted(@Nullable Drawable placeholder) {
public void onLoadStarted(Drawable placeholder) {
super.onLoadStarted(placeholder);
}
@Override
public void onLoadFailed(@Nullable Drawable errorDrawable) {
public void onLoadFailed(Drawable errorDrawable) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -1023,10 +1017,6 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
}
}
/* if (ServiceMediaHandler.getGuideShowProviderManager().isPlayingVideo()){
ServiceMediaHandler.getGuideShowProviderManager().closeGuideShowView();
}*/
} else {
if (mMusicPlay != null){
mMusicPlay.setImageResource(R.drawable.module_media_play);

10
modules/mogo-module-media/src/main/java/com/mogo/module/media/ServiceMediaHandler.java
View File

@@ -11,9 +11,6 @@ import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager;
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.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
@@ -54,7 +51,6 @@ public class ServiceMediaHandler {
private static IMogoActionManager mMogoActionManager;
private static IMogoADASController mMogoADASController;
private static IMogoAuthorizeModuleManager mMogoAuthorizeModuleManager;
private static IGuideShowProvider mGuideShowProviderManager;
private static IMogoMarkerService sMarkerService;
public static void init(Context context) {
@@ -76,7 +72,6 @@ public class ServiceMediaHandler {
mMogoActionManager = mApis.getActionManagerApi();
mMogoADASController = mApis.getAdasControllerApi();
mMogoAuthorizeModuleManager = (IMogoAuthorizeModuleManager) ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation(context);
mGuideShowProviderManager = (IGuideShowProvider) ARouter.getInstance().build(GuideShowProviderConstant.GUIDE_SHOW_PROVIDER).navigation(context);
sMarkerService = mApis.getMarkerService();
}
@@ -176,11 +171,6 @@ public class ServiceMediaHandler {
return mMogoAuthorizeModuleManager;
}
public static IGuideShowProvider getGuideShowProviderManager(){
isApisNull(mGuideShowProviderManager);
return mGuideShowProviderManager;
}
public static boolean isObjStaticNull(Object object){
if (mApis == null || object == null){
return true;

4
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow.java
View File

@@ -271,10 +271,6 @@ public class MediaWindow implements MediaView{
mCircleImg.startAnim();
}
/* if (ServiceMediaHandler.getGuideShowProviderManager().isPlayingVideo()){
ServiceMediaHandler.getGuideShowProviderManager().closeGuideShowView();
}*/
} else {

1
modules/mogo-module-search/build.gradle
View File

@@ -49,7 +49,6 @@ dependencies {
implementation rootProject.ext.dependencies.androidxcardview
kapt rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.rxandroid
implementation rootProject.ext.dependencies.guideshowprovider
if (Boolean.valueOf(RELEASE)) {

10
modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
View File

@@ -7,7 +7,6 @@ import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager;
import com.mogo.module.guideshow.provider.IGuideShowProvider;
import com.mogo.module.navi.cp.PersonalInfoManagerImpl;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.analytics.IMogoAnalytics;
@@ -31,7 +30,6 @@ public class SearchApisHolder {
private static final String TAG = "SearchApisHolder";
private static IMogoServiceApis sApis;
private static IGuideShowProvider sGuideShowApis;
private static IMogoGpsSimulatorManager sGpsSimulatorManager;
private static PersonalInfoManagerImpl mPersonalInfoManager;
@@ -40,7 +38,6 @@ public class SearchApisHolder {
Logger.d( TAG, "static block init." );
sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
}
public static IMogoServiceApis getApis() {
@@ -90,13 +87,6 @@ public class SearchApisHolder {
return getApis().getIntentManagerApi();
}
public static IGuideShowProvider getGuideShowApis() {
if ( sGuideShowApis == null ) {
sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
}
return sGuideShowApis;
}
public static IMogoSettingManager getSettingManager() {
return getApis().getSettingManagerApi();
}

3
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
View File

@@ -223,9 +223,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
SearchApisHolder.getNaviApis().startNavi(!SettingManager.isMonitor())
SearchApisHolder.getUiControllerApis().recoverLockMode()
if (SearchApisHolder.getGuideShowApis().isPlayingVideo()) {
SearchApisHolder.getGuideShowApis().closeGuideShowView()
}
isStartedNavi = true
SearchApisHolder.getFragmentManager().clearAll()
}