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

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 {