Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

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 {

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);
@@ -466,7 +467,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
         if (checkAMapView()) {
             mMapView.setCarOverlayVisible(true);
             showMyLocation( false );
-            NaviClient.getInstance(getContext()).stopAimlessMode();
         }
     }
 

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

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -136,7 +136,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() ) );
             }
         } );
 

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

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 {