From 84434e5e2fd8532b4be4312621e6b5c77080b97f Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 20 Feb 2020 11:35:45 +0800 Subject: [PATCH 1/3] opt --- app/build.gradle | 2 +- .../main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 1 + .../com/mogo/module/extensions/entrance/EntranceFragment.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ccd44001f9..9d92439d0f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ android { minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - buildConfigField 'int', 'NET_ENV', '3' + buildConfigField 'int', 'NET_ENV', '2' } } compileOptions { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 80fc1f77bf..11e59c1985 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -429,6 +429,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, style.anchor(0.5F,0.5F); style.strokeColor(Color.TRANSPARENT); style.strokeWidth(0); + style.radiusFillColor( Color.TRANSPARENT ); style.myLocationIcon( BitmapDescriptorFactory.fromResource(R.drawable.map_api_ic_current_location)); mMapView.getMap().setMyLocationStyle(style); 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 0506ff0a2f..87dbaba7ad 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 @@ -130,7 +130,8 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent if ( location != null ) { mMogoStatusManager.setUserInteractionStatus( TAG, true, false ); mMApUIController.changeZoom( 16.0f ); - mMApUIController.moveToCenter( new MogoLatLng( location.getLatitude(), location.getLongitude() ) ); + mMApUIController.recoverLockMode(); +// mMApUIController.moveToCenter( new MogoLatLng( location.getLatitude(), location.getLongitude() ) ); } } ); From 5367a82c47405040d7375667914e990020ef668d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 20 Feb 2020 14:22:37 +0800 Subject: [PATCH 2/3] opt --- .../src/main/java/com/mogo/module/map/MapFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index ed7b4fc192..089719b3ad 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -42,6 +42,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements mMogoMapView.onCreate( savedInstanceState ); mMogoMap = mMogoMapView.getMap(); mMogoMap.getUIController().showMyLocation( true ); + mMogoMap.getUIController().recoverLockMode();// 启动锁车 } @NonNull From 1cf9c758dd9a0b98f0cfb84ae2572edb5821c515 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 20 Feb 2020 15:07:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 1 - .../src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java | 2 ++ .../java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 11e59c1985..993fd3418d 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -467,7 +467,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, if (checkAMapView()) { mMapView.setCarOverlayVisible(true); showMyLocation( false ); - NaviClient.getInstance(getContext()).stopAimlessMode(); } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index c752f47731..75975a1be4 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -142,7 +142,9 @@ public class NaviClient implements IMogoNavi { } // 关闭巡航 //mAMapNavi.stopAimlessMode(); + stopAimlessMode(); mIsRealNavi = isRealNavi; + boolean result = mAMapNavi.startNavi( isRealNavi ? NaviType.GPS : NaviType.EMULATOR ); Logger.d( TAG, "start navi status: %s", result ); } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 86cc2cacee..2149aa2620 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -199,7 +199,6 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { if (checkedId == R.id.rb_navi_detail) BroadcastMode.DETAIL else BroadcastMode.CONCISE ) - if (checkedId == R.id.rb_navi_detail) { SearchServiceHolder.analyticsManager.track("Navigation_guide_type", mapOf("type" to 1)) } else {