rc

modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt

@@ -37,6 +37,10 @@ object SettingManager : IMogoSettingManager {
    * 高速优先
    */
   private var highSpeed = false
+  /**
+   * 模拟导航
+   */
+  private var isMonitor: Boolean = false
 
   override fun getPathPrefer(): Int {
     return settings!!.getInt(KEY_PAHT_PREFER, 0)
@@ -78,6 +82,14 @@ object SettingManager : IMogoSettingManager {
         .apply()
   }
 
+  fun setMonitor(type: Boolean) {
+    isMonitor = type
+  }
+
+  fun isMonitor(): Boolean {
+    return isMonitor
+  }
+
   /**
    * 是否躲避拥堵
    */
@@ -91,7 +103,7 @@ object SettingManager : IMogoSettingManager {
    */
   fun avoidSpeed(avoidSpeed: Boolean) {
     this.avoidSpeed = avoidSpeed
-    if (avoidSpeed){
+    if (avoidSpeed) {
       this.highSpeed = false
     }
     save()

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

@@ -20,6 +20,7 @@ import com.mogo.module.navi.BuildConfig
 import com.mogo.module.navi.R
 import com.mogo.module.navi.constants.AMapConstants
 import com.mogo.module.navi.constants.SearchServiceHolder
+import com.mogo.module.navi.manager.SettingManager
 import com.mogo.module.navi.ui.adapter.CalculatePathAdapter
 import com.mogo.module.navi.ui.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_search_category.group_path
@@ -216,7 +217,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
 
   private fun startNavi() {
     SearchServiceHolder.getNavi()
-        .startNavi(true)
+        .startNavi(!SettingManager.isMonitor())
     SearchServiceHolder.getMapUIController()
         .recoverLockMode()
     isStartedNavi = true

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt

@@ -236,11 +236,18 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
         override fun onStopTrackingTouch(seekBar: SeekBar?) {
         }
       })
+
+      cb_navi.setOnCheckedChangeListener { buttonView, isChecked ->
+        SettingManager.setMonitor(isChecked)
+      }
+      cb_navi.isChecked=SettingManager.isMonitor()
     } else {
       tv_navi_fps.visibility = View.GONE
       ll_navi_fps.visibility = View.GONE
+      cb_navi.visibility = View.GONE
     }
 
+
   }
 
   private fun updateHome() {

modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml

@@ -480,6 +480,16 @@
       </LinearLayout>
 
 
+      <CheckBox
+          android:id="@+id/cb_navi"
+          android:text="模拟导航"
+          app:layout_constraintTop_toBottomOf="@+id/ll_navi_fps"
+          app:layout_constraintLeft_toLeftOf="parent"
+          android:textColor="@color/white"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
   </ScrollView>

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -288,6 +288,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                 markerShowEntity.setChecked(true);
                 IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, mogoMarker.getMogoMarkerOptions());
                 mogoMarker.setIcon(ViewUtils.fromView(markerView.getView()));
+                mogoMarker.setToTop();
             }
         }
     }
@@ -584,7 +585,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
     @Override
     public void onMsgReceived(final MarkerResponse response) {
         Logger.e(TAG, "接收到了地图大而全数据");
-        if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isSynchronousOnLineData) {
+        if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isACC_ON) {
             Handler handler = new Handler(Looper.getMainLooper());
             handler.post(new Runnable() {
                 @Override