From de95cc312f1fb4e68b9fd304ff247ed1d45468c0 Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Mon, 31 Aug 2020 10:51:22 +0800 Subject: [PATCH] fix bug --- .../main/java/com/mogo/commons/mvp/MvpFragment.java | 11 +++++------ libraries/map-custom/build.gradle | 2 +- .../com/mogo/map/impl/custom/AMapViewWrapper.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java index 0e788e140a..b9ac0b7b7f 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java @@ -33,15 +33,14 @@ public abstract class MvpFragment> exten @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if ( mRootView == null ) { - mRootView = inflater.inflate( getLayoutId(), container, false ); + if (mRootView == null) { + mRootView = inflater.inflate(getLayoutId(), container, false); } else { - ViewGroup viewGroup = ( ViewGroup ) mRootView.getParent(); - if ( viewGroup != null ) { - viewGroup.removeView( mRootView ); + ViewGroup viewGroup = (ViewGroup) mRootView.getParent(); + if (viewGroup != null) { + viewGroup.removeView(mRootView); } } - mRootView = inflater.inflate(getLayoutId(), container, false); return mRootView; } diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 62fcc871ef..3637f1c550 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-j29' + implementation 'com.zhidaoauto.machine:map:1.0.0-j33' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() 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 74ecd2876c..630fea0e9f 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 @@ -593,7 +593,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public synchronized boolean isCarLocked() { - return mIsCarLocked; + return mMapView.getMapAutoViewHelper().getLockMode(); } @Override